add missing 'x' and quoted spaces in magic (Christoph Biedl)

diff --git a/magic/Magdir/apple b/magic/Magdir/apple
index 98372d224669b363932fbe7bee0da00a659e58f5..133a2c7ebeaa64cdb33b7ace6495f7a02e29aa9b 100644 (file)
--- a/magic/Magdir/apple
+++ b/magic/Magdir/apple
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------------
-# $File: apple,v 1.29 2014/04/30 21:41:02 christos Exp $
+# $File: apple,v 1.30 2015/04/13 13:09:06 christos Exp $
 # apple:  file(1) magic for Apple file formats
 #
 0      search/1/t      FiLeStArTfIlEsTaRt      binscii (apple ][) text
@@ -265,14 +265,14 @@
 >>20   beshort x                       \b, descriptors %d
 # Assume       8 partitions each at a multiple of the sector size.
 # We could glean this from the partition descriptors, but they are empty!?!?
->>(2.S*1)      indirect                \b, contains[@0x%x]: 
->>(2.S*2)      indirect                \b, contains[@0x%x]: 
->>(2.S*3)      indirect                \b, contains[@0x%x]: 
->>(2.S*4)      indirect                \b, contains[@0x%x]: 
->>(2.S*5)      indirect                \b, contains[@0x%x]: 
->>(2.S*6)      indirect                \b, contains[@0x%x]: 
->>(2.S*7)      indirect                \b, contains[@0x%x]: 
->>(2.S*8)      indirect                \b, contains[@0x%x]: 
+>>(2.S*1)      indirect        x       \b, contains[@0x%x]: 
+>>(2.S*2)      indirect        x       \b, contains[@0x%x]: 
+>>(2.S*3)      indirect        x       \b, contains[@0x%x]: 
+>>(2.S*4)      indirect        x       \b, contains[@0x%x]: 
+>>(2.S*5)      indirect        x       \b, contains[@0x%x]: 
+>>(2.S*6)      indirect        x       \b, contains[@0x%x]: 
+>>(2.S*7)      indirect        x       \b, contains[@0x%x]: 
+>>(2.S*8)      indirect        x       \b, contains[@0x%x]: 
 
 # Yes, the 3rd and 4th bytes are reserved, but we use them to make the
 # magic stronger.

diff --git a/magic/Magdir/frame b/magic/Magdir/frame
index 21c18384db0a83879b2b681c22bd482ed4b512d4..d3f9687633245f17511a124d8d036a3918d1e8cd 100644 (file)
--- a/magic/Magdir/frame
+++ b/magic/Magdir/frame
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------------
-# $File$
+# $File: frame,v 1.12 2009/09/19 16:28:09 christos Exp $
 # frame:  file(1) magic for FrameMaker files
 #
 # This stuff came on a FrameMaker demo tape, most of which is
@@ -41,10 +41,10 @@
 >10    string          1.0              (1.0
 >13    byte            x                 %c)
 # XXX - this book entry should be verified, if you find one, uncomment this
-#0     string          \<Book\         FrameMaker Book (ASCII) file
+#0     string          \<Book\040      FrameMaker Book (ASCII) file
 #!:mime        application/x-mif
 #>6    string          3.0              (3.0)
 #>6    string          2.0              (2.0)
 #>6    string          1.0              (1.0)
-0      string          \<Maker Intermediate Print File FrameMaker IPL file
+0      string          \<Maker\040Intermediate\040Print\040File        FrameMaker IPL file
 !:mime application/x-mif

diff --git a/magic/Magdir/karma b/magic/Magdir/karma
index a92e9eb41430b5f76e663dce89edd5b376ee646d..896168851eb64b79fcde8a8287df043a474ca60c 100644 (file)
--- a/magic/Magdir/karma
+++ b/magic/Magdir/karma
@@ -1,9 +1,9 @@
 
 #------------------------------------------------------------------------------
-# $File: karma,v 1.6 2009/09/19 16:28:10 christos Exp $
+# $File: karma,v 1.7 2014/04/30 21:41:02 christos Exp $
 # karma:  file(1) magic for Karma data files
 #
 # From <rgooch@atnf.csiro.au>
 
-0      string          KarmaRHD Version        Karma Data Structure Version
+0      string  KarmaRHD\040Version     Karma Data Structure Version
 >16    belong          x               %u

diff --git a/magic/Magdir/sgi b/magic/Magdir/sgi
index 0747f217c9a7d2cdaf13961671b9c3f7aca130ef..bcb9a0a7cb8f98456e4726e4db637985ad677775 100644 (file)
--- a/magic/Magdir/sgi
+++ b/magic/Magdir/sgi
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------------
-# $File: sgi,v 1.20 2014/03/10 00:53:38 christos Exp $
+# $File: sgi,v 1.21 2014/04/30 21:41:02 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
@@ -55,8 +55,8 @@
 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
+0      string  #Inventor\040V  IRIS Inventor 1.0 file
+0      string  #Inventor\040V2 Open Inventor 2.0 file
 # GLF is OpenGL stream encoding
 0      string  glfHeadMagic();         GLF_TEXT
 4      belong  0x7d000000              GLF_BINARY_LSB_FIRST

diff --git a/magic/Magdir/windows b/magic/Magdir/windows
index c03b7184d147170e4486d5ccfe0a970002d28cb7..64c1b28640cef6f5a40aff852838a61802f36cf1 100644 (file)
--- a/magic/Magdir/windows
+++ b/magic/Magdir/windows
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------------
-# $File: windows,v 1.10 2014/09/24 19:52:46 christos Exp $
+# $File: windows,v 1.11 2015/07/27 15:24:00 christos Exp $
 # windows:  file(1) magic for Microsoft Windows
 #
 # This file is mainly reserved for files where programs
@@ -89,7 +89,7 @@
 >20    lelong&16       16      \b, Has Working directory
 >20    lelong&32       32      \b, Has command line arguments
 >20    lelong&64       64      \b, Icon
->>56   lelong                  \b number=%d
+>>56   lelong          x       \b number=%d
 >24    lelong&1        1       \b, Read-Only
 >24    lelong&2        2       \b, Hidden
 >24    lelong&4        4       \b, System