]> granicus.if.org Git - file/commitdiff
Fixes from rrt@
authorChristos Zoulas <christos@zoulas.com>
Tue, 5 Feb 2008 01:59:08 +0000 (01:59 +0000)
committerChristos Zoulas <christos@zoulas.com>
Tue, 5 Feb 2008 01:59:08 +0000 (01:59 +0000)
22 files changed:
magic/Magdir/animation
magic/Magdir/apple
magic/Magdir/audio
magic/Magdir/commands
magic/Magdir/compress
magic/Magdir/cracklib
magic/Magdir/database
magic/Magdir/elf
magic/Magdir/fsav
magic/Magdir/hp
magic/Magdir/images
magic/Magdir/jpeg
magic/Magdir/linux
magic/Magdir/macintosh
magic/Magdir/msdos
magic/Magdir/perl
magic/Magdir/pgp
magic/Magdir/revision
magic/Magdir/riff
magic/Magdir/scientific
magic/Magdir/sgi
magic/Magdir/spectrum

index b2e687cf756a8e35d1b9cbd25b895970069bb9ea..7480b02527c64b4c8e954281b63ce921a01ed37a 100644 (file)
 >12     string          rmra            \b multiple URLs
 4       string          mdat            Apple QuickTime movie (unoptimized)
 !:mime video/quicktime
-4       string          wide            Apple QuickTime movie (unoptimized)
-!:mime video/quicktime
-4       string          skip            Apple QuickTime movie (modified)
-!:mime video/quicktime
-4       string          free            Apple QuickTime movie (modified)
-!:mime video/quicktime
+#4       string          wide            Apple QuickTime movie (unoptimized)
+#!:mime        video/quicktime
+#4       string          skip            Apple QuickTime movie (modified)
+#!:mime        video/quicktime
+#4       string          free            Apple QuickTime movie (modified)
+#!:mime        video/quicktime
 4       string          idsc            Apple QuickTime image (fast start)
 !:mime image/x-quicktime
-4       string          idat            Apple QuickTime image (unoptimized)
-!:mime image/x-quicktime
+#4       string          idat            Apple QuickTime image (unoptimized)
+#!:mime        image/x-quicktime
 4       string          pckg            Apple QuickTime compressed archive
 !:mime application/x-quicktime-player
 4      string/B        jP              JPEG 2000 image
@@ -53,6 +53,8 @@
 >8     string          avc1            \b, MPEG v4 system, 3GPP JVT AVC
 !:mime video/3gpp
 >8     string/B        M4A             \b, MPEG v4 system, iTunes AAC-LC
+!:mime audio/mp4
+>8     string/B        M4V             \b, MPEG v4 system, iTunes AVC-LC
 !:mime video/mp4
 >8     string/B        M4P             \b, MPEG v4 system, iTunes AES encrypted
 >8     string/B        M4B             \b, MPEG v4 system, iTunes bookmarked
index 4a593ea221ec0a7587eac3cfe49e989ad80084c7..32232e72229fb3633330a4acdf8c00a1f77a6a27 100644 (file)
 0      belong          0x00051600              AppleSingle encoded Macintosh file
 0      belong          0x00051607              AppleDouble encoded Macintosh file
 
