more fixes from Guy Harris

diff --git a/magic/Magdir/llvm b/magic/Magdir/llvm
index c1c7281705c94dad9685c954bd563a4615174963..8acddfed9c7a9b9e0d93617aaf3ea12bd8e4edf2 100644 (file)
--- a/magic/Magdir/llvm
+++ b/magic/Magdir/llvm
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------------
-# $File: llvm,v 1.6 2013/01/04 23:31:59 christos Exp $
+# $File: llvm,v 1.7 2013/01/08 01:34:38 christos Exp $
 # llvm:  file(1) magic for LLVM byte-codes
 # URL:  http://llvm.org/docs/BitCodeFormat.html
 # From: Al Stone <ahs3@fc.hp.com>
@@ -18,4 +18,4 @@
 >16    lelong  0x01000012      ppc64
 >16    lelong  0x0000000c      arm
 
-0      string  BC\xc0\xde      LLVM bitcode
+0      string  BC\xc0\xde      LLVM IR bitcode

diff --git a/magic/Magdir/mips b/magic/Magdir/mips
index 2bab394c926f98715cce524d8a22d5c557e5d6bd..75914a41413818b796c5a8af0f4755b8bafee94f 100644 (file)
--- a/magic/Magdir/mips
+++ b/magic/Magdir/mips
@@ -1,32 +1,8 @@
 
 #------------------------------------------------------------------------------
-# $File: mips,v 1.7 2011/05/03 01:44:17 christos Exp $
-# mips:  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.
-#
-# XXX - what is the blank "-" line?
-#
-# kbd file definitions
-0      string  kbd!map         kbd map file
->8     byte    >0              Ver %d:
->10    short   >0              with %d table(s)
-0      belong  0407            old SGI 68020 executable
-0      belong  0410            old SGI 68020 pure executable
-0      beshort 0x8765          disk quotas file
-0      beshort 0x0506          IRIS Showcase file
->2     byte    0x49            -
->3     byte    x               - version %ld
-0      beshort 0x0226          IRIS Showcase template
->2     byte    0x63            -
->3     byte    x               - version %ld
-0      belong  0x5343464d      IRIS Showcase file
->4     byte    x               - version %ld
-0      belong  0x5443464d      IRIS Showcase template
->4     byte    x               - version %ld
-0      belong  0xdeadbabe      IRIX Parallel Arena
->8     belong  >0              - version %ld
+# $File: mips,v 1.8 2013/01/09 22:37:24 christos Exp $
+# mips:  file(1) magic for MIPS ECOFF and Ucode, as used in SGI IRIX
+# and DEC Ultrix
 #
 0      beshort 0x0160          MIPSEB ECOFF executable
 >20    beshort 0407            (impure)

diff --git a/magic/Magdir/sgi b/magic/Magdir/sgi
index 8c52b26087b0862b81d5a68df8094ea511217f5c..a4732d02f5fe83ac95c382e0eb3ab3163916299a 100644 (file)
--- a/magic/Magdir/sgi
+++ b/magic/Magdir/sgi
@@ -1,7 +1,74 @@
 
 #------------------------------------------------------------------------------
-# $File: sgi,v 1.17 2009/09/19 16:28:12 christos Exp $
-# sgi:  file(1) magic for Silicon Graphics applications
+# $File: sgi,v 1.18 2010/11/25 15:00:12 christos Exp $
+# sgi:  file(1) magic for Silicon Graphics operating systems and applications
+#
+# Executable images are handled either in aout (for old-style a.out
+# files for 68K; they are indistinguishable from other big-endian 32-bit
+# a.out files) or in mips (for MIPS ECOFF and Ucode files)
+#
+
+# kbd file definitions
+0      string  kbd!map         kbd map file
+>8     byte    >0              Ver %d:
+>10    short   >0              with %d table(s)
+
+0      beshort 0x8765          disk quotas file
+
+0      beshort 0x0506          IRIS Showcase file
+>2     byte    0x49            -
+>3     byte    x               - version %ld
+0      beshort 0x0226          IRIS Showcase template
+>2     byte    0x63            -
+>3     byte    x               - version %ld
+0      belong  0x5343464d      IRIS Showcase file
+>4     byte    x               - version %ld
+0      belong  0x5443464d      IRIS Showcase template
+>4     byte    x               - version %ld
+0      belong  0xdeadbabe      IRIX Parallel Arena
+>8     belong  >0              - version %ld
+
+# core files
+#
+# 32bit core file
+0      belong  0xdeadadb0      IRIX core dump
+>4     belong  1               of
+>16    string  >\0             '%s'
+# 64bit core file
+0      belong  0xdeadad40      IRIX 64-bit core dump
+>4     belong  1               of
+>16    string  >\0             '%s'
+# N32bit core file
+0       belong 0xbabec0bb      IRIX N32 core dump
+>4      belong 1               of
+>16     string >\0             '%s'
+# New style crash dump file
+0      string  \x43\x72\x73\x68\x44\x75\x6d\x70        IRIX vmcore dump of
+>36    string  >\0                                     '%s'
+
+# Trusted IRIX info
+0      string  SGIAUDIT        SGI Audit file
+>8     byte    x               - version %d
+>9     byte    x               \b.%ld
+#
+0      string  WNGZWZSC        Wingz compiled script
+0      string  WNGZWZSS        Wingz spreadsheet
+0      string  WNGZWZHP        Wingz help file
+#
+0      string  #Inventor V     IRIS Inventor 1.0 file
+0      string  #Inventor V2    Open Inventor 2.0 file
+# GLF is OpenGL stream encoding
+0      string  glfHeadMagic();         GLF_TEXT
+4      belong  0x7d000000              GLF_BINARY_LSB_FIRST
+!:strength -30
+4      belong  0x0000007d              GLF_BINARY_MSB_FIRST
+!:strength -30
+# GLS is OpenGL stream encoding; GLS is the successor of GLF
+0      string  glsBeginGLS(            GLS_TEXT
+4      belong  0x10000000              GLS_BINARY_LSB_FIRST
+!:strength -30
+4      belong  0x00000010              GLS_BINARY_MSB_FIRST
+!:strength -30
 
 #
 #