*** empty log message ***

diff --git a/magic/Magdir/apple b/magic/Magdir/apple
index c21ee34372c8918ad1f364ebbebf45ba744d406c..20231293fe627c5fd6f940d483c323dea3ff586d 100644 (file)
--- a/magic/Magdir/apple
+++ b/magic/Magdir/apple
@@ -1,9 +1,12 @@
 
 #------------------------------------------------------------------------------
-# apple:  file(1) magic for Apple II file formats
+# apple:  file(1) magic for Apple file formats
 #
 0      string          FiLeStArTfIlEsTaRt      binscii (apple ][) text
 0      string          \x0aGL                  Binary II (apple ][) data
 0      string          \x76\xff                Squeezed (apple ][) data
 0      string          NuFile                  NuFile archive (apple ][) data
 0      string          N\xf5F\xe9l\xe5         NuFile archive (apple ][) data
+0      belong          0x00051600              AppleSingle encoded Macintosh file
+0      belong          0x00051607              AppleDouble encoded Macintosh file
+

diff --git a/magic/Magdir/compress b/magic/Magdir/compress
index 91b7bb4116ece4f6099f29e197af184070717fa1..44ef619ee837df1ccd06d12225b4cd38067dfbe1 100644 (file)
--- a/magic/Magdir/compress
+++ b/magic/Magdir/compress
@@ -55,10 +55,9 @@
 0      string          \377\037        compacted data
 0      short           0145405         huf output
 
-# Bzip2 from marcsoft@magic.metawire.com
-0      string          BZh             bzip2 compressed data,
->3     byte            x               format v. %c,
->4     byte            x               block size indicator %c
+# bzip2
+0      string          BZh             bzip2 compressed data
+>3     byte            >47             \b, block size = %c00k
 
 # squeeze and crunch
 # Michael Haardt <michael@cantor.informatik.rwth-aachen.de>

diff --git a/magic/Magdir/elf b/magic/Magdir/elf
index 2b1898104c3e52da50279f0959f75f2bcde54320..d1c6cce9f8ce811484109b4fba7644cf184a9eb2 100644 (file)
--- a/magic/Magdir/elf
+++ b/magic/Magdir/elf
@@ -20,7 +20,7 @@
 >>16   leshort         2               executable,
 >>16   leshort         3               shared object,
 # Core handling from Peter Tobias <tobias@server.et-inf.fho-emden.de>
-+# corrections by Christian 'Dr. Disk' Hechelmann <drdisk@ds9.au.s.shuttle.de>
+# corrections by Christian 'Dr. Disk' Hechelmann <drdisk@ds9.au.s.shuttle.de>
 >>16   leshort         4               core file
 >>>(0x38+0xcc) string  >\0             of '%s'
 >>>(0x38+0x10) lelong  >0              (signal %d),
@@ -74,7 +74,9 @@
 >>18   beshort         18              SPARC32PLUS,
 >>18   beshort         20              PowerPC or cisco 4500,
 >>18   beshort         21              cisco 7500,
+>>18   beshort         24              cisco SVIP,
 >>18   beshort         25              cisco 7200,
+>>18   beshort         36              cisco 12000,
 >>18   beshort         0x9026          Alpha,
 >>20   belong          0               invalid version
 >>20   belong          1               version 1

diff --git a/magic/Magdir/filesystems b/magic/Magdir/filesystems
index 8dc3f228734a61214e951864a2558c3c2ed106ee..13a8731b9dd11f72d4a2542378ed0e9e803194a9 100644 (file)
--- a/magic/Magdir/filesystems
+++ b/magic/Magdir/filesystems
@@ -4,6 +4,26 @@
 #
 0x438  leshort 0xEF53                  Linux/i386 ext2 filesystem
 0      string  \366\366\366\366        PC formatted floppy with no filesystem
+# Sun disk labels
+# From /usr/include/sun/dklabel.h:
+0774   beshort         0xdabe          Sun disk label
+>0     string          x               '%s
+>>31   string          >\0             \b%s
+>>>63          string          >\0             \b%s
+>>>>95         string          >\0             \b%s
+>0     string          x               \b'
+>0734  short           >0              %d rpm,
+>0736  short           >0              %d phys cys,
+>0740  short           >0              %d alts/cyl,
+>0746  short           >0              %d interleave,
+>0750  short           >0              %d data cyls,
+>0752  short           >0              %d alt cyls,
+>0754  short           >0              %d heads/partition,
+>0756  short           >0              %d sectors/track,
+>0764  long            >0              start cyl %ld,
+>0770  long            x               %ld blocks
+# Is there a boot block written 1 sector in?
+>512    belong&077777777       0600407 \b, boot block present
 0x1FE  leshort 0xAA55                  x86 boot sector
 >2     string  OSBS                    \b, OS/BS MBR
 >0x8C  string  Invalid\ partition\ table       \b, MS-DOS MBR

diff --git a/magic/Magdir/fonts b/magic/Magdir/fonts
index 2e23ef090a6bf6682707af6c3065045c8c5bed40..91fc7f8d80268c72a245858c7513fd48e3b09118 100644 (file)
--- a/magic/Magdir/fonts
+++ b/magic/Magdir/fonts
@@ -26,8 +26,9 @@
 0      string          D1.0\015                X11 Speedo font data
 
 #------------------------------------------------------------------------------
-# FIGlet fonts and controlfiles # From figmagic supplied with Figlet
-# version 2.2 "David E. O'Brien" <obrien@FreeBSD.ORG>
+# FIGlet fonts and controlfiles
+# From figmagic supplied with Figlet version 2.2
+# "David E. O'Brien" <obrien@FreeBSD.ORG>
 0      string          flf             FIGlet font
 >3     string          >2a             version %-2.2s
 0      string          flc             FIGlet controlfile