new magic

diff --git a/magic/Magdir/convex b/magic/Magdir/convex
index 14ed86742da2d5ca2e89d8fbf6413ffdbe23b5cd..b1235d7e79a864c6f9154bc289d87833a0fa2244 100644 (file)
--- a/magic/Magdir/convex
+++ b/magic/Magdir/convex
@@ -1,7 +1,69 @@
-
 #------------------------------------------------------------------------------
 # convex:  file(1) magic for Convex boxes
 #
 # Convexes are big-endian.
 #
-0      long            0513            Convex executable
+# /*\
+#  * Below are the magic numbers and tests added for Convex.
+#  * Added at beginning, because they are expected to be used most.
+# \*/
+0      belong  0507    Convex old-style object
+>16    belong  >0      not stripped
+0      belong  0513    Convex old-style demand paged executable
+>16    belong  >0      not stripped
+0      belong  0515    Convex old-style pre-paged executable
+>16    belong  >0      not stripped
+0      belong  0517    Convex old-style pre-paged, non-swapped executable
+>16    belong  >0      not stripped
+0      belong  0x011257        Core file
+#
+# The following are a series of dump format magic numbers.  Each one
+# corresponds to a drastically different dump format.  The first on is
+# the original dump format on a 4.1 BSD or earlier file system.  The
+# second marks the change between the 4.1 file system and the 4.2 file
+# system.  The Third marks the changing of the block size from 1K
+# to 2K to be compatible with an IDC file system.  The fourth indicates
+# a dump that is dependent on Convex Storage Manager, because data in
+# secondary storage is not physically contained within the dump.
+# The restore program uses these number to determine how the data is
+# to be extracted.
+#
+24     belong  =60011  dump format, 4.1 BSD or earlier
+24     belong  =60012  dump format, 4.2 or 4.3 BSD without IDC
+24     belong  =60013  dump format, 4.2 or 4.3 BSD (IDC compatible)
+24     belong  =60014  dump format, Convex Storage Manager by-reference dump
+#
+# what follows is a bunch of bit-mask checks on the flags field of the opthdr.
+# If there is no `=' sign, assume just checking for whether the bit is set?
+#
+0      belong  0601            Convex SOFF
+>88    belong&0x000f0000       =0x00000000     c1
+>88    belong                  &0x00010000     c2
+>88    belong                  &0x00020000     c2mp
+>88    belong                  &0x00040000     parallel
+>88    belong                  &0x00080000     intrinsic
+>88    belong                  &0x00000001     demand paged
+>88    belong                  &0x00000002     pre-paged
+>88    belong                  &0x00000004     non-swapped
+>88    belong                  &0x00000008     POSIX
+#
+>84    belong                  &0x80000000     executable
+>84    belong                  &0x40000000     object
+>84    belong&0x20000000       =0              not stripped
+>84    belong&0x18000000       =0x00000000     native fpmode
+>84    belong&0x18000000       =0x10000000     ieee fpmode
+>84    belong&0x18000000       =0x18000000     undefined fpmode
+#
+0      belong                  0605            Convex SOFF core
+#
+0      belong                  0607            Convex SOFF checkpoint
+>88    belong&0x000f0000       =0x00000000     c1
+>88    belong                  &0x00010000     c2
+>88    belong                  &0x00020000     c2mp
+>88    belong                  &0x00040000     parallel
+>88    belong                  &0x00080000     intrinsic
+>88    belong                  &0x00000008     POSIX
+#
+>84    belong&0x18000000       =0x00000000     native fpmode
+>84    belong&0x18000000       =0x10000000     ieee fpmode
+>84    belong&0x18000000       =0x18000000     undefined fpmode

diff --git a/magic/Magdir/database b/magic/Magdir/database
index 692ce6b31536d7089b85d5b5389c84ab0ecdb070..146c3108e1ed1368a85e6f763b3e7d977fb5c653 100644 (file)
--- a/magic/Magdir/database
+++ b/magic/Magdir/database
@@ -17,16 +17,18 @@
 >8     belong  1234            Little Endian,
 >8     belong  4321            Big Endian,
 >12    belong  x               Bucket Size %d,
->16    belong  x               Directory Size %d,
->20    belong  x               Segment Size %d,
->24    belong  x               Segment Shift %d,
->28    belong  x               Overflow Point %d,
->32    belong  x               Last Freed %d,
->36    belong  x               Max Bucket %d,
->40    belong  x               High Mask 0x%x,
->44    belong  x               Low Mask 0x%x,
->48    belong  x               Fill Factor %d,
->52    belong  x               Number of Keys %d)
+>16    belong  x               Bucket Shift %d,
+>20    belong  x               Directory Size %d,
+>24    belong  x               Segment Size %d,
+>28    belong  x               Segment Shift %d,
+>32    belong  x               Overflow Point %d,
+>36    belong  x               Last Freed %d,
+>40    belong  x               Max Bucket %d,
+>44    belong  x               High Mask 0x%x,
+>48    belong  x               Low Mask 0x%x,
+>52    belong  x               Fill Factor %d,
+>56    belong  x               Number of Keys %d)
+#
 #
 0      belong  0x053162        Berkeley DB Btree file
 >4     belong  >0              (Version %d,

diff --git a/magic/Magdir/mail.news b/magic/Magdir/mail.news
index 2003b53d810449a7c343b310104ae12dfcdd0549..bd3fd2de43a937f77cd88fe4af65993f782f59dd 100644 (file)
--- a/magic/Magdir/mail.news
+++ b/magic/Magdir/mail.news
@@ -16,6 +16,6 @@
 0      string          From:           news or mail text
 0      string          Article         saved news text
 0      string          BABYL           Emacs RMAIL text
-0      string          Received:       RFC 822 mail message
-0      string          MIME-Version:   MIME entity
-0      string          Content-        MIME entity
+0      string          Received:       RFC 822 mail text
+0      string          MIME-Version:   MIME entity text
+0      string          Content-        MIME entity text