*** empty log message ***

diff --git a/magic/Magdir/audio b/magic/Magdir/audio
index fba69fb3d0cd4af5c4fdedbc6be8ad21274a6815..a370dc2ae3a10e02259ee35b988f0424e410c4dd 100644 (file)
--- a/magic/Magdir/audio
+++ b/magic/Magdir/audio
@@ -16,6 +16,10 @@
 >12    belong          6               32-bit IEEE floating point,
 >12    belong          7               64-bit IEEE floating point,
 >12    belong          23              8-bit ISDN u-law compressed (CCITT G.721 ADPCM voice data encoding),
+>12    belong          24              compressed (8-bit G.722 ADPCM)
+>12    belong          25              compressed (3-bit G.723 ADPCM),
+>12    belong          26              compressed (5-bit G.723 ADPCM),
+>12    belong          27              8-bit A-law,
 >20    belong          1               mono,
 >20    belong          2               stereo,
 >20    belong          4               quad,

diff --git a/magic/Magdir/dump b/magic/Magdir/dump
index 955275b8c74fb19147d847bec60622b91bee7bcc..628ead86c613143bd6cbe360af95030abe02c441 100644 (file)
--- a/magic/Magdir/dump
+++ b/magic/Magdir/dump
@@ -43,8 +43,8 @@
 >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,
+>4     ledate  x               This dump %s,
+>8     ledate  x               Previous dump %s,
 >12    lelong  >0              Volume %ld,
 >692   lelong  0               Level zero, type:
 >692   lelong  >0              Level %d, type:

diff --git a/magic/Magdir/elf b/magic/Magdir/elf
index 86d6b288aeec02325dab83f35014e57f54f83338..ba9fcbe811fb2fc75764d2603d67b99793b47268 100644 (file)
--- a/magic/Magdir/elf
+++ b/magic/Magdir/elf
@@ -31,8 +31,15 @@
 >>18   leshort         5               Motorola 88000 - invalid byte order,
 >>18   leshort         6               Intel 80486,
 >>18   leshort         7               Intel 80860,
->>18   leshort         8               MIPS RS3000,
+>>18   leshort         8               MIPS RS3000_BE,
 >>18   leshort         9               Amdahl,
+>>18   leshort         10              MIPS RS3000_LE,
+>>18   leshort         11              RS6000,
+>>18   leshort         15              PA_RISC,
+>>18   leshort         16              nCUBE,
+>>18   leshort         17              VPP500,
+>>18   leshort         18              SPARC32PLUS,
+>>18   leshort         20              PowerPC,
 >>18   leshort         0x9026          Alpha,
 >>20   lelong          0               invalid version
 >>20   lelong          1               version 1
@@ -53,8 +60,15 @@
 >>18   beshort         5               Motorola 88000,
 >>18   beshort         6               Intel 80486 - invalid byte order,
 >>18   beshort         7               Intel 80860,
->>18   beshort         8               MIPS RS3000,
+>>18   beshort         8               MIPS RS3000_BE,
 >>18   beshort         9               Amdahl,
+>>18   beshort         10              MIPS RS3000_LE,
+>>18   beshort         11              RS6000,
+>>18   beshort         15              PA_RISC,
+>>18   beshort         16              nCUBE,
+>>18   beshort         17              VPP500,
+>>18   beshort         18              SPARC32PLUS,
+>>18   beshort         20              PowerPC,
 >>18   beshort         0x9026          Alpha,
 >>20   belong          0               invalid version
 >>20   belong          1               version 1

diff --git a/magic/Magdir/images b/magic/Magdir/images
index 688f352c078dec32843ab591c491e2debe078936..271b169ca5a9ae06f1904dcbbbb96e503223ae85 100644 (file)
--- a/magic/Magdir/images
+++ b/magic/Magdir/images
@@ -116,6 +116,13 @@
 >29    byte            1               \b, fine resolution (204x196 DPI)
 
 # JPEG images
+# SunOS 5.5.1 had
+#
+#      0       string          \377\330\377\340        JPEG file
+#      0       string          \377\330\377\356        JPG file
+#
+# both of which turn into "JPEG image data" here.
+#
 0      beshort         0xffd8          JPEG image data
 >6     string          JFIF            \b, JFIF standard
 # HSI is Handmade Software's proprietary JPEG encoding scheme
