*** empty log message ***

diff --git a/magic/Magdir/archive b/magic/Magdir/archive
index dc42c3fd09603329a03ccd666e35bd176b3aadaa..f266b199808c4ec46f24d40588a4e62d4e2ea744 100644 (file)
--- a/magic/Magdir/archive
+++ b/magic/Magdir/archive
@@ -54,11 +54,10 @@
 # 0    string          !<arch>         current ar archive
 # 0    long            0x213c6172      archive file
 #
-# and for SVR3.1 archives, we have:
+# and for SVR1 archives, we have:
 #
 # 0    string          \<ar>           System V Release 1 ar archive
 # 0    string          =<ar>           archive
-# 0    string          =<ar>           archive
 #
 # XXX - did Aegis really store shared libraries, breakpointed modules,
 # and absolute code program modules in the same format as new-style
@@ -96,14 +95,10 @@
 0      leshort         0177545         old PDP-11 archive
 >8     string          __.SYMDEF       random library
 #
-0      string          =<ar>           archive
-#
-# From "pdp":
+# From "pdp" (but why a 4-byte quantity?)
 #
 0      lelong          0x39bed         PDP-11 old archive
 0      lelong          0x39bee         PDP-11 4.0 archive
-#
-0      string          -h-             Software Tools format archive text
 
 # ARC archiver, from Daniel Quinlan (quinlan@yggdrasil.com)
 #

diff --git a/magic/Magdir/hp b/magic/Magdir/hp
index 21a2e1d958e26e30b3f5570459f1ac576337a09b..e1efdbde82ed649e3e044923034c437c99ac2f4e 100644 (file)
--- a/magic/Magdir/hp
+++ b/magic/Magdir/hp
@@ -172,7 +172,7 @@
 
 0      string          IMGfile CIS     compimg HP Bitmapfile
 # XXX - see "lif"
-0      short           0x8000          lif file
+#0     short           0x8000          lif file
 0      long            0x020c010c      compiled Lisp
 
 0      string          msgcat01        HP NLS message catalog,

diff --git a/magic/Magdir/ibm370 b/magic/Magdir/ibm370
index 32d6becd33dd168f9ad8636c0eaeaed94de92d1d..8cd9da27ae6a9a22d236f526757a63372070714e 100644 (file)
--- a/magic/Magdir/ibm370
+++ b/magic/Magdir/ibm370
@@ -4,7 +4,35 @@
 #
 # "ibm370" said that 0x15d == 0535 was "ibm 370 pure executable".
 # What the heck *is* "USS/370"?
+# AIX 4.1's "/etc/magic" has
 #
+#      0       short           0535            370 sysV executable 
+#      >12     long            >0              not stripped
+#      >22     short           >0              - version %d
+#      >30     long            >0              - 5.2 format
+#      0       short           0530            370 sysV pure executable 
+#      >12     long            >0              not stripped
+#      >22     short           >0              - version %d
+#      >30     long            >0              - 5.2 format
+#
+# instead of the "USS/370" versions of the same magic numbers.
+#
+0      beshort         0537            370 XA sysV executable 
+>12    belong          >0              not stripped
+>22    beshort         >0              - version %d
+>30    belong          >0              - 5.2 format
+0      beshort         0532            370 XA sysV pure executable 
+>12    belong          >0              not stripped
+>22    beshort         >0              - version %d
+>30    belong          >0              - 5.2 format
+0      beshort         054001          370 sysV pure executable
+>12    belong          >0              not stripped
+0      beshort         055001          370 XA sysV pure executable
+>12    belong          >0              not stripped
+0      beshort         056401          370 sysV executable
+>12    belong          >0              not stripped
+0      beshort         057401          370 XA sysV executable
+>12    belong          >0              not stripped
 0       beshort                0531            SVR2 executable (Amdahl-UTS)
 >12    belong          >0              not stripped
 >24     belong         >0              - version %ld

