magic patches from David Griffith

diff --git a/magic/Magdir/adventure b/magic/Magdir/adventure
index 37b4cb3de2e099332277de7f2884f44df03e8ac7..94835e11ed396c790e79cdc84b8ec9c189702bbe 100644 (file)
--- a/magic/Magdir/adventure
+++ b/magic/Magdir/adventure
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------------
-# $File: adventure,v 1.14 2012/06/21 01:32:26 christos Exp $
+# $File: adventure,v 1.15 2015/09/07 10:03:21 christos Exp $
 # adventure: file(1) magic for Adventure game files
 #
 # from Allen Garvin <earendil@faeryland.tamu-commerce.edu>
@@ -17,6 +17,7 @@
 # Infocom (see z-machine)
 #------------------------------------------------------------------------------
 # Z-machine:  file(1) magic for Z-machine binaries.
+# Sanity checks by David Griffith <dave@661.org>
 # Updated by Adam Buchbinder <adam.buchbinder@gmail.com>
 #
 #http://www.gnelson.demon.co.uk/zspec/sect11.html
@@ -41,10 +42,12 @@
 >>>>>>>2       ubeshort        < 10    Release %d /
 >>>>>>>>18     string          >\0     Serial %.6s)
 !:strength + 40
+!:mime application/x-zmachine
 
 #------------------------------------------------------------------------------
 # Glulx:  file(1) magic for Glulx binaries.
 #
+# David Griffith <dave@661.org>
 # I haven't checked for false matches yet.
 #
 0      string                  Glul    Glulx game data
@@ -52,7 +55,7 @@
 >>6    byte                    x       \b.%d
 >>8    byte                    x       \b.%d)
 >36    string                  Info    Compiled by Inform
-
+!:mime application/x-glulx
 
 
 # For Quetzal and blorb magic see iff
@@ -66,11 +69,13 @@
 >9     belong  !0x0A0D1A00     game data, CORRUPTED
 >9     belong   0x0A0D1A00
 >>13   string  >\0             %s game data
+!:mime application/x-tads
 #  Resource files start with "TADS2 rsc\n\r\032\0" then the compiler version.
 0      string  TADS2\ rsc      TADS
 >9     belong  !0x0A0D1A00     resource data, CORRUPTED
 >9     belong   0x0A0D1A00
 >>13   string  >\0             %s resource data
+!:mime application/x-tads
 #  Some saved game files start with "TADS2 save/g\n\r\032\0", a little-endian
 #  2-byte length N, the N-char name of the game file *without* a NUL (darn!),
 # "TADS2 save\n\r\032\0" and the interpreter version. 
@@ -78,12 +83,14 @@
 >12    belong  !0x0A0D1A00     saved game data, CORRUPTED
 >12    belong   0x0A0D1A00
 >>(16.s+32) string >\0         %s saved game data
+!:mime application/x-tads
 #  Other saved game files start with "TADS2 save\n\r\032\0" and the interpreter
 #  version.
 0      string  TADS2\ save     TADS
 >10    belong  !0x0A0D1A00     saved game data, CORRUPTED
 >10    belong   0x0A0D1A00
 >>14   string  >\0             %s saved game data
+!:mime application/x-tads
 
 # TADS (Text Adventure Development System) version 3
 #  Game files start with "T3-image\015\012\032"
@@ -97,14 +104,18 @@
 >>11   byte    x               \b%c
 >>12   byte    x               \b%c
 >>13   byte    x               \b%c)
+!:mime application/x-t3vm-image
 
+# edited by David Griffith <dave@661.org>
 # Danny Milosavljevic <danny.milo@gmx.net>
-# this are adrift (adventure game standard) game files, extension .taf
-# depending on version magic continues with 0x93453E6139FA (V 4.0)
-# 0x9445376139FA (V 3.90)
-# 0x9445366139FA (V 3.80)
-# this is from source (http://www.adrift.org.uk/) and I have some taf
-# files, and checked them.
-#0     belong  0x3C423FC9
-#>4    belong  0x6A87C2CF      Adrift game file
-#!:mime        application/x-adrift
+# These are ADRIFT (adventure game standard) game files, extension .taf
+# Checked from source at (http://www.adrift.co/) and various taf files 
+# found at the Interactive Fiction Archive (http://ifarchive.org/)
+0      belong  0x3C423FC9
+>4     belong  0x6A87C2CF      Adrift game file version
+>>8    belong  0x94453661      3.80
+>>8    belong  0x94453761      3.90
+>>8    belong  0x93453E61      4.0
+>>8    belong  0x92453E61      5.0
+>>8    default x               unknown
+!:mime application/x-adrift

diff --git a/magic/Magdir/iff b/magic/Magdir/iff
index b991ab7493061dee5d9e992f714b28b3d732dafe..9437dd68e129a17030343a94e40ff8fb14ae42b0 100644 (file)
--- a/magic/Magdir/iff
+++ b/magic/Magdir/iff
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------------
-# $File: iff,v 1.13 2011/09/06 11:00:06 christos Exp $
+# $File: iff,v 1.14 2015/09/07 10:03:21 christos Exp $
 # iff: file(1) magic for Interchange File Format (see also "audio" & "images")
 #
 # Daniel Quinlan (quinlan@yggdrasil.com) -- IFF was designed by Electronic
@@ -62,6 +62,7 @@
 
 # These go at the end of the iff rules
 #
+# David Griffith <dave@661.org>
 # I don't see why these might collide with anything else.
 #
 # Interactive Fiction related formats
@@ -69,3 +70,4 @@
 >8     string          IFRS            \b, Blorb Interactive Fiction
 >>24   string          Exec            with executable chunk
 >8     string          IFZS            \b, Z-machine or Glulx saved game file (Quetzal)
+!:mime application/x-blorb