From 9b797cc046e9fe9260a6f76dcff6012ee648176d Mon Sep 17 00:00:00 2001 From: Christos Zoulas Date: Tue, 23 Dec 2003 17:34:31 +0000 Subject: [PATCH] Welcome to 4.07 --- ChangeLog | 11 +++++++++++ configure.in | 2 +- magic/Magdir/amigaos | 12 ++++++++++++ magic/Magdir/animation | 11 ++++++++++- magic/Magdir/cad | 33 +++++++++++++++++++++++++++++++++ magic/Magdir/images | 4 ++++ magic/Magdir/macintosh | 8 ++++++++ magic/Magdir/microstation | 20 -------------------- magic/Magdir/msdos | 6 ++++++ magic/Magdir/plan9 | 4 ++++ magic/Magdir/riff | 1 + magic/Makefile.am | 2 ++ 12 files changed, 92 insertions(+), 22 deletions(-) create mode 100644 magic/Magdir/cad delete mode 100644 magic/Magdir/microstation create mode 100644 magic/Magdir/plan9 diff --git a/ChangeLog b/ChangeLog index 1dabee87..c5875ca7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,15 @@ +2003-12-23 12:12 Christos Zoulas + + * fix -k flag (Maciej W. Rozycki) + +2003-11-18 14:10 Christos Zoulas + + * Try to give us much info as possible on corrupt elf files. + (Willy Tarreau) + * Updated python bindings (Brett Funderburg) + + 2003-11-11 15:03 Christos Zoulas * Include file.h first, because it includes config.h diff --git a/configure.in b/configure.in index f1407019..ec17e9f5 100644 --- a/configure.in +++ b/configure.in @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(src/file.c) -AM_INIT_AUTOMAKE(file, 4.06) +AM_INIT_AUTOMAKE(file, 4.07) AM_CONFIG_HEADER(config.h) AM_MAINTAINER_MODE diff --git a/magic/Magdir/amigaos b/magic/Magdir/amigaos index f12d4964..4d655e91 100644 --- a/magic/Magdir/amigaos +++ b/magic/Magdir/amigaos @@ -55,3 +55,15 @@ >35 byte 3 os: Unix 0 belong 0x000003fa AmigaOS shared library + +# Amiga disk types +# +0 string RDSK Rigid Disk Block +>160 string x on %.24s +0 string DOS\0 Amiga DOS disk +0 string DOS\1 Amiga FFS disk +0 string DOS\2 Amiga Inter DOS disk +0 string DOS\3 Amiga Inter FFS disk +0 string DOS\4 Amiga Fastdir DOS disk +0 string DOS\5 Amiga Fastdir FFS disk +0 string KICK Kickstart disk diff --git a/magic/Magdir/animation b/magic/Magdir/animation index 77c64eb7..e9ebf08d 100644 --- a/magic/Magdir/animation +++ b/magic/Magdir/animation @@ -163,10 +163,19 @@ # \003. Most of them start with non-null values at hex offset 0x34 or so. #0 string \3\0\0\0\0\0\0\0\0\0\0\0 DL version 3 -# SGI and Apple formats +# SGI formats 0 string MOVI Silicon Graphics movie file + +# Apple Quicktime: Scan for all known top-level QT atom markers 4 string moov Apple QuickTime movie file (moov) 4 string mdat Apple QuickTime movie file (mdat) +4 string ftyp Apple QuickTime movie file (ftyp) +4 string free Apple QuickTime movie file (free) +4 string junk Apple QuickTime movie file (junk) +4 string pnot Apple QuickTime movie file (pnot) +4 string skip Apple QuickTime movie file (skip) +4 string wide Apple QuickTime movie file (wide) +4 string pict Apple QuickTime movie file (pict) # iso 13818 transport stream # diff --git a/magic/Magdir/cad b/magic/Magdir/cad new file mode 100644 index 00000000..911ab5ee --- /dev/null +++ b/magic/Magdir/cad @@ -0,0 +1,33 @@ + +#------------------------------------------------------------------------------ +# autocad: file(1) magic for cad files +# + +# AutoCAD DWG versions R13/R14 (www.autodesk.com) +# Written December 01, 2003 by Lester Hightower +# Based on the DWG File Format Specifications at http://www.opendwg.org/ +0 string \101\103\061\060\061 AutoCAD +>5 string \062\000\000\000\000 DWG ver. R13 +>5 string \064\000\000\000\000 DWG ver. R14 + +# Microstation DGN/CIT Files (www.bentley.com) +# Written October 30, 2003 by Lester Hightower +# DGN is the default file extension of Microstation/Intergraph CAD files. +# CIT is the proprietary raster format (similar to TIFF) used to attach +# raster underlays to Microstation DGN (vector) drawings. +# +# http://www.wotsit.org/search.asp +# http://filext.com/detaillist.php?extdetail=DGN +# http://filext.com/detaillist.php?extdetail=CIT +# +# http://www.bentley.com/products/default.cfm?objectid=97F351F5-9C35-4E5E-89C2 +# 3F86C928&method=display&p_objectid=97F351F5-9C35-4E5E-89C280A93F86C928 +# http://www.bentley.com/products/default.cfm?objectid=A5C2FD43-3AC9-4C71-B682 +# 721C479F&method=display&p_objectid=A5C2FD43-3AC9-4C71-B682C7BE721C479F +0 string \010\011\376 Microstation +>3 string \002 +>>30 string \372\104 DGN File +>>30 string \172\104 DGN File +>>30 string \026\105 DGN File +>4 string \030\000\000 CIT File + diff --git a/magic/Magdir/images b/magic/Magdir/images index 8e20f084..1a1fdc08 100644 --- a/magic/Magdir/images +++ b/magic/Magdir/images @@ -479,3 +479,7 @@ >0x0020 string >0.6.1 file version %s >0x0020 string <0.6.1 file version %s +# DCX is multi-page PCX, using a simple header of up to 1024 +# offsets for the respective PCX components. +# From: Joerg Wunsch +0 lelong 987654321 DCX multi-page PCX image data diff --git a/magic/Magdir/macintosh b/magic/Magdir/macintosh index 576b5211..1e8e5f3d 100644 --- a/magic/Magdir/macintosh +++ b/magic/Magdir/macintosh @@ -236,6 +236,14 @@ >24 string CATALOG catalog >24 string INDEX data file index >24 string VIEW data view +# sas 7+ magic from Reinhold Koch (reinhold.koch@roche.com) +# +0x54 string SAS SAS 7+ +>0x9C string DATA data file +>0x9C string CATALOG catalog +>0x9C string INDEX data file index +>0x9C string VIEW data view + # spss magic for SPSS system and portable files, # from Bruce Foster (bef@nwu.edu). diff --git a/magic/Magdir/microstation b/magic/Magdir/microstation deleted file mode 100644 index 3075576a..00000000 --- a/magic/Magdir/microstation +++ /dev/null @@ -1,20 +0,0 @@ -#------------------------------------------------------------------------------ -# microstation: file(1) magic for Microstation DGN/CIT files (www.bentley.com) -# Written October 30, 2003 by Lester Hightower -# -# DGN is the default file extension of Microstation/Intergraph CAD files. -# CIT is the proprietary raster format (similar to TIFF) used to attach -# raster underlays to Microstation DGN (vector) drawings. - -# http://www.wotsit.org/search.asp -# http://filext.com/detaillist.php?extdetail=DGN -# http://filext.com/detaillist.php?extdetail=CIT - -# http://www.bentley.com/products/default.cfm?objectid=97F351F5-9C35-4E5E-89C280A93F86C928&method=display&p_objectid=97F351F5-9C35-4E5E-89C280A93F86C928 -# http://www.bentley.com/products/default.cfm?objectid=A5C2FD43-3AC9-4C71-B682C7BE721C479F&method=display&p_objectid=A5C2FD43-3AC9-4C71-B682C7BE721C479F -0 string \010\011\376 Microstation ->3 string \002 ->>30 string \372\104 DGN File ->>30 string \172\104 DGN File ->>30 string \026\105 DGN File ->4 string \030\000\000 CIT File diff --git a/magic/Magdir/msdos b/magic/Magdir/msdos index d568f50e..35848641 100644 --- a/magic/Magdir/msdos +++ b/magic/Magdir/msdos @@ -326,3 +326,9 @@ >>0x8ad string UPX [compressed w/%s >>>&1 string >\0 %.4s] >>0x1c string pmodedj stubbed with %s + +# QDOS +4 belong 0x4AFB QDOS executable +>9 pstring x '%s' +0 beshort 0xFB01 QDOS object +>2 pstring x '%s' diff --git a/magic/Magdir/plan9 b/magic/Magdir/plan9 new file mode 100644 index 00000000..b564fc84 --- /dev/null +++ b/magic/Magdir/plan9 @@ -0,0 +1,4 @@ +#------------------------------------------------------------------------------ +# plan9: file(1) magic for AT&T Bell Labs' Plan 9 executables +# +0 belong 0x000001EB Plan 9 executable diff --git a/magic/Magdir/riff b/magic/Magdir/riff index f1074c40..a79dd66a 100644 --- a/magic/Magdir/riff +++ b/magic/Magdir/riff @@ -163,6 +163,7 @@ >8 string sfbk SoundFont/Bank # MPEG-1 wrapped in a RIFF, apparently >8 string CDXA \b, wrapped MPEG-1 (CDXA) +>8 string 4XMV \b, 4X Movie file # # XXX - some of the below may only appear in little-endian form. diff --git a/magic/Makefile.am b/magic/Makefile.am index 24e528ee..12f01f29 100644 --- a/magic/Makefile.am +++ b/magic/Makefile.am @@ -43,6 +43,7 @@ Magdir/blender \ Magdir/blit \ Magdir/bout \ Magdir/bsdi \ +Magdir/cad \ Magdir/c-lang \ Magdir/c64 \ Magdir/cddb \ @@ -140,6 +141,7 @@ Magdir/pdp \ Magdir/perl \ Magdir/pgp \ Magdir/pkgadd \ +Magdir/plan9 \ Magdir/plus5 \ Magdir/printer \ Magdir/project \ -- 2.40.0