@@ -222,3 +229,8 @@
 # other images
 0      string  This\ is\ a\ BitMap\ file       Lisp Machine bit-array-file
 0      string          !!              Bennet Yee's "face" format
+
+# From SunOS 5.5.1 "/etc/magic" - appeared right before Sun raster image
+# stuff.
+#
+0      beshort         0x1010          PEX Binary Archive

diff --git a/magic/Magdir/java b/magic/Magdir/java
index 7681890ef048624101f800cf4f7b65c5ba2c8436..51bbccccade0fcc73960b328671ba78d1a8be045 100644 (file)
--- a/magic/Magdir/java
+++ b/magic/Magdir/java
@@ -1,4 +1,5 @@
 #------------------------------------------------------------
 # Java ByteCode
+# From Larry Schwimmer (schwim@cs.stanford.edu)
 0      belong          0xcafebabe
 >4     belong          0x0003002d      Java bytecode

diff --git a/magic/Magdir/netbsd b/magic/Magdir/netbsd
index 24569ade75417522ed848164582cfbef4e6ded57..84ae76463eae675862e6ef78e822b2e1dd45e278 100644 (file)
--- a/magic/Magdir/netbsd
+++ b/magic/Magdir/netbsd
@@ -17,6 +17,8 @@
 >>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/sgi b/magic/Magdir/sgi
index a73cfcf0b3cb0d10d9983a43620900bd904ae8b3..541c9ff9e3c9da1b2515520f902c421d22a3e90d 100644 (file)
--- a/magic/Magdir/sgi
+++ b/magic/Magdir/sgi
@@ -1,7 +1,7 @@
 
 #------------------------------------------------------------------------------
 # sgi:  file(1) magic for Silicon Graphics (MIPS, IRIS, IRIX, etc.)
-#
+#                         Dec Ultrix (MIPS)
 # all of SGI's *current* machines and OSes run in big-endian mode on the
 # MIPS machines, as far as I know.
 #
@@ -47,8 +47,8 @@
 >20    beshort 05401           (paged)
 >8     belong  >0              not stripped
 >8     belong  0               stripped
->22    byte    x               - version %d
->23    byte    x               \b.%ld
+>23    byte    x               - version %d
+>22    byte    x               \b.%ld
 #
 0      beshort 0x6201          MIPSEL-LE COFF executable
 >20    beshort 03401           (impure)
@@ -56,8 +56,8 @@
 >20    beshort 05401           (paged)
 >8     belong  >0              not stripped
 >8     belong  0               stripped
->22    byte    x               - version %ld
->23    byte    x               \b.%ld
+>23    byte    x               - version %ld
+>22    byte    x               \b.%ld
 #
 # MIPS 2 additions
 #
@@ -86,7 +86,7 @@
 >8     belong  >0              not stripped
 >8     belong  0               stripped
 >23    byte    x               - version %ld
->23    byte    x               \b.%ld
+>22    byte    x               \b.%ld
 #
 0      beshort 0x6601          MIPSEL-LE MIPS-II COFF executable
 >20    beshort 03401           (impure)
@@ -95,7 +95,7 @@
 >8     belong  >0              not stripped
 >8     belong  0               stripped
 >23    byte    x               - version %ld
->23    byte    x               \b.%ld
+>22    byte    x               \b.%ld
 #
 # MIPS 3 additions
 #
@@ -124,7 +124,7 @@
 >8     belong  >0              not stripped
 >8     belong  0               stripped
 >23    byte    x               - version %ld
->23    byte    x               \b.%ld
+>22    byte    x               \b.%ld
 #
 0      beshort 0x4201          MIPSEL-LE MIPS-III COFF executable
 >20    beshort 03401           (impure)
@@ -133,7 +133,7 @@
 >8     belong  >0              not stripped
 >8     belong  0               stripped
 >23    byte    x               - version %ld
->23    byte    x               \b.%ld
+>22    byte    x               \b.%ld
 #
 0      beshort 0x180           MIPSEB Ucode
 0      beshort 0x182           MIPSEL Ucode