Fixes From: <u31b3hs@pool.informatik.rwth-aachen.de> (Michael Haardt)

diff --git a/magic/Magdir/commands b/magic/Magdir/commands
index 64522f80f5ad62b04f3f523af68cd769ede408e6..d7c04c1a40aca2fa54bb6bfe58a52546b1e4fd68 100644 (file)
--- a/magic/Magdir/commands
+++ b/magic/Magdir/commands
@@ -36,3 +36,5 @@
 0       string          #!/usr/local/bin/perl   perl commands text
 0       string          #!\ /usr/local/bin/perl perl commands text
 0       string          eval\ "exec\ /usr/local/bin/perl        perl commands text
+0      string          #!/bin/rc       Plan 9 rc Shell script text
+0      string          #!\ /bin/rc     Plan 9 rc Shell script text

diff --git a/magic/Magdir/compress b/magic/Magdir/compress
index 744a1b1a01b84a32dfda77867fabf34f1f8d6410..6309c18061a1b74efcd1ff3104a05c92d60ef4fd 100644 (file)
--- a/magic/Magdir/compress
+++ b/magic/Magdir/compress
@@ -30,3 +30,11 @@
 # Freeze
 0      string          \037\237        Frozen file 2.1
 0      string          \037\236        Frozen file 1.0 (or gzip 0.5)
+#
+# Standard unix compress
+#
+0      string          \037\235        compressed data
+>2     byte&0x80       >0              block compressed
+>2     byte&0x1f       x               %d bits
+
+0      string          \037\240        LZH compressed data

diff --git a/magic/Magdir/dump b/magic/Magdir/dump
index 923fffd0d232cef78b5a3be158d90565ce26129a..d641747f38d428a727d9c392ce5ee4e35ecc6227 100644 (file)
--- a/magic/Magdir/dump
+++ b/magic/Magdir/dump
@@ -1,43 +1,80 @@
 #
 # magic.dump, dump file format. For new and old dump filesystems
 #
-# No, these shouldn't specify a specific byte order, because the byte
-# order is dependent on the machine that produced the dump.
+# We specify both byte orders in order to recognize byte-swapped dumps.
 #
-24     long    60012           new-fs dump file,
->4     date    x               Previous dump %s,
->8     date    x               This dump %s,
->12    long    >0              Volume %ld,
->692   long    0               Level zero, type:
->692   long    >0              Level %d, type:
->0     long    1               tape header,
->0     long    2               beginning of file record,
->0     long    3               map of inodes on tape,
->0     long    4               continuation of file record,
->0     long    5               end of volume,
->0     long    6               map of inodes deleted,
->0     long    7               end of medium (for floppy),
+24     belong  60012           new-fs dump file (big endian),
+>4     bedate  x               Previous dump %s,
+>8     bedate  x               This dump %s,
+>12    belong  >0              Volume %ld,
+>692   belong  0               Level zero, type:
+>692   belong  >0              Level %d, type:
+>0     belong  1               tape header,
+>0     belong  2               beginning of file record,
+>0     belong  3               map of inodes on tape,
+>0     belong  4               continuation of file record,
+>0     belong  5               end of volume,
+>0     belong  6               map of inodes deleted,
+>0     belong  7               end of medium (for floppy),
 >676   string  >\0             Label %s,
 >696   string  >\0             Filesystem %s,
 >760   string  >\0             Device %s,
 >824   string  >\0             Host %s,
->888   long    >0              Flags %x
+>888   belong  >0              Flags %x
 
-24     long    60011           old-fs dump file,
-#>4    date    x               Previous dump %s,
-#>8    date    x               This dump %s,
->12    long    >0              Volume %ld,
->692   long    0               Level zero, type:
->692   long    >0              Level %d, type:
->0     long    1               tape header,
->0     long    2               beginning of file record,
->0     long    3               map of inodes on tape,
->0     long    4               continuation of file record,
->0     long    5               end of volume,
->0     long    6               map of inodes deleted,
->0     long    7               end of medium (for floppy),
+24     belong  60011           old-fs dump file (big endian),
+#>4    bedate  x               Previous dump %s,
+#>8    bedate  x               This dump %s,
+>12    belong  >0              Volume %ld,
+>692   belong  0               Level zero, type:
+>692   belong  >0              Level %d, type:
+>0     belong  1               tape header,
+>0     belong  2               beginning of file record,
+>0     belong  3               map of inodes on tape,
+>0     belong  4               continuation of file record,
+>0     belong  5               end of volume,
+>0     belong  6               map of inodes deleted,
+>0     belong  7               end of medium (for floppy),
 >676   string  >\0             Label %s,
 >696   string  >\0             Filesystem %s,
 >760   string  >\0             Device %s,
 >824   string  >\0             Host %s,