+# Type: Apple Emulator 2IMG format
+# From: Radek Vokal <rvokal@redhat.com>
+0      string          2IMG    Apple ][ 2IMG Disk Image
+>4     string          XGS!    \b, XGS
+>4     string          CTKG    \b, Catakig
+>4     string          ShIm    \b, Sheppy's ImageMaker
+>4     string          WOOF    \b, Sweet 16
+>4     string          B2TR    \b, Bernie ][ the Rescue
+>4     string          !nfc    \b, ASIMOV2
+>4     string          x       \b, Unknown Format
+>0xc   byte            00      \b, DOS 3.3 sector order
+>>0x10 byte            00      \b, Volume 254
+>>0x10 byte&0x7f       x       \b, Volume %u
+>0xc   byte            01      \b, ProDOS sector order
+>>0x14 short           x       \b, %u Blocks
+>0xc   byte            02      \b, NIB data
+
 # magic for Newton PDA package formats
 # from Ruda Moura <ruda@helllabs.org>
 0      string  package0        Newton package, NOS 1.x,
index c235e8aef58b5013afdfddf0f2f3965ef0274e08..48e13b97d62b5372ca07723e75c3e3b69c0634c6 100644 (file)
@@ -83,7 +83,7 @@
 
 # Creative Labs AUDIO stuff
 0      string  MThd                    Standard MIDI data
-!:mime audio/x-midi
+!:mime audio/midi
 >8     beshort x                       (format %d)
 >10    beshort x                       using %d track
 >10    beshort         >1              \bs
 # From: "Leslie P. Polzer" <leslie.polzer@gmx.net>
 60     string  SONG            SoundFX Module sound file
 
+# Type: Adaptive Multi-Rate Codec
+# URL:  http://filext.com/detaillist.php?extdetail=AMR
+# From: Russell Coker <russell@coker.com.au>
+0      string  #!AMR           Adaptive Multi-Rate Codec (GSM telephony)
index d1a33ebad96f01c0143befb1b0d37fb7d3a5bba5..d42fbefe0187a58896f1192f33d116ae3157064c 100644 (file)
@@ -3,7 +3,7 @@
 # commands:  file(1) magic for various shells and interpreters
 #
 #0     string          :                       shell archive or script for antique kernel text
-0      string/b        #!\ /bin/sh             Bourne shell script text executable
+0      string/b        #!\ /bin/sh             POSIX shell script text executable
 !:mime application/x-shellscript
 0      string/b        #!\ /bin/csh            C shell script text executable
 !:mime application/x-shellscript
index 1d8cbd114a006277963dac258b28134b0323501d..1ac63e3963d3b52e6a740fa74adb38c16329de9e 100644 (file)
@@ -9,8 +9,8 @@
 # because it tries to uncompress it to figure out what's inside.
 
 # standard unix compress
-     string          \037\235        compress'd data
-!:mime application/x-compress
+#0     string          \037\235        compress'd data
+#!:mime        application/x-compress
 >2     byte&0x80       >0              block compressed
 >2     byte&0x1f       x               %d bits
 
 # bzip a block-sorting file compressor
 #      by Julian Seward <sewardj@cs.man.ac.uk> and others
 #
-     string          BZ              bzip compressed data
->2     byte            x               \b, version: %c
->3     string          =1              \b, compression block size 100k
->3     string          =2              \b, compression block size 200k
->3     string          =3              \b, compression block size 300k
->3     string          =4              \b, compression block size 400k
->3     string          =5              \b, compression block size 500k
->3     string          =6              \b, compression block size 600k
->3     string          =7              \b, compression block size 700k
->3     string          =8              \b, compression block size 800k
->3     string          =9              \b, compression block size 900k
+#0     string          BZ              bzip compressed data
+#>2    byte            x               \b, version: %c
+#>3    string          =1              \b, compression block size 100k
+#>3    string          =2              \b, compression block size 200k
+#>3    string          =3              \b, compression block size 300k
+#>3    string          =4              \b, compression block size 400k
+#>3    string          =5              \b, compression block size 500k
+#>3    string          =6              \b, compression block size 600k
+#>3    string          =7              \b, compression block size 700k
+#>3    string          =8              \b, compression block size 800k
+#>3    string          =9              \b, compression block size 900k
 
 # lzop from <markus.oberhumer@jk.uni-linz.ac.at>
 0      string          \x89\x4c\x5a\x4f\x00\x0d\x0a\x1a\x0a    lzop compressed data
 >6     byte            x                       version %d
 >7     byte            x                       \b.%d
 
+# Type: LZMA
+# URL:  http://www.7-zip.org/sdk.html
+# From: Robert Millan <rmh@aybabtu.com>
+0      string          ]\000\000\200\000\377\377\377\377\377\377\377\377       LZMA compressed data
+
 # AFX compressed files (Wolfram Kleff)
 2      string          -afx-           AFX compressed file data
 
index 8f7e0d460e5a170e7056e53e96a01cf3a0846983..a1a5a275532ea6225c3dc7e416bd6487fb867abd 100644 (file)
@@ -9,5 +9,5 @@
 0      belong  0x70775631      Cracklib password index, big endian
 >4     belong  >-1             (%i words)
 # really bellong 0x0000000070775631
