diff options
| author | jbj <devnull@localhost> | 2003-04-15 20:04:25 +0000 |
|---|---|---|
| committer | jbj <devnull@localhost> | 2003-04-15 20:04:25 +0000 |
| commit | 14165bc5582af0306bff6bb42b7c76305bec5abf (patch) | |
| tree | 6619207c7edfbf96bf524fb4acd5616bc797bd92 | |
| parent | 392e5feaca236adca8eb5097e3c1c849031aa30a (diff) | |
| download | librpm-tizen-14165bc5582af0306bff6bb42b7c76305bec5abf.tar.gz librpm-tizen-14165bc5582af0306bff6bb42b7c76305bec5abf.tar.bz2 librpm-tizen-14165bc5582af0306bff6bb42b7c76305bec5abf.zip | |
Merge file-4.02 changes.
CVS patchset: 6751
CVS date: 2003/04/15 20:04:25
29 files changed, 436 insertions, 94 deletions
diff --git a/file/magic/Magdir/archive b/file/magic/Magdir/archive index ac3da7148..133e50caf 100644 --- a/file/magic/Magdir/archive +++ b/file/magic/Magdir/archive @@ -231,10 +231,10 @@ 2 string -pms- PMarc SFX archive (CP/M, DOS) 5 string -pc1- PopCom compressed executable (CP/M) -# From rafael@icp.inpg.fr (Rafael Laboissiere) +# From Rafael Laboissiere <rafael@laboissiere.net> # The Project Revision Control System (see -# http://www.XCF.Berkeley.EDU/~jmacd/prcs.html) generates a packaged project -# file which is recognized by the following entry: +# http://prcs.sourceforge.net) generates a packaged project +# file which is recognized by the following entry: 0 leshort 0xeb81 PRCS packaged project # Microsoft cabinets diff --git a/file/magic/Magdir/audio b/file/magic/Magdir/audio index 5a1697170..9507c1282 100644 --- a/file/magic/Magdir/audio +++ b/file/magic/Magdir/audio @@ -157,7 +157,90 @@ # Impuse tracker module (audio/x-it) 0 string IMPM Impulse Tracker module sound data - >4 string >\0 "%s" +>40 leshort !0 compatible w/ITv%x +>42 leshort !0 created w/ITv%x # Imago Orpheus module (audio/x-imf) 60 string IM10 Imago Orpheus module sound data - >0 string >\0 "%s" + +# From <collver1@attbi.com> +# These are the /etc/magic entries to decode modules, instruments, and +# samples in Impulse Tracker's native format. + +0 string IMPS Impulse Tracker Sample +>18 byte &2 16 bit +>18 byte ^2 8 bit +>18 byte &4 stereo +>18 byte ^4 mono +0 string IMPI Impulse Tracker Instrument +>28 leshort !0 ITv%x +>30 byte !0 %d samples + +# Yamaha TX Wave: file(1) magic for Yamaha TX Wave audio files +# From <collver1@attbi.com> +0 string LM8953 Yamaha TX Wave +>22 byte 0x49 looped +>22 byte 0xC9 non-looped +>23 byte 1 33kHz +>23 byte 2 50kHz +>23 byte 3 16kHz + +# scream tracker: file(1) magic for Scream Tracker sample files +# +# From <collver1@attbi.com> +76 string SCRS Scream Tracker Sample +>0 byte 1 sample +>0 byte 2 adlib melody +>0 byte >2 adlib drum +>31 byte &2 stereo +>31 byte ^2 mono +>31 byte &4 16bit little endian +>31 byte ^4 8bit +>30 byte 0 unpacked +>30 byte 1 packed + +# audio +# From: Cory Dikkers <cdikkers@swbell.net> +0 string MMD0 MED music file, version 0 +0 string MMD1 OctaMED Pro music file, version 1 +0 string MMD3 OctaMED Soundstudio music file, version 3 +0 string OctaMEDCmpr OctaMED Soundstudio compressed file +0 string MED MED_Song +0 string SymM Symphonie SymMOD music file +# +0 string THX AHX version +>3 byte =0 1 module data +>3 byte =1 2 module data +# +0 string OKTASONG Oktalyzer module data +# +0 string DIGI\ Booster\ module\0 %s +>20 byte >0 %c +>>21 byte >0 \b%c +>>>22 byte >0 \b%c +>>>>23 byte >0 \b%c +>610 string >\0 \b, "%s" +# +0 string DBM0 DIGI Booster Pro Module +>4 byte >0 V%X. +>>5 byte x \b%02X +>16 string >\0 \b, "%s" +# +0 string FTMN FaceTheMusic module +>16 string >\0d \b, "%s" + +# From: Takeshi Hamasaki <hma@syd.odn.ne.jp> +# NOA Nancy Codec file +0 string \210NOA\015\012\032 NOA Nancy Codec Movie file +# Yamaha SMAF format +0 string MMMD Yamaha SMAF file +# Sharp Jisaku Melody format for PDC +0 string \001Sharp\040JisakuMelody SHARP Cell-Phone ringing Melody +>20 string Ver01.00 Ver. 1.00 +>>32 byte x , %d tracks + +# FLAC audio stream <URL:http://flac.sourceforge.net/> +# From: Dan Fandrich <dan@coneharvesters.com> +0 string fLaC FLAC audio stream data + diff --git a/file/magic/Magdir/bFLT b/file/magic/Magdir/bFLT new file mode 100644 index 000000000..5e288d130 --- /dev/null +++ b/file/magic/Magdir/bFLT @@ -0,0 +1,12 @@ +#------------------------------------------------------------------------------ +# bFLT: file(1) magic for BFLT uclinux binary files +# +# From Philippe De Muyter <phdm@macqel.be> +# +0 string bFLT BFLT executable +>4 belong x - version %ld +>4 belong 4 +>>36 belong&0x1 0x1 ram +>>36 belong&0x2 0x2 gotpic +>>36 belong&0x4 0x4 gzip +>>36 belong&0x8 0x8 gzdata diff --git a/file/magic/Magdir/bout b/file/magic/Magdir/bout new file mode 100644 index 000000000..ab771fede --- /dev/null +++ b/file/magic/Magdir/bout @@ -0,0 +1,9 @@ +# +# i80960 b.out objects and archives +# +0 long 0x10d i960 b.out relocatable object +>16 long >0 not stripped +# +# b.out archive (hp-rt on i960) +0 string !<bout> b.out archive +>8 string __.SYMDEF random library diff --git a/file/magic/Magdir/c-lang b/file/magic/Magdir/c-lang index 1b0147595..2d350f6de 100644 --- a/file/magic/Magdir/c-lang +++ b/file/magic/Magdir/c-lang @@ -11,3 +11,14 @@ # in which case rm it; ascmagic will catch real C programs #0 string /* C or REXX program text 0 string // C++ program text + +# From: Mikhail Teterin <mi@aldan.algebra.com> +0 string cscope cscope reference data +>7 string x version %.2s +# We skip the path here, because it is often long (so file will +# truncate it) and mostly redundant. +# The inverted index functionality was added some time betwen +# versions 11 and 15, so look for -q if version is above 14: +>7 string >14 +>>10 regex .+\ -q\ with inverted index +>10 regex .+\ -c\ text (non-compressed) diff --git a/file/magic/Magdir/chord b/file/magic/Magdir/chord new file mode 100644 index 000000000..3639f3c49 --- /dev/null +++ b/file/magic/Magdir/chord @@ -0,0 +1,9 @@ + +#------------------------------------------------------------------------------ +# chord: file(1) magic for Chord music sheet typesetting utility input files +# +# From Philippe De Muyter <phdm@macqel.be> +# File format is actually free, but many distributed files begin with `{title' +# +0 string {title Chord text file + diff --git a/file/magic/Magdir/commands b/file/magic/Magdir/commands index a9dd089bf..35d0e32ea 100644 --- a/file/magic/Magdir/commands +++ b/file/magic/Magdir/commands @@ -13,6 +13,8 @@ # # zsh/ash/ae/nawk/gawk magic from cameron@cs.unsw.oz.au (Cameron Simpson) +0 string/b #!\ /bin Paul Falstad's zsh script text executable +0 string/b #!\ /usr/bin Paul Falstad's zsh script text executable 0 string/b #!\ /usr/local/bin/zsh Paul Falstad's zsh script text executable 0 string/b #!\ /usr/local/bin/ash Neil Brown's ash script text executable 0 string/b #!\ /usr/local/bin/ae Neil Brown's ae script text executable diff --git a/file/magic/Magdir/compress b/file/magic/Magdir/compress index 3da7f5faf..013054165 100644 --- a/file/magic/Magdir/compress +++ b/file/magic/Magdir/compress @@ -152,3 +152,20 @@ # 4.3BSD-Quasijarus Strong Compression # http://minnie.tuhs.org/Quasijarus/compress.html 0 string \037\241 Quasijarus strong compressed data + +# From: Cory Dikkers <cdikkers@swbell.net> +0 string XPKF Amiga xpkf.library compressed data +0 string PP11 Power Packer 1.1 compressed data +0 string PP20 Power Packer 2.0 compressed data, +>4 belong 0x09090909 fast compression +>4 belong 0x090A0A0A mediocre compression +>4 belong 0x090A0B0B good compression +>4 belong 0x090A0C0C very good compression +>4 belong 0x090A0C0D best compression + +# 7z archiver, from Thomas Klausner (wiz@danbala.tuwien.ac.at) +# http://www.7-zip.org or DOC/7zFormat.txt +# +0 string 7z\274\257\047\034 7z archive data, +>6 byte x version %d +>7 byte x \b.%d diff --git a/file/magic/Magdir/ctags b/file/magic/Magdir/ctags index 8d439718a..5c039e7b3 100644 --- a/file/magic/Magdir/ctags +++ b/file/magic/Magdir/ctags @@ -2,4 +2,4 @@ # ---------------------------------------------------------------------------- # ctags: file (1) magic for Exuberant Ctags files # From: Alexander Mai <mai@migdal.ikp.physik.tu-darmstadt.de> -0 string !_TAG Exuberant Ctags tag file +0 string !_TAG Exuberant Ctags tag file text diff --git a/file/magic/Magdir/elf b/file/magic/Magdir/elf index 4037add85..98c90c708 100644 --- a/file/magic/Magdir/elf +++ b/file/magic/Magdir/elf @@ -97,6 +97,7 @@ >>18 leshort 53 Motorola M68HC12, >>18 leshort 62 AMD x86-64, >>18 leshort 75 Digital VAX, +>>18 leshort 97 NatSemi 32k, >>18 leshort 0x9026 Alpha (unofficial), >>20 lelong 0 invalid version >>20 lelong 1 version 1 @@ -183,6 +184,7 @@ >>18 beshort 53 Motorola M68HC12, >>18 beshort 73 Cray NV1, >>18 beshort 75 Digital VAX, +>>18 beshort 97 NatSemi 32k, >>18 beshort 0x9026 Alpha (unofficial), >>20 belong 0 invalid version >>20 belong 1 version 1 diff --git a/file/magic/Magdir/filesystems b/file/magic/Magdir/filesystems index 1e6624c54..f34c8235c 100644 --- a/file/magic/Magdir/filesystems +++ b/file/magic/Magdir/filesystems @@ -25,33 +25,108 @@ >512 belong&077777777 0600407 \b, boot block present 0x1FE leshort 0xAA55 x86 boot sector >2 string OSBS \b, OS/BS MBR -# J\xf6rg Jenderek <joerg@pcialias.localnet> +# J\xf6rg Jenderek <joerg.jenderek@gmx.net> >0x8C string Invalid\ partition\ table \b, MS-DOS MBR >0x9D string Invalid\ partition\ table \b, DR-DOS MBR, version 7.01 to 7.03 >0x10F string Ung\201ltige\ Partitionstabelle \b, MS-DOS MBR, german version 4.10.1998, 4.10.2222 >0x8B string Ung\201ltige\ Partitionstabelle \b, MS-DOS MBR, german version 5.00 to 4.00.950 >0x145 string Default:\ F \b, FREE-DOS MBR >0 string \0\0\0\0 \b, extended partition table ->0 leshort 0x3CEB \b, system ->>3 string >\0 %s ->>0x36 string FAT \b, %s ->>>0x39 string 12 (%s bit) ->>>0x39 string 16 (%s bit) ->0x52 string FAT32 \b, FAT (32 bit) ->>>43 string >NO\ NAME label: %.11s, ->>>43 string <NO\ NAME label: %.11s, ->>>43 string NO\ NAME unlabeled, ->>>19 leshort >0 %d sectors ->>>19 leshort 0 ->>>>32 lelong x %d sectors +# JuMP short bootcodeoffset NOP assembler instructions will usually be EB xx 90 +# older drives may use E9 xx xx +>0 lelong&0x009000EB 0x009000EB +>0 lelong&0x000000E9 0x000000E9 +>>1 ubyte >37 \b, code offset 0x%x +# mtools-3.9.8/msdos.h +# usual values are marked with comments to get only informations of strange FAT systems +# valid sectorsize are from 32 to 2048 +>>>11 uleshort <2049 +>>>>11 uleshort >31 +>>>>>3 string >\0 \b, OEM-ID "%8.8s" +>>>>>11 uleshort >512 \b, Bytes/sector %u +#>>>>>11 uleshort =512 \b, Bytes/sector %u=512 (usual) +>>>>>11 uleshort <512 \b, Bytes/sector %u +>>>>>13 ubyte >1 \b, sectors/cluster %u +#>>>>>13 ubyte =1 \b, sectors/cluster %u (usual on Floppies) +>>>>>14 uleshort >32 \b, reserved sectors %u +#>>>>>14 uleshort =32 \b, reserved sectors %u (usual Fat32) +#>>>>>14 uleshort >1 \b, reserved sectors %u +#>>>>>14 uleshort =1 \b, reserved sectors %u (usual FAT12,FAT16) +>>>>>14 uleshort <1 \b, reserved sectors %u +>>>>>16 ubyte >2 \b, FATs %u +#>>>>>16 ubyte =2 \b, FATs %u (usual) +>>>>>16 ubyte =1 \b, FAT %u +>>>>>16 ubyte >0 +>>>>>17 uleshort >0 \b, root entries %u +#>>>>>17 uleshort =0 \b, root entries %u=0 (usual Fat32) +>>>>>19 uleshort >0 \b, sectors %u (volumes <=32 MB) +#>>>>>19 uleshort =0 \b, sectors %u=0 (usual Fat32) +>>>>>21 ubyte >0xF0 \b, Media descriptor 0x%x +#>>>>>21 ubyte =0xF0 \b, Media descriptor 0x%x (usual floppy) +>>>>>21 ubyte <0xF0 \b, Media descriptor 0x%x +>>>>>22 uleshort >0 \b, sectors/FAT %u +#>>>>>22 uleshort =0 \b, sectors/FAT %u=0 (usual Fat32) +>>>>>26 ubyte >2 \b, heads %u +#>>>>>26 ubyte =2 \b, heads %u (usual floppy) +>>>>>26 ubyte =1 \b, heads %u +>>>>>28 ulelong >0 \b, hidden sectors %u +#>>>>>28 ulelong =0 \b, hidden sectors %u (usual floppy) +>>>>>32 ulelong >0 \b, sectors %u (volumes > 32 MB) +#>>>>>32 ulelong =0 \b, sectors %u (volumes > 32 MB) +# FAT<32 specific +# NOT le FAT3=NOT 3TAF=0xCCABBEB9 +>>>>>82 ulelong&0xCCABBEB9 >0 +>>>>>>36 ubyte >0x80 \b, physical drive 0x%x +#>>>>>>36 ubyte =0x80 \b, physical drive 0x%x=0x80 (usual harddisk) +>>>>>>36 ubyte&0x7F >0 \b, physical drive 0x%x +#>>>>>>36 ubyte =0 \b, physical drive 0x%x=0 (usual floppy) +>>>>>>37 ubyte >0 \b, reserved 0x%x +#>>>>>>37 ubyte =0 \b, reserved 0x%x +>>>>>>38 ubyte >0x29 \b, dos < 4.0 BootSector (0x%x) +>>>>>>38 ubyte <0x29 \b, dos < 4.0 BootSector (0x%x) +>>>>>>38 ubyte =0x29 +>>>>>>>39 ulelong x \b, serial number 0x%x +>>>>>>>43 string <NO\ NAME \b, label: "%11.11s" +>>>>>>>43 string >NO\ NAME \b, label: "%11.11s" +>>>>>>>43 string =NO\ NAME \b, unlabeled +>>>>>>54 string FAT1 \b, FAT +>>>>>>>54 string FAT12 \b (12 bit) +>>>>>>>54 string FAT16 \b (16 bit) +# FAT32 specific +>>>>>82 string FAT32 \b, FAT (32 bit) +>>>>>>36 ulelong x \b, sectors/FAT %u +>>>>>>40 uleshort >0 \b, extension flags %u +#>>>>>>40 uleshort =0 \b, extension flags %u +>>>>>>42 uleshort >0 \b, fsVersion %u +#>>>>>>42 uleshort =0 \b, fsVersion %u (usual) +>>>>>>44 ulelong >2 \b, rootdir cluster %u +#>>>>>>44 ulelong =2 \b, rootdir cluster %u +#>>>>>>44 ulelong =1 \b, rootdir cluster %u +>>>>>>48 uleshort >1 \b, infoSector %u +#>>>>>>48 uleshort =1 \b, infoSector %u (usual) +>>>>>>48 uleshort <1 \b, infoSector %u +>>>>>>50 uleshort >6 \b, Backup boot sector %u +#>>>>>>50 uleshort =6 \b, Backup boot sector %u (usual) +>>>>>>50 uleshort <6 \b, Backup boot sector %u +>>>>>>54 ulelong >0 \b, reserved1 0x%x +>>>>>>58 ulelong >0 \b, reserved2 0x%x +>>>>>>62 ulelong >0 \b, reserved3 0x%x +# same structure as FAT1X +>>>>>>64 ubyte >0x80 \b, physical drive 0x%x +#>>>>>>64 ubyte =0x80 \b, physical drive 0x%x=80 (usual harddisk) +>>>>>>64 ubyte&0x7F >0 \b, physical drive 0x%x +#>>>>>>64 ubyte =0 \b, physical drive 0x%x=0 (usual floppy) +>>>>>>65 ubyte >0 \b, reserved 0x%x +>>>>>>66 ubyte >0x29 \b, dos < 4.0 BootSector (0x%x) +>>>>>>66 ubyte <0x29 \b, dos < 4.0 BootSector (0x%x) +>>>>>>66 ubyte =0x29 +>>>>>>>67 ulelong x \b, serial number 0x%x +>>>>>>>71 string <NO\ NAME \b, label: "%11.11s" +>>>>>>71 string >NO\ NAME \b, label: "%11.11s" +>>>>>>71 string =NO\ NAME \b, unlabeled +### FATs end >0x200 lelong 0x82564557 \b, BSD disklabel -# Solaris 7 FAT12 floppies J\xf6rg Jenderek <joerg@pcialias.localnet> ->0 leshort 0x7AEB \b, system ->>3 string >\0 %s ->>0x36 string FAT \b, %s ->>>0x39 string 12 (%s bit) - # Minix filesystems - Juan Cespedes <cespedes@debian.org> 0x410 leshort 0x137f Minix filesystem 0x410 beshort 0x137f Minix filesystem (big endian), @@ -92,6 +167,10 @@ >8320 lelong 1 SPACE optimization 9564 belong 0x00011954 Unix Fast File system (big-endian), +>7168 long 0x4c41424c Apple UFS Volume +>>7186 string x named %s, +>>7176 belong x volume label version %d, +>>7180 bedate x created on %s, >8404 string x last mounted on %s, #>9504 bedate x last checked at %s, >8224 bedate x last written at %s, diff --git a/file/magic/Magdir/flash b/file/magic/Magdir/flash index 1d6f7b766..0db9bfe20 100644 --- a/file/magic/Magdir/flash +++ b/file/magic/Magdir/flash @@ -8,3 +8,6 @@ # 0 string FWS Macromedia Flash data, >3 byte x version %d +# +# From Dave Wilson +0 string AGD4\xbe\xb8\xbb\xcb\x00 Macromedia Freehand 9 Document diff --git a/file/magic/Magdir/gringotts b/file/magic/Magdir/gringotts index 2d135f8fc..6e833a3e1 100644 --- a/file/magic/Magdir/gringotts +++ b/file/magic/Magdir/gringotts @@ -3,10 +3,12 @@ # gringotts: file(1) magic for Gringotts # http://devel.pluto.linux.it/projects/Gringotts/ # author: Germano Rizzo <mano@pluto.linux.it> -#GRG2????Y +#GRG3????Y 0 string GRG Gringotts data file ->3 string 1 v.1, SERPENT crypt, SHA-256 hash, ZLib lvl.9 ->3 string 2 v.2, +#file format 1 +>3 string 1 v.1, MCRYPT S2K, SERPENT crypt, SHA-256 hash, ZLib lvl.9 +#file format 2 +>3 string 2 v.2, MCRYPT S2K, >>8 byte&0x70 0x00 RIJNDAEL-128 crypt, >>8 byte&0x70 0x10 SERPENT crypt, >>8 byte&0x70 0x20 TWOFISH crypt, @@ -23,3 +25,23 @@ >>8 byte&0x03 0x01 lvl.3 >>8 byte&0x03 0x02 lvl.6 >>8 byte&0x03 0x03 lvl.9 +#file format 3 +>3 string 3 v.3, OpenPGP S2K, +>>8 byte&0x70 0x00 RIJNDAEL-128 crypt, +>>8 byte&0x70 0x10 SERPENT crypt, +>>8 byte&0x70 0x20 TWOFISH crypt, +>>8 byte&0x70 0x30 CAST-256 crypt, +>>8 byte&0x70 0x40 SAFER+ crypt, +>>8 byte&0x70 0x50 LOKI97 crypt, +>>8 byte&0x70 0x60 3DES crypt, +>>8 byte&0x70 0x70 RIJNDAEL-256 crypt, +>>8 byte&0x08 0x00 SHA1 hash, +>>8 byte&0x08 0x08 RIPEMD-160 hash, +>>8 byte&0x04 0x00 ZLib +>>8 byte&0x04 0x04 BZip2 +>>8 byte&0x03 0x00 lvl.0 +>>8 byte&0x03 0x01 lvl.3 +>>8 byte&0x03 0x02 lvl.6 +>>8 byte&0x03 0x03 lvl.9 +#file format >3 +>3 string >3 v.%.1s (unknown details) diff --git a/file/magic/Magdir/hdf b/file/magic/Magdir/hdf new file mode 100644 index 000000000..10a21b642 --- /dev/null +++ b/file/magic/Magdir/hdf @@ -0,0 +1,7 @@ + +#------------------------------------------------------------------------------ +# 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 +0 string \211HDF\r\n\032 Hierarchical Data Format (version 5) data diff --git a/file/magic/Magdir/hp b/file/magic/Magdir/hp index 60574b51c..052f09a23 100644 --- a/file/magic/Magdir/hp +++ b/file/magic/Magdir/hp @@ -389,3 +389,7 @@ >>>>>>>>>0xC4 belong 12 - received SIGSYS >>>>>>>>>0xC4 belong 33 - received SIGXCPU >>>>>>>>>0xC4 belong 34 - received SIGXFSZ + +# From: AMAKAWA Shuhei <sa264@cam.ac.uk> +0 string HPHP49- HP49 binary + diff --git a/file/magic/Magdir/images b/file/magic/Magdir/images index daddc4141..191307338 100644 --- a/file/magic/Magdir/images +++ b/file/magic/Magdir/images @@ -142,6 +142,9 @@ 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) +# From: Herbert Rosmanith <herp@wildsau.idv.uni.linz.at> +0 string Sfff structured fax file + # PC bitmaps (OS/2, Windoze BMP files) (Greg Roelofs, newt@uchicago.edu) 0 string BM PC bitmap data @@ -333,3 +336,29 @@ # of various EPOC file formats 0 string \x37\x00\x00\x10\x42\x00\x00\x10\x00\x00\x00\x00\x39\x64\x39\x47 EPOC MBM image file + +# PCX image files +# From: Dan Fandrich <dan@coneharvesters.com> +0 beshort 0x0a00 PCX ver. 2.5 image data +0 beshort 0x0a02 PCX ver. 2.8 image data, with palette +0 beshort 0x0a03 PCX ver. 2.8 image data, without palette +0 beshort 0x0a04 PCX for Windows image data +0 beshort 0x0a05 PCX ver. 3.0 image data +>4 leshort x bounding box [%hd, +>6 leshort x %hd] - +>8 leshort x [%hd, +>10 leshort x %hd], +>65 byte >1 %d planes each of +>3 byte x %hhd-bit +>68 byte 0 image, +>68 byte 1 colour, +>68 byte 2 grayscale, +>68 byte >2 image, +>68 byte <0 image, +>12 leshort >0 %hd x +>>14 leshort x %hd dpi, +>2 byte 0 uncompressed +>2 byte 1 RLE compressed + +# Adobe Photoshop +0 string 8BPS Adobe Photoshop Image diff --git a/file/magic/Magdir/jpeg b/file/magic/Magdir/jpeg index f18a39e2e..bedc6c999 100644 --- a/file/magic/Magdir/jpeg +++ b/file/magic/Magdir/jpeg @@ -59,3 +59,6 @@ # HSI is Handmade Software's proprietary JPEG encoding scheme 0 string hsi1 JPEG image data, HSI proprietary + +# From: David Santinoli <david@santinoli.com> +0 string \x00\x00\x00\x0C\x6A\x50\x20\x20\x0D\x0A\x87\x0A JPEG 2000 image data diff --git a/file/magic/Magdir/lisp b/file/magic/Magdir/lisp index 11f33cd20..42698c008 100644 --- a/file/magic/Magdir/lisp +++ b/file/magic/Magdir/lisp @@ -27,3 +27,6 @@ #.com and .bin for MIT scheme 0 string \372\372\372\372 MIT scheme (library?) + +# From: David Allouche <david@allouche.net> +0 string \<TeXmacs| TeXmacs document text diff --git a/file/magic/Magdir/macintosh b/file/magic/Magdir/macintosh index 1fb8241eb..277cb6b34 100644 --- a/file/magic/Magdir/macintosh +++ b/file/magic/Magdir/macintosh @@ -16,6 +16,10 @@ 0 string Seg StuffIt Deluxe Segment (data) >2 string x : %s +# Newer StuffIt archives (grant@netbsd.org) +0 string StuffIt StuffIt Archive +>162 string >0 : %s + # Macintosh Applications and Installation binaries (franklsm@tuns.ca) 0 string APPL Macintosh Application (data) >2 string x \b: %s diff --git a/file/magic/Magdir/mail.news b/file/magic/Magdir/mail.news index ab8b293c3..2288ad411 100644 --- a/file/magic/Magdir/mail.news +++ b/file/magic/Magdir/mail.news @@ -26,3 +26,5 @@ # From: Kevin Sullivan <ksulliva@psc.edu> 0 string *mbx* MBX mail folder +# From: Simon Matter <simon.matter@invoca.ch> +0 string \241\002\213\015skiplist\ file\0\0\0 Cyrus skiplist DB diff --git a/file/magic/Magdir/msdos b/file/magic/Magdir/msdos index 771a8fd07..99f110958 100644 --- a/file/magic/Magdir/msdos +++ b/file/magic/Magdir/msdos @@ -90,6 +90,8 @@ >>122 string Windows\ self-extracting\ ZIP \b, %s >0x1c string RJSX\xff\xff \b, ARJ SFX >0x1c string diet\xf9\x9c \b, diet compressed +>0x1c string LZ09 \b, LZEXE v0.90 compressed +>0x1c string LZ91 \b, LZEXE v0.91 compressed >0x1e string Copyright\ 1989-1990\ PKWARE\ Inc. \b, PKSFX # JM: 0x1e "PKLITE Copr. 1990-92 PKWARE Inc. All Rights Reserved\7\0\0\0" >0x1e string PKLITE\ Copr. \b, %.6s compressed diff --git a/file/magic/Magdir/netbsd b/file/magic/Magdir/netbsd index 7c260e40f..b6aae1ac6 100644 --- a/file/magic/Magdir/netbsd +++ b/file/magic/Magdir/netbsd @@ -5,187 +5,187 @@ # All new-style magic numbers are in network byte order. # -0 lelong 000000407 NetBSD little-endian object file +0 lelong 000000407 a.out NetBSD little-endian object file >16 lelong >0 not stripped -0 belong 000000407 NetBSD big-endian object file +0 belong 000000407 a.out NetBSD big-endian object file >16 belong >0 not stripped -0 belong&0377777777 041400413 NetBSD/i386 demand paged +0 belong&0377777777 041400413 a.out NetBSD/i386 demand paged >0 byte &0x80 >>20 lelong <4096 shared library >>20 lelong =4096 dynamically linked executable >>20 lelong >4096 dynamically linked executable >0 byte ^0x80 executable >16 lelong >0 not stripped -0 belong&0377777777 041400410 NetBSD/i386 pure +0 belong&0377777777 041400410 a.out NetBSD/i386 pure >0 byte &0x80 dynamically linked executable >0 byte ^0x80 executable >16 lelong >0 not stripped -0 belong&0377777777 041400407 NetBSD/i386 +0 belong&0377777777 041400407 a.out NetBSD/i386 >0 byte &0x80 dynamically linked executable >0 byte ^0x80 >>0 byte &0x40 position independent >>20 lelong !0 executable >>20 lelong =0 object file >16 lelong >0 not stripped -0 belong&0377777777 041400507 NetBSD/i386 core +0 belong&0377777777 041400507 a.out NetBSD/i386 core >12 string >\0 from '%s' >32 lelong !0 (signal %d) -0 belong&0377777777 041600413 NetBSD/m68k demand paged +0 belong&0377777777 041600413 a.out NetBSD/m68k demand paged >0 byte &0x80 >>20 belong <8192 shared library >>20 belong =8192 dynamically linked executable >>20 belong >8192 dynamically linked executable >0 byte ^0x80 executable >16 belong >0 not stripped -0 belong&0377777777 041600410 NetBSD/m68k pure +0 belong&0377777777 041600410 a.out NetBSD/m68k pure >0 byte &0x80 dynamically linked executable >0 byte ^0x80 executable >16 belong >0 not stripped -0 belong&0377777777 041600407 NetBSD/m68k +0 belong&0377777777 041600407 a.out NetBSD/m68k >0 byte &0x80 dynamically linked executable >0 byte ^0x80 >>0 byte &0x40 position independent >>20 belong !0 executable >>20 belong =0 object file >16 belong >0 not stripped -0 belong&0377777777 041600507 NetBSD/m68k core +0 belong&0377777777 041600507 a.out NetBSD/m68k core >12 string >\0 from '%s' >32 belong !0 (signal %d) -0 belong&0377777777 042000413 NetBSD/m68k4k demand paged +0 belong&0377777777 042000413 a.out NetBSD/m68k4k demand paged >0 byte &0x80 >>20 belong <4096 shared library >>20 belong =4096 dynamically linked executable >>20 belong >4096 dynamically linked executable >0 byte ^0x80 executable >16 belong >0 not stripped -0 belong&0377777777 042000410 NetBSD/m68k4k pure +0 belong&0377777777 042000410 a.out NetBSD/m68k4k pure >0 byte &0x80 dynamically linked executable >0 byte ^0x80 executable >16 belong >0 not stripped -0 belong&0377777777 042000407 NetBSD/m68k4k +0 belong&0377777777 042000407 a.out NetBSD/m68k4k >0 byte &0x80 dynamically linked executable >0 byte ^0x80 >>0 byte &0x40 position independent >>20 belong !0 executable >>20 belong =0 object file >16 belong >0 not stripped -0 belong&0377777777 042000507 NetBSD/m68k4k core +0 belong&0377777777 042000507 a.out NetBSD/m68k4k core >12 string >\0 from '%s' >32 belong !0 (signal %d) -0 belong&0377777777 042200413 NetBSD/ns32532 demand paged +0 belong&0377777777 042200413 a.out NetBSD/ns32532 demand paged >0 byte &0x80 >>20 lelong <4096 shared library >>20 lelong =4096 dynamically linked executable >>20 lelong >4096 dynamically linked executable >0 byte ^0x80 executable >16 lelong >0 not stripped -0 belong&0377777777 042200410 NetBSD/ns32532 pure +0 belong&0377777777 042200410 a.out NetBSD/ns32532 pure >0 byte &0x80 dynamically linked executable >0 byte ^0x80 executable >16 lelong >0 not stripped -0 belong&0377777777 042200407 NetBSD/ns32532 +0 belong&0377777777 042200407 a.out NetBSD/ns32532 >0 byte &0x80 dynamically linked executable >0 byte ^0x80 >>0 byte &0x40 position independent >>20 lelong !0 executable >>20 lelong =0 object file >16 lelong >0 not stripped -0 belong&0377777777 042200507 NetBSD/ns32532 core +0 belong&0377777777 042200507 a.out NetBSD/ns32532 core >12 string >\0 from '%s' >32 lelong !0 (signal %d) -0 belong&0377777777 045200507 NetBSD/powerpc core +0 belong&0377777777 045200507 a.out NetBSD/powerpc core >12 string >\0 from '%s' -0 belong&0377777777 042400413 NetBSD/sparc demand paged +0 belong&0377777777 042400413 a.out NetBSD/sparc demand paged >0 byte &0x80 >>20 belong <8192 shared library >>20 belong =8192 dynamically linked executable >>20 belong >8192 dynamically linked executable >0 byte ^0x80 executable >16 belong >0 not stripped -0 belong&0377777777 042400410 NetBSD/sparc pure +0 belong&0377777777 042400410 a.out NetBSD/sparc pure >0 byte &0x80 dynamically linked executable >0 byte ^0x80 executable >16 belong >0 not stripped -0 belong&0377777777 042400407 NetBSD/sparc +0 belong&0377777777 042400407 a.out NetBSD/sparc >0 byte &0x80 dynamically linked executable >0 byte ^0x80 >>0 byte &0x40 position independent >>20 belong !0 executable >>20 belong =0 object file >16 belong >0 not stripped -0 belong&0377777777 042400507 NetBSD/sparc core +0 belong&0377777777 042400507 a.out NetBSD/sparc core >12 string >\0 from '%s' >32 belong !0 (signal %d) -0 belong&0377777777 042600413 NetBSD/pmax demand paged +0 belong&0377777777 042600413 a.out NetBSD/pmax demand paged >0 byte &0x80 >>20 lelong <4096 shared library >>20 lelong =4096 dynamically linked executable >>20 lelong >4096 dynamically linked executable >0 byte ^0x80 executable >16 lelong >0 not stripped -0 belong&0377777777 042600410 NetBSD/pmax pure +0 belong&0377777777 042600410 a.out NetBSD/pmax pure >0 byte &0x80 dynamically linked executable >0 byte ^0x80 executable >16 lelong >0 not stripped -0 belong&0377777777 042600407 NetBSD/pmax +0 belong&0377777777 042600407 a.out NetBSD/pmax >0 byte &0x80 dynamically linked executable >0 byte ^0x80 >>0 byte &0x40 position independent >>20 lelong !0 executable >>20 lelong =0 object file >16 lelong >0 not stripped -0 belong&0377777777 042600507 NetBSD/pmax core +0 belong&0377777777 042600507 a.out NetBSD/pmax core >12 string >\0 from '%s' >32 lelong !0 (signal %d) -0 belong&0377777777 043000413 NetBSD/vax 1k demand paged +0 belong&0377777777 043000413 a.out NetBSD/vax 1k demand paged >0 byte &0x80 >>20 lelong <4096 shared library >>20 lelong =4096 dynamically linked executable >>20 lelong >4096 dynamically linked executable >0 byte ^0x80 executable >16 lelong >0 not stripped -0 belong&0377777777 043000410 NetBSD/vax 1k pure +0 belong&0377777777 043000410 a.out NetBSD/vax 1k pure >0 byte &0x80 dynamically linked executable >0 byte ^0x80 executable >16 lelong >0 not stripped -0 belong&0377777777 043000407 NetBSD/vax 1k +0 belong&0377777777 043000407 a.out NetBSD/vax 1k >0 byte &0x80 dynamically linked executable >0 byte ^0x80 >>0 byte &0x40 position independent >>20 lelong !0 executable >>20 lelong =0 object file >16 lelong >0 not stripped -0 belong&0377777777 043000507 NetBSD/vax 1k core +0 belong&0377777777 043000507 a.out NetBSD/vax 1k core >12 string >\0 from '%s' >32 lelong !0 (signal %d) -0 belong&0377777777 045400413 NetBSD/vax 4k demand paged +0 belong&0377777777 045400413 a.out NetBSD/vax 4k demand paged >0 byte &0x80 >>20 lelong <4096 shared library >>20 lelong =4096 dynamically linked executable >>20 lelong >4096 dynamically linked executable >0 byte ^0x80 executable >16 lelong >0 not stripped -0 belong&0377777777 045400410 NetBSD/vax 4k pure +0 belong&0377777777 045400410 a.out NetBSD/vax 4k pure >0 byte &0x80 dynamically linked executable >0 byte ^0x80 executable >16 lelong >0 not stripped -0 belong&0377777777 045400407 NetBSD/vax 4k +0 belong&0377777777 045400407 a.out NetBSD/vax 4k >0 byte &0x80 dynamically linked executable >0 byte ^0x80 >>0 byte &0x40 position independent >>20 lelong !0 executable >>20 lelong =0 object file >16 lelong >0 not stripped -0 belong&0377777777 045400507 NetBSD/vax 4k core +0 belong&0377777777 045400507 a.out NetBSD/vax 4k core >12 string >\0 from '%s' >32 lelong !0 (signal %d) @@ -195,44 +195,44 @@ 0 lelong 0x00070185 ECOFF NetBSD/alpha binary >10 leshort 0x0001 not stripped >10 leshort 0x0000 stripped -0 belong&0377777777 043200507 NetBSD/alpha core +0 belong&0377777777 043200507 a.out NetBSD/alpha core >12 string >\0 from '%s' >32 lelong !0 (signal %d) -0 belong&0377777777 043400413 NetBSD/mips demand paged +0 belong&0377777777 043400413 a.out NetBSD/mips demand paged >0 byte &0x80 >>20 belong <8192 shared library >>20 belong =8192 dynamically linked executable >>20 belong >8192 dynamically linked executable >0 byte ^0x80 executable >16 belong >0 not stripped -0 belong&0377777777 043400410 NetBSD/mips pure +0 belong&0377777777 043400410 a.out NetBSD/mips pure >0 byte &0x80 dynamically linked executable >0 byte ^0x80 executable >16 belong >0 not stripped -0 belong&0377777777 043400407 NetBSD/mips +0 belong&0377777777 043400407 a.out NetBSD/mips >0 byte &0x80 dynamically linked executable >0 byte ^0x80 >>0 byte &0x40 position independent >>20 belong !0 executable >>20 belong =0 object file >16 belong >0 not stripped -0 belong&0377777777 043400507 NetBSD/mips core +0 belong&0377777777 043400507 a.out NetBSD/mips core >12 string >\0 from '%s' >32 belong !0 (signal %d) -0 belong&0377777777 043600413 NetBSD/arm32 demand paged +0 belong&0377777777 043600413 a.out NetBSD/arm32 demand paged >0 byte &0x80 >>20 lelong <4096 shared library >>20 lelong =4096 dynamically linked executable >>20 lelong >4096 dynamically linked executable >0 byte ^0x80 executable >16 lelong >0 not stripped -0 belong&0377777777 043600410 NetBSD/arm32 pure +0 belong&0377777777 043600410 a.out NetBSD/arm32 pure >0 byte &0x80 dynamically linked executable >0 byte ^0x80 executable >16 lelong >0 not stripped -0 belong&0377777777 043600407 NetBSD/arm32 +0 belong&0377777777 043600407 a.out NetBSD/arm32 >0 byte &0x80 dynamically linked executable >0 byte ^0x80 >>0 byte &0x40 position independent @@ -241,6 +241,6 @@ >16 lelong >0 not stripped # NetBSD/arm26 has always used ELF objects, but it shares a core file # format with NetBSD/arm32. -0 belong&0377777777 043600507 NetBSD/arm core +0 belong&0377777777 043600507 a.out NetBSD/arm core >12 string >\0 from '%s' >32 lelong !0 (signal %d) diff --git a/file/magic/Magdir/perl b/file/magic/Magdir/perl index 2c16986b2..28b608667 100644 --- a/file/magic/Magdir/perl +++ b/file/magic/Magdir/perl @@ -15,4 +15,4 @@ # a couple more, by me # XXX: christos matches #0 regex package Perl5 module source text (via regex) -#0 string package Perl5 module source text +0 string package Perl5 module source text diff --git a/file/magic/Magdir/python b/file/magic/Magdir/python index 2e7bbe753..1932fd263 100644 --- a/file/magic/Magdir/python +++ b/file/magic/Magdir/python @@ -1,5 +1,14 @@ + +#------------------------------------------------------------------------------ +# python: file(1) magic for python +# +# From: David Necas <yeti@physics.muni.cz> # often the module starts with a multiline string 0 string """ a python script text executable -# MAGIC as specified in Python/import.c (1.5.2/1.6) +# MAGIC as specified in Python/import.c (1.5 to 2.3.0a) # 20121 ( YEAR - 1995 ) + MONTH + DAY (little endian followed by "\r\n" -0 belong 0x994e0d0a python compiled +0 belong 0x994e0d0a python 1.5/1.6 byte-compiled +0 belong 0x87c60d0a python 2.0 byte-compiled +0 belong 0x2aeb0d0a python 2.1 byte-compiled +0 belong 0x2ded0d0a python 2.2 byte-compiled +#0 belong 0x31f20d0a python 2.3 byte-compiled diff --git a/file/magic/Magdir/riff b/file/magic/Magdir/riff index a81eb9352..fc8f0e601 100644 --- a/file/magic/Magdir/riff +++ b/file/magic/Magdir/riff @@ -56,6 +56,8 @@ >8 string AVI\ \b, AVI # Animated Cursor format >8 string ACON \b, animated cursor +# Corel Draw Picture +>8 string CDRA \b, Corel Draw Picture # # XXX - some of the below may only appear in little-endian form. @@ -99,6 +101,8 @@ >8 string ACON \b, animated cursor # Notation Interchange File Format (big-endian only) >8 string NIFF \b, Notation Interchange File Format +# Corel Draw Picture +>8 string CDRA \b, Corel Draw Picture # SoundFont 2 <mpruett@sgi.com> >8 string sfbk SoundFont 2 diff --git a/file/magic/Magdir/sgml b/file/magic/Magdir/sgml index e831c3c3f..55b8301ee 100644 --- a/file/magic/Magdir/sgml +++ b/file/magic/Magdir/sgml @@ -5,16 +5,23 @@ # from Daniel Quinlan (quinlan@yggdrasil.com) # adapted to string extenstions by Anthon van der Neut <anthon@mnt.org) 0 string/cB \<!doctype\ html HTML document text -0 string/c \<head HTML document text -0 string/c \<title HTML document text -0 string/c \<html HTML document text +0 string/cb \<head HTML document text +0 string/cb \<title HTML document text +0 string/cb \<html HTML document text # Extensible markup language (XML), a subset of SGML # from Marc Prud'hommeaux (marc@apocalypse.org) -0 string/c \<?xml XML document text +0 string/cb \<?xml XML document text # SGML, mostly from rph@sq -0 string/c \<!doctype exported SGML document text -0 string/c \<!subdoc exported SGML subdocument text -0 string \<!-- exported SGML document text +0 string/cb \<!doctype exported SGML document text +0 string/cb \<!subdoc exported SGML subdocument text +0 string/cb \<!-- exported SGML document text + +# Web browser cookie files +# (Mozilla, Galeon, Netscape 4, Konqueror..) +# Ulf Harnhammar <ulfh@update.uu.se> +0 string #\ HTTP\ Cookie\ File Web browser cookie text +0 string #\ Netscape\ HTTP\ Cookie\ File Netscape cookie text +0 string #\ KDE\ Cookie\ File Konqueror cookie text diff --git a/file/magic/Magdir/sql b/file/magic/Magdir/sql new file mode 100644 index 000000000..29741d95a --- /dev/null +++ b/file/magic/Magdir/sql @@ -0,0 +1,18 @@ + +#------------------------------------------------------------------------------ +# sql: file(1) magic for SQL files +# +# From: "Marty Leisner" <mleisner@eng.mc.xerox.com> +# Recognize some MySQL files. +# +0 beshort 0xfe01 MySQL table definition file +>2 byte x Version %d +0 belong&0xffffff00 0xfefe0300 MySQL MISAM index file +>3 byte x Version %d +0 belong&0xffffff00 0xfefe0700 MySQL MISAM compressed data file +>3 byte x Version %d +0 belong&0xffffff00 0xfefe0500 MySQL ISAM index file +>3 byte x Version %d +0 belong&0xffffff00 0xfefe0600 MySQL ISAM compressed data file +>3 byte x Version %d +0 string \376bin MySQL replication log diff --git a/file/magic/Magdir/unknown b/file/magic/Magdir/unknown index 843dc2936..910cea48e 100644 --- a/file/magic/Magdir/unknown +++ b/file/magic/Magdir/unknown @@ -15,7 +15,7 @@ # 0x10B is 0413; that's VAX demand-paged, but this is a short, not a # long, as it would be on a VAX. # -# 0x10C is 0414, 0x10D is 0415, and 0x10E is 416; those *are* unknown. +# 0x10C is 0414 and 0x10E is 416; those *are* unknown. # 0 short 0x107 unknown machine executable >8 short >0 not stripped @@ -31,6 +31,4 @@ >15 byte >0 - version %ld 0 long 0x10c unknown demand paged pure executable >16 long >0 not stripped -0 long 0x10d unknown demand paged pure executable ->16 long >0 not stripped 0 long 0x10e unknown readable demand paged pure executable diff --git a/file/magic/Magdir/vorbis b/file/magic/Magdir/vorbis index 5e4084285..8977845d0 100644 --- a/file/magic/Magdir/vorbis +++ b/file/magic/Magdir/vorbis @@ -32,14 +32,17 @@ >>>>>44 lelong !-1 # Vorbis RC2 has a bug which puts -1000 in the min/max bitrate fields # instead of -1. +# Vorbis 1.0 uses 0 instead of -1. >>>>>>44 lelong !-1000 ->>>>>>>44 lelong x >%lu +>>>>>>>44 lelong !0 +>>>>>>>>44 lelong x >%lu >>>>>48 lelong !-1 >>>>>>48 lelong x ~%lu >>>>>52 lelong !-1 ->>>>>>52 lelong !-1000 ->>>>>>>52 lelong x <%lu ->>>>>48 string <\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff kbps +>>>>>>52 lelong !0 +>>>>>>>52 lelong !-1000 +>>>>>>>>52 lelong x <%lu +>>>>>48 string <\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff bps # -- Second vorbis header packet - the comments # A kludge to read the vendor string. It's a counted string, not a # zero-terminated one, so file(1) can't read it in a generic way. @@ -67,10 +70,10 @@ >>>>>>(84.b+120) string 20011014 (RC2 - Garf tuned v2) >>>>>>(84.b+120) string 20011217 (pre-RC3 CVS) >>>>>>(84.b+120) string 20011231 (RC3) -# The string has not changed from beta1 to 2 - they are indistinguishable. -# Then come the comments, again length-counted (and number-counted). -# Some looping constructs and registers would allow reading them but now -# it's impossible. However we can print the number of comments present -# (skipping by the vendor string length): -##>>>>(109.l.113) lelong 0 \b, no comments -##>>>>(109.l+113) lelong >0 \b, %lu comments +# Some pre-1.0 CVS snapshots still had "Xiphphorus"... +>>>>>>(84.b+120) string >20011231 (pre-1.0 CVS) +# For the 1.0 release, Xiphophorus is replaced by Xiph.Org +>>>>(84.b+96) string/c Xiph.Org\ libVorbis\ I \b, created by: Xiph.Org libVorbis I +>>>>>(84.b+117) string >00000000 %.8s +>>>>>>(84.b+117) string <20020717 (pre-1.0 CVS) +>>>>>>(84.b+117) string 20020717 (1.0) |