->888   long    >0              Flags %x
+>888   belong  >0              Flags %x
+
+24     lelong  60012           new-fs dump file (little endian),
+>4     ledate  x               Previous dump %s,
+>8     ledate  x               This dump %s,
+>12    lelong  >0              Volume %ld,
+>692   lelong  0               Level zero, type:
+>692   lelong  >0              Level %d, type:
+>0     lelong  1               tape header,
+>0     lelong  2               beginning of file record,
+>0     lelong  3               map of inodes on tape,
+>0     lelong  4               continuation of file record,
+>0     lelong  5               end of volume,
+>0     lelong  6               map of inodes deleted,
+>0     lelong  7               end of medium (for floppy),
+>676   string  >\0             Label %s,
+>696   string  >\0             Filesystem %s,
+>760   string  >\0             Device %s,
+>824   string  >\0             Host %s,
+>888   lelong  >0              Flags %x
+
+24     lelong  60011           old-fs dump file (little endian),
+#>4    ledate  x               Previous dump %s,
+#>8    ledate  x               This dump %s,
+>12    lelong  >0              Volume %ld,
+>692   lelong  0               Level zero, type:
+>692   lelong  >0              Level %d, type:
+>0     lelong  1               tape header,
+>0     lelong  2               beginning of file record,
+>0     lelong  3               map of inodes on tape,
+>0     lelong  4               continuation of file record,
+>0     lelong  5               end of volume,
+>0     lelong  6               map of inodes deleted,
+>0     lelong  7               end of medium (for floppy),
+>676   string  >\0             Label %s,
+>696   string  >\0             Filesystem %s,
+>760   string  >\0             Device %s,
+>824   string  >\0             Host %s,
+>888   lelong  >0              Flags %x

diff --git a/magic/Magdir/images b/magic/Magdir/images
index dae6d0af8bac3d910d448e406bf626545be41468..c4d259f730a67e39f72390a14bc5780ab2b2881a 100644 (file)
--- a/magic/Magdir/images
+++ b/magic/Magdir/images
@@ -45,6 +45,17 @@
 >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          \361\0\100\273  CMU window manager bitmap
+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
+6      string          JFIF            JPEG picture
+0       string          ARF_BEGARF             PHIGS clear text archive
+
+# From: <u31b3hs@pool.informatik.rwth-aachen.de> (Michael Haardt)
+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          yx      MGR bitmap, modern format, squeezed

diff --git a/magic/Magdir/linux b/magic/Magdir/linux
index 512a284bd409a2da4b235903066e81b9752800e1..7c2855ee59082a865d4ed219d42ee82a3b291232 100644 (file)
--- a/magic/Magdir/linux
+++ b/magic/Magdir/linux
@@ -1,9 +1,11 @@
 # Values for Linux/i386 binaries, From: Rik Faith <faith@cs.unc.edu>
-2       leshort         100             Linux/i386
->0      leshort         0407            executable
->0      leshort         0410            pure executable
->0      leshort         0413            demand paged executable
->16     lelong          >0              not stripped
+2      leshort         100             Linux/i386
+>0     leshort         0407            executable or impure executable (OMAGIC)
+>0     leshort         0410            pure executable (NMAGIC)
+>0     leshort         0413            demand-paged executable (ZMAGIC)
+>0     leshort         0314            demand-paged executable (QMAGIC)
+>16    lelong          >0              not stripped
 >0      string          Jump            jump
 # core dump file
-216     lelong          0421            core file (Linux)
+216    lelong          0421            core file (Linux)
+>220   string          >\0             core file (Linux) of %s

diff --git a/magic/Magdir/old/ar b/magic/Magdir/old/ar
index 80953833e2297634c4e96b708a14b13617787258..583ec30cf9b3ff61293005eafd11dc204382d3a4 100644 (file)
--- a/magic/Magdir/old/ar
+++ b/magic/Magdir/old/ar
@@ -69,6 +69,20 @@
 2      string          -lh             LHarc archive data
 >6     byte            x               type %c
 >20    byte            x               - header level %d
+
+# From: <u31b3hs@pool.informatik.rwth-aachen.de> (Michael Haardt)
+2      string          -lh0-           Lharc 1.x archive
+2      string          -lh1-           Lharc 1.x archive
+2      string          -lz4-           Lharc 1.x archive
+2      string          -lz5-           Lharc 1.x archive
+2      string          -lzs-           LHa 2.x? archive [lzs]
+2      string          -lh -           LHa 2.x? archive [lh ]
+2      string          -lhd-           LHa 2.x? archive [lhd]
+2      string          -lh2-           LHa 2.x? archive [lh2]
+2      string          -lh3-           LHa 2.x? archive [lh3]
+2      string          -lh4-           LHa 2.x? archive [lh4]
+2      string          -lh5-           LHa (2.x) archive
+
 # ARJ archive data from jason@jarthur.Claremont.EDU
 0      leshort         0xea60          ARJ archive data
 >5     byte            x               - version %d,