diff --git a/magic/Magdir/ibm6000 b/magic/Magdir/ibm6000
index d6cb17d4ecfc2dec17821aada97887bff730a8ad..8e1077b9b8c8239be72aafb9ef8a5651f8295e3d 100644 (file)
--- a/magic/Magdir/ibm6000
+++ b/magic/Magdir/ibm6000
@@ -12,5 +12,6 @@
 0      beshort         0x0104          shared library
 0      beshort         0x0105          ctab data
 0      beshort         0xfe04          structured file
-0      string          0xabcdef        message catalog
+0      string          0xabcdef        AIX message catalog
+0      belong          0x000001f9      AIX compiled message catalog
 0      string          \<aiaff>        archive

diff --git a/magic/Magdir/linux b/magic/Magdir/linux
index b1b25dc6153f4de694777f23c10c5d263865977f..75a2a2b98b6d1eb7196a66067525c834a89da067 100644 (file)
--- a/magic/Magdir/linux
+++ b/magic/Magdir/linux
@@ -24,7 +24,7 @@
 0      string          \007\001\000    Linux/i386 object file
 >20    lelong          >0x1020         \b, DLL library
 # message catalogs, from Mitchum DSouza <m.dsouza@mrc-apu.cam.ac.uk>
-0      string          *nazgul*        compiled message catalog
+0      string          *nazgul*        Linux compiled message catalog
 >8     lelong          >0              \b, version %ld
 # core dump file, from Bill Reynolds <bill@goshawk.lanl.gov>
 216    lelong          0421            Linux/i386 core file

diff --git a/magic/Magdir/netbsd b/magic/Magdir/netbsd
index 84ae76463eae675862e6ef78e822b2e1dd45e278..7d92ef536798c5f1d918c2428d476dd1abe2386e 100644 (file)
--- a/magic/Magdir/netbsd
+++ b/magic/Magdir/netbsd
@@ -4,21 +4,6 @@
 #
 # All new-style magic numbers are in network byte order.
 #
-0      lelong                  000000413       386BSD demand paged executable
->16    lelong                  >0              not stripped
-0      lelong                  000000314       BSDI demand paged executable
->16    lelong                  >0              not stripped
->32    byte                    0x6a            (uses shared libs)
-
-0      lelong&077777777        041400314       FreeBSD/i386 demand paged
->3     byte                    &0x80
->>20   lelong                  <4096           shared library
->>20   lelong                  =4096           dynamically linked executable
->>20   lelong                  >4096           dynamically linked executable
->3     byte                    ^0x80           executable
->16    lelong                  >0              not stripped
-0      string                  \0\0\0\0\0\0\300\357\020\0      FreeBSD core
->1075  string                  >\0                             from '%s'
 
 0      lelong                  000000407       NetBSD little-endian object file
 >16    lelong                  >0              not stripped

diff --git a/magic/Magdir/sun b/magic/Magdir/sun
index 450ea6a504cd4eec7bb6885a67a824587e669489..2f0336a91b822b1d3e601e42daceb6a6385c00ca 100644 (file)
--- a/magic/Magdir/sun
+++ b/magic/Magdir/sun
@@ -88,8 +88,22 @@
 0      long            0xfa33c08e      SunPC 4.0 Hard Disk
 0      string          #SUNPC_CONFIG   SunPC 4.0 Properties Values
 # Sun snoop
+#
+# XXX - are numbers stored in big-endian format, or in host byte order?
+# They're the same on SPARC, but not the same on x86.
+#
 0      string          snoop           Snoop capture file
 >8     long            >0              - version %ld
+>12    long            0               (IEEE 802.3)
+>12    long            1               (IEEE 802.4)
+>12    long            2               (IEEE 802.5)
+>12    long            3               (IEEE 802.6)
+>12    long            4               (Ethernet)
+>12    long            5               (HDLC)
+>12    long            6               (Character synchronous)
+>12    long            7               (IBM channel-to-channel adapter)
+>12    long            8               (FDDI)
+>12    long            9               (Unknown)
 # Sun KCMS
 36     string          acsp            Kodak Color Management System, ICC Profile