-4      belong  0x70775631      Cracklib password index, big endian ("64-bit")
+0      search/1        \0\0\0\0pwV1    Cracklib password index, big endian ("64-bit")
 >12    belong  >0              (%i words)
index d1f374d5ee029af9a4fda35a182ee89c30134b19..cae67fc61db481fcb21becf48a5d26d4c7d71719 100644 (file)
 >5     beshort         >0x100
 >>7    byte            x               \b-%d
 
+# Type: Advanced Data Format (ADF) database
+# URL:  http://www.grc.nasa.gov/WWW/cgns/adf/
+# From: Nicolas Chauvat <nicolas.chauvat@logilab.fr>
+0      string  @(#)ADF\ Database       CGNS Advanced Data Format
index dadfda779d31b723832555e52c6f43604a634afc..b362fe0c820ff34ecd2734b4ebe529eac4b41464 100644 (file)
 >>18   leshort         51              Stanford MIPS-X,
 >>18   leshort         52              Motorola Coldfire,
 >>18   leshort         53              Motorola M68HC12,
+>>18   leshort         54              Fujitsu MMA,
+>>18   leshort         55              Siemens PCP,
+>>18   leshort         56              Sony nCPU,
+>>18   leshort         57              Denso NDR1,
+>>18   leshort         58              Start*Core,
+>>18   leshort         59              Toyota ME16,
+>>18   leshort         60              ST100,
+>>18   leshort         61              Tinyj emb.,
 >>18   leshort         62              x86-64,
+>>18   leshort         63              Sony DSP,
+>>18   leshort         66              FX66,
+>>18   leshort         67              ST9+ 8/16 bit,
+>>18   leshort         68              ST7 8 bit,
+>>18   leshort         69              MC68HC16,
+>>18   leshort         70              MC68HC11,
+>>18   leshort         71              MC68HC08,
+>>18   leshort         72              MC68HC05,
+>>18   leshort         73              SGI SVx,
+>>18   leshort         74              ST19 8 bit,
 >>18   leshort         75              Digital VAX,
+>>18   leshort         76              Axis cris,
+>>18   leshort         77              Infineon 32-bit embedded,
+>>18   leshort         78              Element 14 64-bit DSP,
+>>18   leshort         79              LSI Logic 16-bit DSP,
+>>18   leshort         80              MMIX,
+>>18   leshort         81              Harvard machine-independent,
+>>18   leshort         82              SiTera Prism,
+>>18   leshort         83              Atmel AVR 8-bit,
+>>18   leshort         84              Fujitsu FR30,
+>>18   leshort         85              Mitsubishi D10V,
+>>18   leshort         86              Mitsubishi D30V,
+>>18   leshort         87              NEC v850,
 >>18   leshort         88              Renesas M32R,
+>>18   leshort         89              Matsushita MN10300,
+>>18   leshort         90              Matsushita MN10200,
+>>18   leshort         91              picoJava,
+>>18   leshort         92              OpenRISC,
+>>18   leshort         93              ARC Cores Tangent-A5,
+>>18   leshort         0x3426          OpenRISC (obsolete),
+>>18   leshort         0x8472          OpenRISC (obsolete),
 >>18   leshort         94              Tensilica Xtensa,
 >>18   leshort         97              NatSemi 32k,
 >>18   leshort         106             Analog Devices Blackfin,
 >>18   beshort         73              Cray NV1,
 >>18   beshort         75              Digital VAX,
 >>18   beshort         88              Renesas M32R,
+>>18   leshort         92              OpenRISC,
+>>18   leshort         0x3426          OpenRISC (obsolete),
+>>18   leshort         0x8472          OpenRISC (obsolete),
 >>18   beshort         94              Tensilica Xtensa,
 >>18   beshort         97              NatSemi 32k,
 >>18   beshort         0x18ad          AVR32 (unofficial),
index 4d61bebaa292940b2fe6a659f15fc44975502a85..d023edacd7f27d197947609b40243604a6b5462b 100644 (file)
@@ -58,3 +58,7 @@
 >>>>769        string          ustar\0         \b, tared
 >512   string          \037\213        \b, gzipped
 >769   string          ustar\0         \b, tared
+
+# Type: Grisoft AVG AntiVirus
+# From: David Newgas <david@newgas.net>
+0      string  AVG7_ANTIVIRUS_VAULT_FILE       AVG 7 Antivirus vault file data
index 052f09a23996bfcbb8255c888c30ae3258c8e0db..e4f897749b5cb263820371cc906a17820970efb5 100644 (file)
 >8     long            >0              %d messages
 
 # addendum to /etc/magic with HP-48sx file-types by phk@data.fls.dk 1jan92
-0      string          HPHP48-         HP48 binary
->7     byte            >0              - Rev %c
->8     beshort         0x1129          (ADR)
->8     beshort         0x3329          (REAL)
->8     beshort         0x5529          (LREAL)
->8     beshort         0x7729          (COMPLX)
->8     beshort         0x9d29          (LCOMPLX)
->8     beshort         0xbf29          (CHAR)
->8     beshort         0xe829          (ARRAY)
->8     beshort         0x0a2a          (LNKARRAY)
->8     beshort         0x2c2a          (STRING)
->8     beshort         0x4e2a          (HXS)
->8     beshort         0x742a          (LIST)
->8     beshort         0x962a          (DIR)
->8     beshort         0xb82a          (ALG)
->8     beshort         0xda2a          (UNIT)
->8     beshort         0xfc2a          (TAGGED)
->8     beshort         0x1e2b          (GROB)
->8     beshort         0x402b          (LIB)
->8     beshort         0x622b          (BACKUP)
->8     beshort         0x882b          (LIBDATA)
->8     beshort         0x9d2d          (PROG)
->8     beshort         0xcc2d          (CODE)
->8     beshort         0x482e          (GNAME)
->8     beshort         0x6d2e          (LNAME)
->8     beshort         0x922e          (XLIB)
-0      string          %%HP:           HP48 text
+0      string          HPHP4           HP
+>5     string          8               48 binary
+>5     string          9               49 binary
+>7     byte            >64             - Rev %c
+>8     leshort         0x2911          (ADR)
+>8     leshort         0x2933          (REAL)
+>8     leshort         0x2955          (LREAL)
+>8     leshort         0x2977          (COMPLX)
+>8     leshort         0x299d          (LCOMPLX)
+>8     leshort         0x29bf          (CHAR)
+>8     leshort         0x29e8          (ARRAY)
+>8     leshort         0x2a0a          (LNKARRAY)
+>8     leshort         0x2a2c          (STRING)
+>8     leshort         0x2a4e          (HXS)
+>8     leshort         0x2a74          (LIST)
+>8     leshort         0x2a96          (DIR)
+>8     leshort         0x2ab8          (ALG)
+>8     leshort         0x2ada          (UNIT)
+>8     leshort         0x2afc          (TAGGED)
+>8     leshort         0x2b1e          (GROB)
+>8     leshort         0x2b40          (LIB)
+>8     leshort         0x2b62          (BACKUP)
+>8     leshort         0x2b88          (LIBDATA)
+>8     leshort         0x2d9d          (PROG)
+>8     leshort         0x2dcc          (CODE)
+>8     leshort         0x2e48          (GNAME)
+>8     leshort         0x2e6d          (LNAME)
+>8     leshort         0x2e92          (XLIB)
+
+0      string          %%HP:           HP text
 >6     string          T(0)            - T(0)
 >6     string          T(1)            - T(1)
 >6     string          T(2)            - T(2)
 >14    string          F(.)            F(.);
 >14    string          F(,)            F(,);
 
+0      string          HP3             HP
+>3     string          8               38
+>3     string          9               39
+>4     string          Bin             binary
+>4     string          Asc             ASCII
+>7     string          A               (Directory List)
+>7     string          B               (Zaplet)
+>7     string          C               (Note)
+>7     string          D               (Program)
+>7     string          E               (Variable)
+>7     string          F               (List)
+>7     string          G               (Matrix)
+>7     string          H               (Library)
+>7     string          I               (Target List)
+>7     string          J               (ASCII Vector specification)
+>7     string          K               (wildcard)
+
 # hpBSD magic numbers
 0      beshort         200             hp200 (68010) BSD
 >2     beshort         0407            impure binary
 >>>>>>>>>0xC4  belong  34              - received SIGXFSZ
 
 # From: AMAKAWA Shuhei <sa264@cam.ac.uk>
-     string  HPHP49-                 HP49 binary
+#0     string  HPHP49-                 HP49 binary
 
index 57ef7a968ef4c18424860d8fc014c185c49e4303..766e15ba70e075e0bf1305f0a833560410a919cf 100644 (file)
 # CGM image files
 0      string          BEGMF           clear text Computer Graphics Metafile
 # XXX - questionable magic
-     beshort&0xffe0  0x0020          binary Computer Graphics Metafile
-     beshort         0x3020          character Computer Graphics Metafile
+#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
 
 # PC bitmaps (OS/2, Windows BMP files)  (Greg Roelofs, newt@uchicago.edu)
 0      string          BM              PC bitmap data
-!:mime image/bmp
+!:mime image/x-ms-bmp
 >14    leshort         12              \b, OS/2 1.x format
 >>18   leshort         x               \b, %d x
 >>20   leshort         x               %d
 
 # other images
 0      string  This\ is\ a\ BitMap\ file       Lisp Machine bit-array-file
-     string          =!!             Bennet Yee's "face" format
+#0     string          =!!             Bennet Yee's "face" format
 
 # From SunOS 5.5.1 "/etc/magic" - appeared right before Sun raster image
 # stuff.
 0      string  AT&TFORM                DjVu Image file
 !:mime image/vnd.djvu
 
-# From: Jason Bacon <bacon@smithers.neuro.mcw.edu>
-0      beshort 0x3020                  character Computer Graphics Metafile
-
 # From Marc Espie
 0      lelong  20000630                OpenEXR image data
 
 # Hierarchical Data Format, used to facilitate scientific data exchange
 # specifications at http://hdf.ncsa.uiuc.edu/
 0      belong  0x0e031301      Hierarchical Data Format (version 4) data
+!:mime application/x-hdf
 0      string  \211HDF\r\n\032 Hierarchical Data Format (version 5) data
+!:mime application/x-hdf
 
 # From: Tobias Burnus <burnus@net-b.de>
 # Xara (for a while: Corel Xara) is a graphic package, see
index b3e6646fe21af7126aecbc80338ead6bef71db09..9a9509e844b8376fa215f4d7884307c201a18b03 100644 (file)
 
 # From: David Santinoli <david@santinoli.com>
 0      string          \x00\x00\x00\x0C\x6A\x50\x20\x20\x0D\x0A\x87\x0A        JPEG 2000 image data
+
+# Type: JPEG 2000 codesream
+# From: Mathieu Malaterre <mathieu.malaterre@gmail.com>
+0      belong          0xff4fff51                                              JPEG 2000 codestream
+45     beshort         0xff52
index fe68013a1653a8085d26afe26733bb7f301f2b03..d6a4d954970456009a43afb966c78519c4b5c7a8 100644 (file)
 0      string  Begin3  Linux Software Map entry text
 0      string  Begin4  Linux Software Map entry text (new format)
 
-# From Matt Zimmerman
-0       belong  0x4f4f4f4d      User-mode Linux COW file
->4      belong  x               \b, version %d
->8      string  >\0             \b, backing file %s
+# From Matt Zimmerman, enhanced for v3 by Matthew Palmer
+0      belong  0x4f4f4f4d      User-mode Linux COW file
+>4     belong  <3              \b, version %d
+>>8    string  >\0             \b, backing file %s
+>4     belong  >2              \b, version %d
+>>32   string  >\0             \b, backing file %s
 
 ############################################################################
 # Linux kernel versions
index 6a903f8c16e0c06c408cd3cd10e36e21e8a03b85..ca39c1d076b4527a182888dbddb4d6d3c301f62d 100644 (file)
 # cstring. Of course, partitions can contain more than four entries, but 
 # what're you gonna do?
 0x200          beshort         0x504D          Apple Partition data
->0x2           beshort         x               block size: %d,
+>0x2           beshort         x               (block size: %d):
 >0x230         string          x               first type: %s,
 >0x210         string          x               name: %s,
 >0x254         belong          x               number of blocks: %d,
 >>0x430                string          x               second type: %s,
 >>0x410                string          x               name: %s,
 >>0x454                belong          x               number of blocks: %d,
+>>0x600                beshort         0x504D
+>>>0x630       string          x               third type: %s,
+>>>0x610       string          x               name: %s,
+>>>0x654       belong          x               number of blocks: %d,
 >>0x800                beshort         0x504D          
->>>0x830       string          x               third type: %s,
+>>>0x830       string          x               fourth type: %s,
 >>>0x810       string          x               name: %s,
 >>>0x854       belong          x               number of blocks: %d,
 >>>0xa00       beshort         0x504D          
->>>>0xa30      string          x               fourth type: %s,
+>>>>0xa30      string          x               fifth type: %s,
 >>>>0xa10      string          x               name: %s,
 >>>>0xa54      belong          x               number of blocks: %d
+>>>0xc00       beshort         0x504D
+>>>>0xc30      string          x               sixth type: %s,
+>>>>0xc10      string          x               name: %s,
+>>>>0xc54      belong          x               number of blocks: %d
 # AFAIK, only the signature is different
 0x200          beshort         0x5453          Apple Old Partition data
 >0x2           beshort         x               block size: %d,
index aaa99466c432b4c734552ff54e28fcfc4020f446..75a7d77447597a8fe1ac9b35489e317e038f39a5 100644 (file)
 # Uncommenting only the first two lines will cover about 2/3 of COM files,
 # but it isn't feasible to match all COM files since there must be at least
 # two dozen different one-byte "magics".
-     byte            0xe9            DOS executable (COM)
->0x1FE leshort         0xAA55          \b, boot code
+#0     byte            0xe9            DOS executable (COM)
+#>0x1FE        leshort         0xAA55          \b, boot code
 >6     string          SFX\ of\ LHarc  (%s)
 0      belong  0xffffffff              DOS executable (device driver)
 #CMD640X2.SYS
 >>77   string  >\x40                   
 >>>77  string  <\x5B                   
 >>>>77 string  x                       \b, name: %.8s
-     byte            0x8c            DOS executable (COM)
+#0     byte            0x8c            DOS executable (COM)
 # 0xeb conflicts with "sequent" magic
-     byte            0xeb            DOS executable (COM)
->0x1FE leshort         0xAA55          \b, boot code
->85    string          UPX             \b, UPX compressed
->4     string          \ $ARX          \b, ARX self-extracting archive
->4     string          \ $LHarc        \b, LHarc self-extracting archive
->0x20e string          SFX\ by\ LARC   \b, LARC self-extracting archive
-     byte            0xb8            COM executable
+#0     byte            0xeb            DOS executable (COM)
+#>0x1FE        leshort         0xAA55          \b, boot code
+#>85   string          UPX             \b, UPX compressed
+#>4    string          \ $ARX          \b, ARX self-extracting archive
+#>4    string          \ $LHarc        \b, LHarc self-extracting archive
+#>0x20e        string          SFX\ by\ LARC   \b, LARC self-extracting archive
+#0     byte            0xb8            COM executable
 # modified by Joerg Jenderek
 >1     lelong          !0x21cd4cff     for DOS
 # http://syslinux.zytor.com/comboot.php
 # syntax available by some file commands you could write:
 # 0 lelong 1
 # &40 ulelong 0x464D4520 Windows Enhanced Metafile (EMF) image data
-40     ulelong 0x464D4520      Windows Enhanced Metafile (EMF) image data
->44    ulelong x               version 0x%x.
+#40    ulelong 0x464D4520      Windows Enhanced Metafile (EMF) image data
+#>44   ulelong x               version 0x%x.
 # If the description has a length greater than zero, it exists and is 
 # found at offset (*64).
->64    ulelong >0              Description available at offset 0x%x
->>60   ulelong >0              (length 0x%x)
+#>64   ulelong >0              Description available at offset 0x%x
+#>>60  ulelong >0              (length 0x%x)
 # Note it would be better to print out the description, which is found 
 # as below. Unfortunately the following only prints out the first couple
 # of characters instead of all the "description length"
 # number of characters -- indicated by the ulelong at offset 60.
->>(64.l)  lestring16 >0 Description: %15.15s
+#>>(64.l)  lestring16 >0 Description: %15.15s
 
 # From: Alex Beregszaszi <alex@fsn.hu>
 0      string  COWD            VMWare3
 0      string $RBU
 >23    string Dell                     %s system BIOS
 >48    string x                        version %.3s
+
+# Type: Microsoft DirectDraw Surface
+# URL:  http://msdn.microsoft.com/library/default.asp?url=/library/en-us/directx9_c/directx/graphics/reference/DDSFileReference/ddsfileformat.asp
+# From: Morten Hustveit <morten@debian.org>
+0      string  DDS\040\174\000\000\000 Microsoft DirectDraw Surface (DDS),
+>16    lelong  >0                      %hd x
+>12    lelong  >0                      %hd,
+>84    string  x                       %.4s
+
+# Type: Microsoft Document Imaging Format (.mdi)
+# URL:  http://en.wikipedia.org/wiki/Microsoft_Document_Imaging_Format
+# From: Daniele Sempione <scrows@oziosi.org>
+0      short   0x5045                  Microsoft Document Imaging Format
index 89fca64ff3a85d272f34bc49224b4f9596e7ffbc..e046dc39b90b67f1974fab646a5e8ba6fcd1961b 100644 (file)
@@ -13,9 +13,9 @@
 !:mime application/x-perl
 0      string          eval\ "exec\ /usr/bin/perl      perl script text
 !:mime application/x-perl
-0      string/b        #!\ /usr/local/bin/perl         perl script text
+0      string/b        #!\ /usr/local/bin/perl         perl script text executable
 !:mime application/x-perl
-0      string          eval\ "exec\ /usr/local/bin/perl        perl script text executable
+0      string          eval\ "exec\ /usr/local/bin/perl        perl script text
 !:mime application/x-perl
 0      string          eval\ '(exit\ $?0)'\ &&\ eval\ 'exec    perl script text
 !:mime application/x-perl
index 88519b77726916b11a555a97ae02ae9767b252a0..63042adeef825d112132c42ab61a6c300b683773 100644 (file)
 0       beshort         0x9500                  PGP key security ring
 !:mime application/x-pgp-keyring
 0      beshort         0xa600                  PGP encrypted data
-!:mime application/pgp-encrypted
-0       string          -----BEGIN\040PGP       PGP armored data
+#!:mime        application/pgp-encrypted
+#0     string          -----BEGIN\040PGP       text/PGP armored data
 !:mime text/PGP # encoding: armored data
->15     string          PUBLIC\040KEY\040BLOCK- public key block
->15     string          MESSAGE-                message
->15     string          SIGNED\040MESSAGE-      signed message
->15     string          PGP\040SIGNATURE-       signature
+#>15   string  PUBLIC\040KEY\040BLOCK- public key block
+#>15   string  MESSAGE-                message
+#>15   string  SIGNED\040MESSAGE-      signed message
+#>15   string  PGP\040SIGNATURE-       signature
+
+2      string  ---BEGIN\ PGP\ PUBLIC\ KEY\ BLOCK-      PGP public key block
+!:mime application/pgp-keys
+0      string  -----BEGIN\040PGP\40MESSAGE-            PGP message
+!:mime application/pgp
+0      string  -----BEGIN\040PGP\40SIGNATURE-          PGP signature
+!:mime application/pgp-signature
index e47416ab68d0e54907e0df48cee619f8a91014a5..a809cb9e60346ed434f1d0956b6198d63c53bcf7 100644 (file)
@@ -7,3 +7,13 @@
 # Conary changesets
 # From: Jonathan Smith <smithj@rpath.com>
 0      belong  0xea3f81bb      Conary changeset data
+
+# Type: Git bundles (git-bundle)
+# From: Josh Triplett <josh@freedesktop.org>
+0      string  #\ v2\ git\ bundle\n    Git bundle
+
+# Type:        Mercurial bundles
+# From:        Seo Sanghyeon <tinuviel@sparcs.kaist.ac.kr>
+0      string  HG10            Mercurial bundle,
+>4     string  UN              uncompressed
+>4     string  BZ              bzip2 compressed
index 6d246458fada86d5d6f01874c19caeb1b889f5e1..af8d2519ac5c6fb72229d4d2b2653b14bb6696af 100644 (file)
 >>>>>>>(104.l+132)      string/c        divx    DivX 4
 >>>>>>>(104.l+132)      string/c        dx50    DivX 5
 >>>>>>>(104.l+132)      string/c        xvid    XviD
+>>>>>>>(104.l+132)     string/c        h264    H.264
 >>>>>>>(104.l+132)      string/c        wmv3    Windows Media Video 9
 >>>>>>>(104.l+132)      string/c        h264    X.264
 >>>>>>>(104.l+132)      lelong  0
index 81beac12060345336d4001bff4c2cb6a30362e5f..055240735b9eb571315c46cc885968f8e6467cb5 100644 (file)
 >1104  ulong   >0              %d x
 >1108  ulong   >0              %d,
 >1120  ulong   >0              %d bits/pixel
+
+# Type: GEDCOME genealogical (family history) data
+# From: Phil Endecott <phil05@chezphil.org>
+0      string  0\ HEAD                                                         GEDCOM text
+0      string  \000\060\000\040\000\110\000\105\000\101\000\104                GEDCOM text
+0      string  \060\000\040\000\110\000\105\000\101\000\104\000                GEDCOM text
+0      string  \376\377\000\060\000\040\000\110\000\105\000\101\000\104        GEDCOM text
+0      string  \377\376\060\000\040\000\110\000\105\000\101\000\104\000        GEDCOM text
index f7de13800b9ffa5a71f8a439f31aef84bf4300c5..5b540278c8b1f03227d5a7dec7f5ec79dfa985ad 100644 (file)
@@ -8,12 +8,17 @@
 0      string  PmNs                            PCP compiled namespace (V.0)
 0      string  PmN                             PCP compiled namespace
 >3     string  >\0                             (V.%1.1s)
-3      lelong  0x84500526                      PCP archive
+#3     lelong  0x84500526                      PCP archive
+3      belong  0x84500526                      PCP archive
 >7     byte    x                               (V.%d)
->20    lelong  -2                              temporal index
->20    lelong  -1                              metadata
->20    lelong  0                               log volume #0
->20    lelong  >0                              log volume #%ld
+#>20   lelong  -2                              temporal index
+#>20   lelong  -1                              metadata
+#>20   lelong  0                               log volume #0
+#>20   lelong  >0                              log volume #%ld
+>20    belong  -2                              temporal index
+>20    belong  -1                              metadata
+>20    belong  0                               log volume #0
+>20    belong  >0                              log volume #%ld
 >24    string  >\0                             host: %s
 0      string  PCPFolio                        PCP
 >9     string  Version:                        Archive Folio
@@ -30,6 +35,9 @@
 0      string  #pmlogger                       PCP pmlogger config
 >10    string  Version
 >18    string  >\0                             (V%1.1s)
+0      string  #pmdahotproc                    PCP pmdahotproc config
+>13    string  Version
+>21    string  >\0                             (V%-3.3s)
 0      string  PcPh                            PCP Help
 >4     string  1                               Index
 >4     string  2                               Text
index ab9fd0467f424ba75717cf28655e01918ace6e12..a48ac41357e92de421144a749ac428d5b11be0e8 100644 (file)
 # TZX tape images
 0      string          ZXTape!\x1a     Spectrum .TZX data
 >8     byte            x               version %d
->9     byte            x               .%d
+>9     byte            x               \b.%d
 
 # RZX input recording files
 0      string          RZX!            Spectrum .RZX data
 >4     byte            x               version %d
->5     byte            x               .%d
+>5     byte            x               \b.%d
 
-# And three sorts of disk image
+# Floppy disk images
 0      string          MV\ -\ CPCEMU\ Disk-Fil Amstrad/Spectrum .DSK data
 0      string          MV\ -\ CPC\ format\ Dis Amstrad/Spectrum DU54 .DSK data
 0      string          EXTENDED\ CPC\ DSK\ Fil Amstrad/Spectrum Extended .DSK data
+0      string          SINCLAIR        Spectrum .SCL Betadisk image
+
+# Hard disk images
+0      string          RS-IDE\x1a      Spectrum .HDF hard disk image
+>7     byte            x               \b, version 0x%02x