l.

diff --git a/magic/Magdir/hp b/magic/Magdir/hp
index f12382003eaead21f2ebfea18385b72932fa9fe6..ffcd232cf3eda0e7671e6924d0d3580ebb9f38b5 100644 (file)
--- a/magic/Magdir/hp
+++ b/magic/Magdir/hp
@@ -48,7 +48,7 @@
 0       long            01702407010     TML 1032 byte-order format
 0       long            01003405017     TML 2301 byte-order format
 0       long            01602007412     TML 3210 byte-order format
-#### PA-RISC
+#### PA-RISC 1.1
 0      belong          0x02100106      PA-RISC1.1 relocatable object
 0      belong          0x02100107      PA-RISC1.1 executable
 >168   belong          &=0x00000004    dynamically linked
@@ -71,6 +71,30 @@
 0      belong          0x0210010d      PA-RISC1.1 dynamic load library
 >96    belong          >0              - not stripped
 
+#### PA-RISC 2.0
+0      belong          0x02140106      PA-RISC2.0 relocatable object
+
+0       belong         0x02140107      PA-RISC2.0 executable
+>168   belong          &=0x00000004    dynamically linked
+>(144) belong          0x054ef630      dynamically linked
+>96    belong          >0              - not stripped
+
+0       belong         0x02140108      PA-RISC2.0 shared executable
+>168   belong          &=0x00000004    dynamically linked
+>(144) belong          0x054ef630      dynamically linked
+>96    belong          >0              - not stripped
+
+0       belong         0x0214010b      PA-RISC2.0 demand-load executable
+>168   belong          &=0x00000004    dynamically linked
+>(144) belong          0x054ef630      dynamically linked
+>96    belong          >0              - not stripped
+
+0       belong         0x0214010e      PA-RISC2.0 shared library
+>96    belong          >0              - not stripped
+
+0       belong         0x0214010d      PA-RISC2.0 dynamic load library
+>96    belong          >0              - not stripped
+
 #### 800
 0      belong          0x020b0106      PA-RISC1.0 relocatable object
 

diff --git a/magic/Magdir/images b/magic/Magdir/images
index e61c36cd2a48ee6bfb2b3b85f643133785f120b8..1d348e122e8d60fd2213479c0682ecd82e06b441 100644 (file)
--- a/magic/Magdir/images
+++ b/magic/Magdir/images
@@ -237,3 +237,6 @@
 # stuff.
 #
 0      beshort         0x1010          PEX Binary Archive
+
+# Visio drawings
+03000  string  Visio\ (TM)\ Drawing                    %s

diff --git a/magic/Magdir/java b/magic/Magdir/java
index 40a837bf31dfd93f8bdd46e1e14e06b197f565ac..d0677bf7040bed9c370c06d16d7deaaebb34cca0 100644 (file)
--- a/magic/Magdir/java
+++ b/magic/Magdir/java
@@ -1,7 +1,7 @@
 #------------------------------------------------------------
 # Java ByteCode
 # From Larry Schwimmer (schwim@cs.stanford.edu)
-0      belong          0xcafebabe
+0      belong          0xcafebabe      compiled Java class data,
 >6     beshort x       version %d.
 >4     beshort x       \b%d
 #------------------------------------------------------------

diff --git a/magic/Magdir/linux b/magic/Magdir/linux
index 2e69490b8389777f2dd2f95e20957a96dc9e2576..ec6d5c89fb5faa8243a2d45eb0d00592fb20fadf 100644 (file)
--- a/magic/Magdir/linux
+++ b/magic/Magdir/linux
@@ -66,7 +66,7 @@
 #
 # Linux kernel boot images, from Albert Cahalan <acahalan@cs.uml.edu>
 # and others such as Axel Kohlmeyer <akohlmey@rincewind.chemie.uni-ulm.de>
-# and Nicol=E1s Lichtmaier <nick@debian.org>
+# and Nicolas Lichtmaier <nick@debian.org>
 # All known start with: b8 c0 07 8e d8 b8 00 90 8e c0 b9 00 01 29 f6 29
 514            string  HdrS            Linux kernel
 >518           leshort >0
@@ -88,6 +88,5 @@
 0              belong  0xb8c0078e      Linux kernel
 >0x1e3         string  Loading         version 1.3.79 or older
 >0x1e9         string  Loading         from prehistoric times
-20
 # LSM entries - Nicolas Lichtmaier <nick@feedback.com.ar>
 0      string  Begin3  Linux Software Map entry text

diff --git a/magic/Magdir/msdos b/magic/Magdir/msdos
index 6a7e31c25d81a656042500c14216bdbae041019c..0f9c8ff22d43b982e712cb9bf9713457d327247e 100644 (file)
--- a/magic/Magdir/msdos
+++ b/magic/Magdir/msdos
@@ -143,6 +143,8 @@
 #
 0      belong  0x31be0000      Microsoft Word Document
 #
+0       string  PO^Q`           Microsoft Word 6.0 Document
+#
 2080   string  Microsoft\ Excel\ 5.0\ Worksheet        %s
 #
 # Pawel Wiecek <coven@i17linuxb.ists.pwr.wroc.pl> (for polish Excel)

diff --git a/magic/Magdir/sgi b/magic/Magdir/sgi
index ce9dbc8b2744308c6b19e618be97a222c9ffd752..39fadae66cb628bfe67a69a97772ef8113794e12 100644 (file)
--- a/magic/Magdir/sgi
+++ b/magic/Magdir/sgi
@@ -149,6 +149,10 @@
 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'
@@ -156,7 +160,7 @@
 0      string  SGIAUDIT        SGI Audit file
 >8     byte    x               - version %d
 >9     byte    x               \b.%ld
-# Are these three SGI-based file types or general ones?
+#
 0      string  WNGZWZSC        Wingz compiled script
 0      string  WNGZWZSS        Wingz spreadsheet
 0      string  WNGZWZHP        Wingz help file

diff --git a/magic/Magdir/timezone b/magic/Magdir/timezone
index e47a3717abd6d32c3a7466627c16723031449265..bae5abe87e9ae594dee879b988007cc4d99a3f74 100644 (file)
--- a/magic/Magdir/timezone
+++ b/magic/Magdir/timezone
@@ -4,6 +4,8 @@
 #
 # from Daniel Quinlan (quinlan@yggdrasil.com)
 # this should work on Linux, SunOS, and maybe others
+# Added new official magic number for recent versions of the Olson code
+0      string  TZif    timezone data
 0      string  \0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0      timezone data
 0      string  \0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\2\0      timezone data
 0      string  \0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\3\0      timezone data

diff --git a/magic/Magdir/varied.out b/magic/Magdir/varied.out
index 9245cfcbcc34bb3bb74f50bb7f1db41f6cf19511..f1a3edf11cdeb9cd051ec31ede40dba6c5e23446 100644 (file)
--- a/magic/Magdir/varied.out
+++ b/magic/Magdir/varied.out
@@ -16,3 +16,6 @@
 # Ultrix 4.3
 596    string          \130\337\377\377        Ultrix core file
 >600   string          >\0     '%s'
+# BeOS and MAcOS PEF executables
+# From: hplus@zilker.net (Jon Watte)
+0      string          Joy!peffpwpc    header for PowerPC PEF executable