From: Christos Zoulas Date: Sat, 22 Jun 1996 22:11:05 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: FILE3_27~85 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=73d2921922bb0b3b38150acd7976300746e66a60;p=file *** empty log message *** --- diff --git a/magic/Magdir/archive b/magic/Magdir/archive index bd400815..e64ea30a 100644 --- a/magic/Magdir/archive +++ b/magic/Magdir/archive @@ -68,6 +68,8 @@ # 0 string ! current ar archive >8 string __.SYMDEF random library +>8 string debian-split part of multipart Debian package +>8 string debian-binary Debian binary package >0 belong =65538 - pre SR9.5 >0 belong =65539 - post SR9.5 >0 beshort 2 - object archive diff --git a/magic/Magdir/audio b/magic/Magdir/audio index 24df6209..4a4be856 100644 --- a/magic/Magdir/audio +++ b/magic/Magdir/audio @@ -1,6 +1,6 @@ #------------------------------------------------------------------------------ -# audio: file(1) magic for sound formats +# audio: file(1) magic for sound formats (see also "iff") # # Jan Nicolai Langfeldt (janl@ifi.uio.no), Dan Quinlan (quinlan@yggdrasil.com), # and others @@ -37,11 +37,6 @@ >20 lelong 4 quad, >16 lelong >0 %d Hz -# Bytes 0-3 of AIFF, AIFF-C, & 8SVX audio files are "FORM" -8 string AIFF AIFF audio data -8 string AIFC AIFF-C audio data -8 string 8SVX IFF/8SVX audio data - # Creative Labs AUDIO stuff 0 string MThd Standard MIDI data >9 byte >0 (format %d) @@ -62,11 +57,13 @@ # [GRR 950115: probably all of the shorts and longs should be leshort/lelong] 0 string RIFF Microsoft RIFF >8 string WAVE \b, WAVE audio data ->34 short >0 \b, %d bit ->22 short =1 \b, mono ->22 short =2 \b, stereo ->22 short >2 \b, %d channels ->24 long >0 %d Hz +>>34 short >0 \b, %d bit +>>22 short =1 \b, mono +>>22 short =2 \b, stereo +>>22 short >2 \b, %d channels +>>24 long >0 %d Hz +# AVI == Audio Video Interleave +>8 string AVI\ \b, AVI data # Extended MOD format (*.emd) (Greg Roelofs, newt@uchicago.edu); NOT TESTED # [based on posting 940824 by "Dirk/Elastik", husberg@lehtori.cc.tut.fi] @@ -76,3 +73,18 @@ >45 byte x %d instruments >83 byte 0 (module) >83 byte 1 (song) + +# Real Audio (Magic .ra\0375) +0 belong 0x2e7261fd realaudio sound file + +# Real Audio (Magic .ra\0375) +0 belong 0x2e7261fd realaudio sound file + +# MTM/669/FAR/S3M/ULT/XM format checking [Aaron Eppert, aeppert@dialin.ind.net] +# Oct 31, 1995 +0 string MTM MultiTracker Module sound file +0 string if Composer 669 Module sound data +0 string FAR Module sound data +0 string MAS_U ULT(imate) Module sound data +0x2c string SCRM ScreamTracker III Module sound data +0 string Extended Module Extended Module sound data diff --git a/magic/Magdir/commands b/magic/Magdir/commands index 938b490d..8a276070 100644 --- a/magic/Magdir/commands +++ b/magic/Magdir/commands @@ -41,6 +41,7 @@ 0 string #!\ /bin/awk awk commands text 0 string #!/usr/bin/awk awk commands text 0 string #!\ /usr/bin/awk awk commands text +0 string BEGIN awk commands text # For Larry Wall's perl language. The ``eval'' line recognizes an # outrageously clever hack for USG systems. diff --git a/magic/Magdir/compress b/magic/Magdir/compress index dd72278b..2cf8d195 100644 --- a/magic/Magdir/compress +++ b/magic/Magdir/compress @@ -43,12 +43,15 @@ # # This magic number is byte-order-independent. XXX - Does that mean this # is big-endian, little-endian, either, or that you can't tell? +# this short is valid for SunOS 0 short 017437 old packed data # XXX - why *two* entries for "compacted data", one of which is # byte-order independent, and one of which is byte-order dependent? # 0 short 0x1fff compacted data +# This string is valid for SunOS (BE) and a matching "short" is listed +# in the Ultrix (LE) magic file. 0 string \377\037 compacted data 0 short 0145405 huf output diff --git a/magic/Magdir/elf b/magic/Magdir/elf index f99712fe..7772a77d 100644 --- a/magic/Magdir/elf +++ b/magic/Magdir/elf @@ -19,7 +19,10 @@ >>16 leshort 1 relocatable, >>16 leshort 2 executable, >>16 leshort 3 shared object, ->>16 leshort 4 core file, +# Core handling from Peter Tobias +>>16 leshort 4 core file +>>>576 string >\0 of '%s' +>>>400 lelong >0 (signal %d), >>16 leshort &0xff00 processor-specific, >>18 leshort 0 no machine, >>18 leshort 1 AT&T WE32100 - invalid byte order, @@ -40,6 +43,8 @@ >>16 beshort 2 executable, >>16 beshort 3 shared object, >>16 beshort 4 core file, +>>>576 string >\0 of '%s' +>>>400 lelong >0 (signal %d), >>16 beshort &0xff00 processor-specific, >>18 beshort 0 no machine, >>18 beshort 1 AT&T WE32100, diff --git a/magic/Magdir/fonts b/magic/Magdir/fonts index a23fae7a..dd7907f8 100644 --- a/magic/Magdir/fonts +++ b/magic/Magdir/fonts @@ -8,15 +8,19 @@ # PostScript fonts (must precede "printer" entries), quinlan@yggdrasil.com 0 string %!PS-AdobeFont-1.0 PostScript Type 1 font text ->20 string >\0 (%s) +>20 string >\0 (%s) 6 string %!PS-AdobeFont-1.0 PostScript Type 1 font program data # X11 font files in SNF (Server Natural Format) format -0 belong 00000004 X11 big-endian SNF font -0 lelong 00000004 X11 little-endian SNF font +0 belong 00000004 X11 SNF font data, MSB first +0 lelong 00000004 X11 SNF font data, LSB first + +# X11 Bitmap Distribution Format, from Daniel Quinlan (quinlan@yggdrasil.com) +0 string STARTFONT\040 X11 BDF font text # X11 fonts, from Daniel Quinlan (quinlan@yggdrasil.com) # PCF must come before SGI additions ("MIPSEL MIPS-II COFF" collides) -# (0x7063601 is "PCF" + \001 as a lelong) -0 lelong 0x70636601 X11 Portable Compiled Font data +0 string \001fcp X11 Portable Compiled Font data +>12 byte 0x02 \b, LSB first +>12 byte 0x0a \b, MSB first 0 string D1.0\015 X11 Speedo font data diff --git a/magic/Magdir/frame b/magic/Magdir/frame index 37b79830..47e48979 100644 --- a/magic/Magdir/frame +++ b/magic/Magdir/frame @@ -20,12 +20,17 @@ >17 string 3.0 (3.0) >17 string 2.0 (2.0) >17 string 1.0 (1.x) -0 string \17 string 1.01 (%s) 0 string \10 string 3.0 (3.0 >10 string 2.0 (2.0 >10 string 1.0 (1.0 >13 byte x %c) -0 string \6 string 3.0 (3.0) +#>6 string 2.0 (2.0) +#>6 string 1.0 (1.0) +0 string \(144) belong 0x054ef630 dynamically linked ->96 belong >0 -not stripped +>96 belong >0 - not stripped 0 belong 0x02100108 HPPA-RISC1.1 shared executable >(144) belong 0x054ef630 dynamically linked ->96 belong >0 -not stripped +>96 belong >0 - not stripped 0 belong 0x0210010b HPPA-RISC1.1 demand-load executable >(144) belong 0x054ef630 dynamically linked ->96 belong >0 -not stripped +>96 belong >0 - not stripped 0 belong 0x0210010e HPPA-RISC1.1 shared library ->96 belong >0 -not stripped +>96 belong >0 - not stripped 0 belong 0x0210010d HPPA-RISC1.1 dynamic load library ->96 belong >0 -not stripped +>96 belong >0 - not stripped #### 800 0 belong 0x020b0106 HP s800 relocatable object 0 belong 0x020b0107 HP s800 executable >(144) belong 0x054ef630 dynamically linked ->96 belong >0 -not stripped +>96 belong >0 - not stripped 0 belong 0x020b0108 HP s800 shared executable >(144) belong 0x054ef630 dynamically linked ->96 belong >0 -not stripped +>96 belong >0 - not stripped 0 belong 0x020b010b HP s800 demand-load executable >(144) belong 0x054ef630 dynamically linked ->96 belong >0 -not stripped +>96 belong >0 - not stripped 0 belong 0x020b010e HP s800 shared library ->96 belong >0 -not stripped +>96 belong >0 - not stripped 0 belong 0x020b010d HP s800 dynamic load library ->96 belong >0 -not stripped +>96 belong >0 - not stripped 0 belong 0x213c6172 archive file ->68 belong 0x020b0619 -HP s800 relocatable library +>68 belong 0x020b0619 - HP s800 relocatable library #### 500 0 long 0x02080106 HP s500 relocatable executable ->16 long >0 -version %ld +>16 long >0 - version %ld 0 long 0x02080107 HP s500 executable ->16 long >0 -version %ld +>16 long >0 - version %ld 0 long 0x02080108 HP s500 pure executable ->16 long >0 -version %ld +>16 long >0 - version %ld #### 200 0 belong 0x020c0108 HP s200 pure executable ->4 beshort >0 -version %ld +>4 beshort >0 - version %ld >8 belong &0x80000000 save fp regs >8 belong &0x40000000 dynamically linked >8 belong &0x20000000 debuggable >36 belong >0 not stripped 0 belong 0x020c0107 HP s200 executable ->4 beshort >0 -version %ld +>4 beshort >0 - version %ld >8 belong &0x80000000 save fp regs >8 belong &0x40000000 dynamically linked >8 belong &0x20000000 debuggable >36 belong >0 not stripped 0 belong 0x020c010b HP s200 demand-load executable ->4 beshort >0 -version %ld +>4 beshort >0 - version %ld >8 belong &0x80000000 save fp regs >8 belong &0x40000000 dynamically linked >8 belong &0x20000000 debuggable >36 belong >0 not stripped 0 belong 0x020c0106 HP s200 relocatable executable ->4 beshort >0 -version %ld ->6 beshort >0 -highwater %d +>4 beshort >0 - version %ld +>6 beshort >0 - highwater %d >8 belong &0x80000000 save fp regs >8 belong &0x20000000 debuggable >8 belong &0x10000000 PIC 0 belong 0x020a0108 HP s200 (2.x release) pure executable ->4 beshort >0 -version %ld +>4 beshort >0 - version %ld >36 belong >0 not stripped 0 belong 0x020a0107 HP s200 (2.x release) executable ->4 beshort >0 -version %ld +>4 beshort >0 - version %ld >36 belong >0 not stripped 0 belong 0x020c010e HP s200 shared library ->4 beshort >0 -version %ld ->6 beshort >0 -highwater %d +>4 beshort >0 - version %ld +>6 beshort >0 - highwater %d >36 belong >0 not stripped 0 belong 0x020c010d HP s200 dynamic load library ->4 beshort >0 -version %ld ->6 beshort >0 -highwater %d +>4 beshort >0 - version %ld +>6 beshort >0 - highwater %d >36 belong >0 not stripped #### MISC @@ -151,7 +151,7 @@ 0 long 0x015821a6 HP core file 0 long 0x4da7eee8 HP-WINDOWS font ->8 byte >0 -version %ld +>8 byte >0 - version %ld 0 string Bitmapfile HP Bitmapfile 0 string IMGfile CIS compimg HP Bitmapfile diff --git a/magic/Magdir/ibm6000 b/magic/Magdir/ibm6000 index 7b8e4948..d6cb17d4 100644 --- a/magic/Magdir/ibm6000 +++ b/magic/Magdir/ibm6000 @@ -13,4 +13,4 @@ 0 beshort 0x0105 ctab data 0 beshort 0xfe04 structured file 0 string 0xabcdef message catalog -#0 string archive +0 string \ archive diff --git a/magic/Magdir/images b/magic/Magdir/images index 9e982fcf..688f352c 100644 --- a/magic/Magdir/images +++ b/magic/Magdir/images @@ -1,6 +1,6 @@ #------------------------------------------------------------------------------ -# images: file(1) magic for image formats +# images: file(1) magic for image formats (see also "iff") # # originally from jef@helios.ee.lbl.gov (Jef Poskanzer), # additions by janl@ifi.uio.no as well as others. Jan also suggested @@ -9,29 +9,30 @@ # little magic: PCX (first byte is 0x0a) # no magic: Targa -# PBMPLUS -0 string P1 PBM file -0 string P2 PGM file -0 string P3 PPM file -0 string P4 PBM "rawbits" file -0 string P5 PGM "rawbits" file -0 string P6 PPM "rawbits" file +# PBMPLUS images +# The next byte following the magic is always whitespace. +0 string P1 PBM image text +0 string P2 PGM image text +0 string P3 PPM image text +0 string P4 PBM "rawbits" image data +0 string P5 PGM "rawbits" image data +0 string P6 PPM "rawbits" image data # NIFF (Navy Interchange File Format, a modification of TIFF) images -0 string IIN1 NIFF raster data +0 string IIN1 NIFF image data # Tag Image File Format, from Daniel Quinlan (quinlan@yggdrasil.com) # The second word of TIFF files is the TIFF version number, 42, which has # never changed. The TIFF specification recommends testing for it. -0 string MM\x00\x2a TIFF file, big-endian -0 string II\x2a\x00 TIFF file, little-endian +0 string MM\x00\x2a TIFF image data, big-endian +0 string II\x2a\x00 TIFF image data, little-endian # PNG [Portable Network Graphics, or "PNG's Not GIF"] images # (Greg Roelofs, newt@uchicago.edu) # # 137 P N G \r \n ^Z \n [4-byte length] H E A D [HEAD data] [HEAD crc] ... # -0 string \x89PNG PNG image, +0 string \x89PNG PNG image data, >4 belong !0x0d0a1a0a CORRUPTED, >16 belong x %ld x >20 belong x %ld, @@ -46,24 +47,22 @@ >28 byte 1 interlaced # GIF -0 string GIF GIF image ->3 string 87a \b, version %s, ->3 string 89a \b, version %s, +0 string GIF8 GIF image data +>4 string 7a \b, version 8%s, +>4 string 9a \b, version 8%s, >6 leshort >0 %hd x >8 leshort >0 %hd, #>10 byte &0x80 color mapped, -# GRR 950428: the following is wrong; interlace flag is at a variable offset -#>10 byte &0x40 interlaced, ->10 byte&0x07 =0x00 2 colors ->10 byte&0x07 =0x01 4 colors ->10 byte&0x07 =0x02 8 colors ->10 byte&0x07 =0x03 16 colors ->10 byte&0x07 =0x04 32 colors ->10 byte&0x07 =0x05 64 colors ->10 byte&0x07 =0x06 128 colors ->10 byte&0x07 =0x07 256 colors - -# ITC (CMU WM) raster files. It is essentially a byte-reversed Sun raster, +#>10 byte&0x07 =0x00 2 colors +#>10 byte&0x07 =0x01 4 colors +#>10 byte&0x07 =0x02 8 colors +#>10 byte&0x07 =0x03 16 colors +#>10 byte&0x07 =0x04 32 colors +#>10 byte&0x07 =0x05 64 colors +#>10 byte&0x07 =0x06 128 colors +#>10 byte&0x07 =0x07 256 colors + +# ITC (CMU WM) raster files. It is essentially a byte-reversed Sun raster, # 1 plane, no encoding. 0 string \361\0\100\273 CMU window manager raster image data >4 lelong >0 %d x @@ -71,20 +70,17 @@ >12 lelong >0 %d-bit # Magick Image File Format -0 string id=ImageMagick MIFF image file - -# miscellaneous images -0 long 1123028772 Artisan image file ->4 long 1 rectangular 24-bit image ->4 long 2 rectangular 8-bit image with colormap ->4 long 3 rectangular 32-bit image (24-bit with matte) -0 string #FIG FIG graphics savefile text ->6 string 2.1 Version 2.1 ->6 string 2.0 Version 2.0 -0 string GKSM GKS Metafile -8 string ILBM IFF ILBM file -0 string This\ is\ a\ BitMap\ file Lisp Machine bit-array-file -0 string !! Bennet Yee's "face" format +0 string id=ImageMagick MIFF image data + +# Artisan +0 long 1123028772 Artisan image data +>4 long 1 \b, rectangular 24-bit +>4 long 2 \b, rectangular 8-bit with colormap +>4 long 3 \b, rectangular 32-bit (24-bit with matte) + +# FIG (Facility for Interactive Generation of figures), an object-based format +0 string #FIG FIG image text +>5 string x \b, version %.3s # PHIGS 0 string ARF_BEGARF PHIGS clear text archive @@ -93,15 +89,20 @@ >40 string SunBin binary >32 string archive archive +# GKS (Graphics Kernel System) +0 string GKSM GKS Metafile +>24 string SunGKS \b, SunGKS + # CGM image files 0 string BEGMF clear text Computer Graphics Metafile +# XXX - questionable magic 0 beshort&0xffe0 0x0020 binary Computer Graphics Metafile 0 beshort 0x3020 character Computer Graphics Metafile # MGR bitmaps (Michael Haardt, u31b3hs@pool.informatik.rwth-aachen.de) 0 string yz MGR bitmap, modern format, 8-bit aligned -0 string zz MGR bitmap, old format, 1 bit deep, 16-bit aligned -0 string xz MGR bitmap, old format, 1 bit deep, 32-bit aligned +0 string zz MGR bitmap, old format, 1-bit deep, 16-bit aligned +0 string xz MGR bitmap, old format, 1-bit deep, 32-bit aligned 0 string yx MGR bitmap, modern format, squeezed # Fuzzy Bitmap (FBM) images @@ -110,7 +111,7 @@ >30 long 0x33 \b, color # facsimile data -1 string PC\ Research,\ Inc group 3 fax image +1 string PC\ Research,\ Inc group 3 fax data >29 byte 0 \b, normal resolution (204x98 DPI) >29 byte 1 \b, fine resolution (204x196 DPI) @@ -122,48 +123,53 @@ # PC bitmaps (OS/2, Windoze BMP files) (Greg Roelofs, newt@uchicago.edu) 0 string BM PC bitmap data ->14 byte 12 \b, OS/2 1.x format ->14 byte 64 \b, OS/2 2.x format ->14 byte 40 \b, Windows 3.x format +>14 leshort 12 \b, OS/2 1.x format +>>18 leshort x \b, %d x +>>20 leshort x %d +>14 leshort 64 \b, OS/2 2.x format +>>18 leshort x \b, %d x +>>20 leshort x %d +>14 leshort 40 \b, Windows 3.x format +>>18 lelong x \b, %d x +>>22 lelong x %d x +>>28 leshort x %d 0 string IC PC icon data 0 string PI PC pointer image data 0 string CI PC color icon data 0 string CP PC color pointer image data -0 string BA PC bitmap array data +# Conflicts with other entries [BABYL] +#0 string BA PC bitmap array data # XPM icons (Greg Roelofs, newt@uchicago.edu) # note possible collision with C/REXX entry in c-lang; currently commented out 0 string /*\ XPM\ */ X pixmap image text # Utah Raster Toolkit RLE images (janl@ifi.uio.no) -0 beshort 0xcc52 Utah Raster Toolkit RLE ->6 beshort >0 \b, %d x ->8 beshort >0 %d, ->2 beshort >0 lower left corner: %d, ->4 beshort >0 lower right corner: %d, ->10 byte&0x1 =0x1 CLEARFIRST, ->10 byte&0x2 =0x2 NO_BACKGROUND, ->10 byte&0x4 =0x4 ALPHA, ->10 byte&0x8 =0x8 COMMENT, ->11 byte >0 %d colour channels, ->12 byte >0 %d bits per pixel, ->13 byte >0 %d colour map channels +0 leshort 0xcc52 RLE image data, +>6 leshort x %d x +>8 leshort x %d +>2 leshort >0 \b, lower left corner: %d +>4 leshort >0 \b, lower right corner: %d +>10 byte&0x1 =0x1 \b, clear first +>10 byte&0x2 =0x2 \b, no background +>10 byte&0x4 =0x4 \b, alpha channel +>10 byte&0x8 =0x8 \b, comment +>11 byte >0 \b, %d color channels +>12 byte >0 \b, %d bits per pixel +>13 byte >0 \b, %d color map channels # image file format (Robert Potter, potter@cs.rochester.edu) 0 string Imagefile\ version- iff image data # this adds the whole header (inc. version number), informative but longish >10 string >\0 %s -# Sun rasterfiles, from Daniel Quinlan (quinlan@yggdrasil.com) -# -0 belong 0x59a66a95 Sun raster image ->4 belong >0 %d x +# Sun raster images, from Daniel Quinlan (quinlan@yggdrasil.com) +0 belong 0x59a66a95 Sun raster image data +>4 belong >0 \b, %d x >8 belong >0 %d, >12 belong >0 %d-bit, -# this is almost the same as the file length (what about compressed?) #>16 belong >0 %d bytes long, >20 belong 0 old format, -# no need to complain if it is standard #>20 belong 1 standard, >20 belong 2 compressed, >20 belong 3 RGB, @@ -173,12 +179,11 @@ >24 belong 0 no colormap >24 belong 1 RGB colormap >24 belong 2 raw colormap -# this doesn't impart much useful information (or does it?) #>28 belong >0 colormap is %d bytes long # SGI image file format, from Daniel Quinlan (quinlan@yggdrasil.com) # file://sgi.com/graphics/SGIIMAGESPEC -0 beshort 474 SGI image +0 beshort 474 SGI image data #>2 byte 0 \b, verbatim >2 byte 1 \b, RLE #>3 byte 1 \b, normal precision @@ -190,12 +195,12 @@ >10 beshort !1 \bs >80 string >0 \b, "%s" -0 string IT01 FIT image file +0 string IT01 FIT image data >4 belong x \b, %d x >8 belong x %d x >12 belong x %d # -0 string IT02 FIT image file +0 string IT02 FIT image data >4 belong x \b, %d x >8 belong x %d x >12 belong x %d @@ -206,8 +211,14 @@ # FITS format. Jeff Uphoff # FITS is the Flexible Image Transport System, the de facto standard for # data and image transfer, storage, etc., for the astronomical community. -0 string SIMPLE\ \ = FITS ->107 string -32 \b, 32 bits per pixel, IEEE big-endian float ->107 string \ 32 \b, 32 bits per pixel, unsigned integer ->108 string 16 \b, 16 bits per pixel, unsigned integer ->109 string 8 \b, 8 bits per pixel, unsigned integer +# (FITS floating point formats are big-endian.) +0 string SIMPLE\ \ = FITS image data +>109 string 8 \b, 8-bit, character or unsigned binary integer +>108 string 16 \b, 16-bit, two's complement binary integer +>107 string \ 32 \b, 32-bit, two's complement binary integer +>107 string -32 \b, 32-bit, floating point, single precision +>107 string -64 \b, 64-bit, floating point, double precision + +# other images +0 string This\ is\ a\ BitMap\ file Lisp Machine bit-array-file +0 string !! Bennet Yee's "face" format diff --git a/magic/Magdir/interleaf b/magic/Magdir/interleaf index 8cf1bbd4..3eea3cff 100644 --- a/magic/Magdir/interleaf +++ b/magic/Magdir/interleaf @@ -4,5 +4,5 @@ # 0 string =\210OPS Interleaf saved data 0 string =5 string ,\ Version\ (version ->>14 string >\0 %s) +>5 string ,\ Version\ = \b, version +>>17 string >\0 %.3s diff --git a/magic/Magdir/linux b/magic/Magdir/linux index 92ec4b25..b1b25dc6 100644 --- a/magic/Magdir/linux +++ b/magic/Magdir/linux @@ -13,19 +13,19 @@ # >0 leshort 0314 demand-paged executable (QMAGIC) # 0 lelong 0x00640107 Linux/i386 impure executable (OMAGIC) ->16 lelong 0 - stripped +>16 lelong 0 \b, stripped 0 lelong 0x00640108 Linux/i386 pure executable (NMAGIC) ->16 lelong 0 - stripped +>16 lelong 0 \b, stripped 0 lelong 0x0064010b Linux/i386 demand-paged executable (ZMAGIC) ->16 lelong 0 - stripped +>16 lelong 0 \b, stripped 0 lelong 0x006400cc Linux/i386 demand-paged executable (QMAGIC) ->16 lelong 0 - stripped +>16 lelong 0 \b, stripped # 0 string \007\001\000 Linux/i386 object file ->20 lelong >0x1020 - DLL library +>20 lelong >0x1020 \b, DLL library # message catalogs, from Mitchum DSouza 0 string *nazgul* compiled message catalog ->8 lelong >0 - version %ld +>8 lelong >0 \b, version %ld # core dump file, from Bill Reynolds 216 lelong 0421 Linux/i386 core file >220 string >\0 of '%s' @@ -37,15 +37,37 @@ # # Debian Packages, from Peter Tobias 0 string 0.9 ->8 byte 0x0a Debian Binary Package - ->>3 byte >0 created by dpkg 0.9%c +>8 byte 0x0a Debian Binary Package +>>3 byte >0 \b, created by dpkg 0.9%c >>4 byte >0 pl%c # PSF fonts, from H. Peter Anvin -0 leshort 0x0436 Linux/i386 PC Screen Font data ->2 byte 0 - 256 characters, no directory, ->2 byte 1 - 512 characters, no directory, ->2 byte 2 - 256 characters, Unicode directory, ->2 byte 3 - 512 characters, Unicode directory, +0 leshort 0x0436 Linux/i386 PC Screen Font data, +>2 byte 0 256 characters, no directory, +>2 byte 1 512 characters, no directory, +>2 byte 2 256 characters, Unicode directory, +>2 byte 3 512 characters, Unicode directory, >3 byte >0 8x%d # Linux swap file, from Daniel Quinlan 4086 string SWAP-SPACE Linux/i386 swap file +# ECOFF magic for OSF/1 and Linux (only tested under Linux though) +# +# from Erik Troan (ewt@redhat.com) examining od dumps, so this +# could be wrong +# updated by David Mosberger (davidm@azstarnet.com) based on +# GNU BFD and MIPS info found below. +# +0 leshort 0x0183 ECOFF alpha +>24 leshort 0407 executable +>24 leshort 0410 pure +>24 leshort 0413 demand paged +>8 long >0 not stripped +>8 long 0 stripped +>23 leshort >0 - version %ld. +# linux Kernel images version 1.3.80 - ? +# from Axel Kohlmeyer +0 belong 0xb8c0078e Linux/x86 kernel image, +>0x048c byte 0x31 +>>0x048c string x version %s +>0x0493 byte 0x31 +>>0x0493 string x version %s +# diff --git a/magic/Magdir/mail.news b/magic/Magdir/mail.news index 64c4e1c3..2003b53d 100644 --- a/magic/Magdir/mail.news +++ b/magic/Magdir/mail.news @@ -16,3 +16,6 @@ 0 string From: news or mail text 0 string Article saved news text 0 string BABYL Emacs RMAIL text +0 string Received: RFC 822 mail message +0 string MIME-Version: MIME entity +0 string Content- MIME entity diff --git a/magic/Magdir/motorola b/magic/Magdir/motorola index d9fa2261..efed1597 100644 --- a/magic/Magdir/motorola +++ b/magic/Magdir/motorola @@ -27,3 +27,6 @@ # Motorola/88Open BCS # 0 beshort 0555 88K BCS executable +# +# Motorola S-Records, from Gerd Truschinski +0 string S0 Motorola S-Record; binary data in text format diff --git a/magic/Magdir/msdos b/magic/Magdir/msdos index 8f2381ce..db2c03ed 100644 --- a/magic/Magdir/msdos +++ b/magic/Magdir/msdos @@ -3,6 +3,9 @@ # msdos: file(1) magic for MS-DOS files # +# .BAT files (Daniel Quinlan, quinlan@yggdrasil.com) +0 string @echo\ off MS-DOS batch file text + # .EXE formats (Greg Roelofs, newt@uchicago.edu) # 0 string MZ MS-DOS executable (EXE) diff --git a/magic/Magdir/netbsd b/magic/Magdir/netbsd index 606e828a..9855b7da 100644 --- a/magic/Magdir/netbsd +++ b/magic/Magdir/netbsd @@ -8,6 +8,15 @@ >16 lelong >0 not stripped 0 lelong 000000314 BSDI demand paged executable >16 lelong >0 not stripped +>32 byte 0x6a (uses shared libs) + +0 lelong&077777777 041400314 FreeBSD/i386 demand paged +>3 byte &0x80 +>>20 lelong <4096 shared library +>>20 lelong =4096 dynamically linked executable +>>20 lelong >4096 dynamically linked executable +>3 byte ^0x80 executable +>16 lelong >0 not stripped 0 lelong 000000407 NetBSD little-endian object file >16 lelong >0 not stripped diff --git a/magic/Magdir/printer b/magic/Magdir/printer index 39f78f88..2d12bc5e 100644 --- a/magic/Magdir/printer +++ b/magic/Magdir/printer @@ -4,14 +4,14 @@ # # PostScript, updated by Daniel Quinlan (quinlan@yggdrasil.com) -0 string %! PostScript document +0 string %! PostScript document text >2 string PS-Adobe- conforming >>11 string >\0 at level %.3s >>>15 string EPS - type %s >>>15 string Query - type %s >>>15 string ExitServer - type %s # Some PCs have the annoying habit of adding a ^D as a document separator -0 string \004%! PostScript document +0 string \004%! PostScript document text >3 string PS-Adobe- conforming >>12 string >\0 at level %.3s >>>16 string EPS - type %s @@ -20,6 +20,8 @@ # HP Printer Job Language 0 string \033%-12345X@PJL HP Printer Job Language data +>15 string \ ENTER\ LANGUAGE\ = +>31 string PostScript Postscript # HP Printer Control Language, Daniel Quinlan (quinlan@yggdrasil.com) 0 string \033E\033 HP PCL printer data diff --git a/magic/Magdir/sgml b/magic/Magdir/sgml index bb9b01e0..985bbeca 100644 --- a/magic/Magdir/sgml +++ b/magic/Magdir/sgml @@ -1,3 +1,4 @@ + #------------------------------------------------------------------------------ # sgml: file(1) magic for Standard Generalized Markup Language diff --git a/magic/Magdir/uuencode b/magic/Magdir/uuencode index 415f28e0..7e88619d 100644 --- a/magic/Magdir/uuencode +++ b/magic/Magdir/uuencode @@ -22,4 +22,9 @@ # Greg Roelofs, newt@uchicago.edu 0 string Decode\ the\ following\ with\ bdeco bencoded News text +# BinHex is the Macintosh ASCII-encoded file format (see also "apple") +# Daniel Quinlan, quinlan@yggdrasil.com +11 string must\ be\ converted\ with\ BinHex BinHex binary text +>41 string x \b, version %.3s + # GRR: is MIME BASE64 encoding handled somewhere? diff --git a/magic/Magdir/zyxel b/magic/Magdir/zyxel index d6bca01e..12a6abd5 100644 --- a/magic/Magdir/zyxel +++ b/magic/Magdir/zyxel @@ -7,7 +7,10 @@ # ZyXEL U-1496E DATA/FAX/VOICE modems. (This header conforms to a # ZyXEL-defined standard) -0 string ZyXEL\002 ZyXEL voice data ->10 byte 0 - CELP encoding ->10 byte 1 - ADPCM2 encoding ->10 byte 2 - ADPCM3 encoding +0 string ZyXEL\002 ZyXEL voice data +>10 byte 0 - CELP encoding +>10 byte&0x0B 1 - ADPCM2 encoding +>10 byte&0x0B 2 - ADPCM3 encoding +>10 byte&0x0B 3 - ADPCM4 encoding +>10 byte&0x0B 8 - New ADPCM3 encoding +>10 byte&0x04 4 with resync