From 142d895a55c588d10e159d707f4c0be8dd57359e Mon Sep 17 00:00:00 2001 From: Christos Zoulas Date: Wed, 1 Nov 2006 20:05:45 +0000 Subject: [PATCH] fixes from NetBSD magics --- magic/Magdir/archive | 12 ++++++++++++ magic/Magdir/commands | 2 ++ magic/Magdir/filesystems | 2 ++ magic/Magdir/riff | 6 ++++++ 4 files changed, 22 insertions(+) diff --git a/magic/Magdir/archive b/magic/Magdir/archive index 87c2f95c..e110fd48 100644 --- a/magic/Magdir/archive +++ b/magic/Magdir/archive @@ -509,6 +509,12 @@ # RAR archiver (Greg Roelofs, newt@uchicago.edu) 0 string Rar! RAR archive data, >44 byte x v%0x, +>10 byte >0 flags: +>>10 byte &0x01 Archive volume, +>>10 byte &0x02 Commented, +>>10 byte &0x04 Locked, +>>10 byte &0x08 Solid, +>>10 byte &0x20 Authenticated, >35 byte 0 os: MS-DOS >35 byte 1 os: OS/2 >35 byte 2 os: Win32 @@ -703,6 +709,12 @@ # From: Tilman Sauerbeck 0 belong 0x1ee7ff00 EET archive +# rzip archives +0 string RZIP rzip compressed data +>4 byte x - version %d +>5 byte x \b.%d +>6 belong x (%d bytes) + # From: "Robert Dale" 0 belong 123 dar archive, >4 belong x label "%.8x diff --git a/magic/Magdir/commands b/magic/Magdir/commands index 24649844..2bdffbeb 100644 --- a/magic/Magdir/commands +++ b/magic/Magdir/commands @@ -52,3 +52,5 @@ 0 string/b #!\ /usr/bin/php PHP script text executable 0 string Zend\x00 PHP script Zend Optimizer data + +0 string \$! DCL command file diff --git a/magic/Magdir/filesystems b/magic/Magdir/filesystems index 5fa3df65..5563ef76 100644 --- a/magic/Magdir/filesystems +++ b/magic/Magdir/filesystems @@ -963,6 +963,8 @@ >>51 lelong x blocksize: %d bytes, >39 ledate x created: %s +0 string td\000 floppy image data (TeleDisk) + # AFS Dump Magic # From: Ty Sarna 0 string \x01\xb3\xa1\x13\x22 AFS Dump diff --git a/magic/Magdir/riff b/magic/Magdir/riff index 1f1deeca..01c6f1b1 100644 --- a/magic/Magdir/riff +++ b/magic/Magdir/riff @@ -29,6 +29,8 @@ >8 string RMID \b, MIDI # RIFF Multimedia Movie File format >8 string RMMP \b, multimedia movie +# RIFF wrapper for MP3 +>8 string RMP3 \b, MPEG Layer 3 audio # Microsoft WAVE format (*.wav) >8 string WAVE \b, WAVE audio >>20 leshort 1 \b, Microsoft PCM @@ -127,6 +129,7 @@ >>>>>>>(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 wmv3 Windows Media Video 9 >>>>>>>(104.l+132) string/c h264 X.264 >>>>>>>(104.l+132) lelong 0 ##>>>>>>>(104.l+132) string x (%.4s) @@ -138,6 +141,9 @@ >>>>>>>(92.l+172) string strf >>>>>>>>(92.l+180) leshort 0x0001 uncompressed PCM >>>>>>>>(92.l+180) leshort 0x0002 ADPCM +>>>>>>>>(92.l+180) leshort 0x0006 aLaw +>>>>>>>>(92.l+180) leshort 0x0007 uLaw +>>>>>>>>(92.l+180) leshort 0x0050 MPEG-1 Layer 1 or 2 >>>>>>>>(92.l+180) leshort 0x0055 MPEG-1 Layer 3 >>>>>>>>(92.l+180) leshort 0x2000 Dolby AC3 >>>>>>>>(92.l+180) leshort 0x0161 DivX -- 2.40.0