- Remove unneeded escapes.

- Fix escaped spaces that turned into tabs.
- Fix missing escapes
- Use \t instead of \

diff --git a/magic/Magdir/archive b/magic/Magdir/archive
index e110fd4811949bafbb019d1ce73f8124ad48d85d..ed75127f64fb65ef80936821e52e82c2f1b0b24c 100644 (file)
--- a/magic/Magdir/archive
+++ b/magic/Magdir/archive
@@ -478,7 +478,7 @@
 0      string          HPAK            HPACK archive data
 
 # JAM Archive volume format, by Dmitry.Kohmanyuk@UA.net
-0      string          \351,\001JAM\           JAM archive,
+0      string          \351,\001JAM\           JAM archive,
 >7     string          >\0                     version %.4s
 >0x26  byte            =0x27                   -
 >>0x2b string          >\0                     label %.11s,

diff --git a/magic/Magdir/audio b/magic/Magdir/audio
index de72d1291721ac92005819ee399783cd30325003..0c804e72090d2ab860148dbfbb05fa558473e82b 100644 (file)
--- a/magic/Magdir/audio
+++ b/magic/Magdir/audio
@@ -500,13 +500,13 @@
 # Since I saw only eqf files with version v1.1 I think that it's OK
 >23    string  x       \b%.4s
 # .preset
-0      string  \[Equalizer\ preset\]   XMMS equalizer preset
+0      string  [Equalizer\ preset]     XMMS equalizer preset
 # .m3u
-0      string  \#EXTM3U        M3U playlist
+0      string  #EXTM3U                 M3U playlist
 # .pls
-0      string  \[playlist\]    PLS playlist
+0      string  [playlist]              PLS playlist
 # licq.conf
-1      string  \[licq\]        LICQ configuration file
+1      string  [licq]                  LICQ configuration file
 
 # Atari ST audio files by Dirk Jagdmann <doj@cubic.org>
 0      string          ICE!            SNDH Atari ST music

diff --git a/magic/Magdir/c-lang b/magic/Magdir/c-lang
index 1dcf63680faed54d9625b50a2e9b6c8dc72b7982..fd3f9aa2491f06881b4166e88dae2e5488687bda 100644 (file)
--- a/magic/Magdir/c-lang
+++ b/magic/Magdir/c-lang
@@ -20,5 +20,5 @@
 # The inverted index functionality was added some time betwen
 # versions 11 and 15, so look for -q if version is above 14:
 >7     string          >14
->>10   regex           .+\ -q\         with inverted index
->10    regex           .+\ -c\         text (non-compressed)
+>>10   regex           .+\ -q\         with inverted index
+>10    regex           .+\ -c\         text (non-compressed)

diff --git a/magic/Magdir/commands b/magic/Magdir/commands
index 2bdffbebf2bf4f5b50d624b47e812c395bd9f502..288d3cdea0e44052423a6c8b2c063379e991f5d3 100644 (file)
--- a/magic/Magdir/commands
+++ b/magic/Magdir/commands
@@ -53,4 +53,4 @@
 
 0      string          Zend\x00                PHP script Zend Optimizer data
 
-0      string          \$!                     DCL command file
+0      string          $!                      DCL command file

diff --git a/magic/Magdir/editors b/magic/Magdir/editors
index 02826fa071e16640e07fa064fe2ecdd335d07b79..d8626505fee66951ac08b62a1c934b1b7229546a 100644 (file)
--- a/magic/Magdir/editors
+++ b/magic/Magdir/editors
@@ -13,4 +13,4 @@
 0      string  VimCrypt~       Vim encrypted file data
 # Vi IMproved Swap file
 # by Sven Wegener <swegener@gentoo.org>
-0      string  b0VIM\          Vim swap file, version %s
+0      string  b0VIM\          Vim swap file, version %s

diff --git a/magic/Magdir/images b/magic/Magdir/images
index 155e99efbac8b5324f60a1c9f72a260381fa4716..f04ccdb578a8b00e08eb2c7b4967e42c2dfcec64 100644 (file)
--- a/magic/Magdir/images
+++ b/magic/Magdir/images
@@ -267,9 +267,6 @@
 #
 0      beshort         0x1010          PEX Binary Archive
 
-# Tgif files
-0      string  \%TGIF\ x               Tgif file version %s
-
 # DICOM medical imaging data
 128    string  DICM                    DICOM medical imaging data
 

diff --git a/magic/Magdir/mathematica b/magic/Magdir/mathematica
index b9d3405d5eaa3e5e95b935939bfd4bcb4fb1e712..0eca5d415d683402afbd9cd0a5d4d216d1d34d3b 100644 (file)
--- a/magic/Magdir/mathematica
+++ b/magic/Magdir/mathematica
@@ -24,7 +24,7 @@
 
 # generic:
 0      string  (*^\r\r::[\011  Mathematica notebook version 2.x
-0      string  \(\*\^\r\n\r\n\:\:\[\011        Mathematica notebook version 2.x
+0      string  (*^\r\n\r\n::[\011      Mathematica notebook version 2.x
 0      string  (*^\015                 Mathematica notebook version 2.x
 0      string  (*^\n\r\n\r::[\011      Mathematica notebook version 2.x
 0      string  (*^\r::[\011    Mathematica notebook version 2.x

diff --git a/magic/Magdir/mime b/magic/Magdir/mime
index 0102709191a5d71047abedea4e0a0dcc576b15ed..2219094f676c4889ab7ed5abf292c5e5d1a798f4 100644 (file)
--- a/magic/Magdir/mime
+++ b/magic/Magdir/mime
@@ -1,7 +1,7 @@
 #------------------------------------------------------------------------------
 # mime:  file(1) magic for MIME encoded files
 #
-0      string          Content-Type:\
+0      string          Content-Type:\ 
 >14    string          >\0             %s
 0      string          Content-Type:
 >13    string          >\0             %s

diff --git a/magic/Magdir/mips b/magic/Magdir/mips
index 9333bde9fcb422ed7bee552708fa58e18368167a..634eff4106be11ea7d72800fcdb12fa9ec3ea243 100644 (file)
--- a/magic/Magdir/mips
+++ b/magic/Magdir/mips
@@ -165,8 +165,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 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

diff --git a/magic/Magdir/msdos b/magic/Magdir/msdos
index 4f226dd9bc9425e06d137a960f72ec448911307b..09e0416814b36c38ccae019050be957c7099810e 100644 (file)
--- a/magic/Magdir/msdos
+++ b/magic/Magdir/msdos
@@ -14,7 +14,7 @@
 
 # OS/2 batch files are REXX. the second regex is a bit generic, oh well
 # the matched commands seem to be common in REXX and uncommon elsewhere
-100 regex/c =^\\s*call\s+rxfuncadd.*sysloadfu OS/2 REXX batch file text
+100 regex/c =^\\s*call\\s+rxfuncadd.*sysloadfu OS/2 REXX batch file text
 100 regex/c =^\\s*say\ ['"] OS/2 REXX batch file text
 
 0      leshort         0x14c   MS Windows COFF Intel 80386 object file

diff --git a/magic/Magdir/os2 b/magic/Magdir/os2
index e4920311d6bf2ebded6d02b572ed54f3efda0d4b..99dd63aeabe7c46b7276997710790507009f91f4 100644 (file)
--- a/magic/Magdir/os2
+++ b/magic/Magdir/os2
@@ -6,7 +6,7 @@
 # Provided 1998/08/22 by
 # David Mediavilla <davidme.news@REMOVEIFNOTSPAMusa.net>
 1      string  InternetShortcut        MS Windows 95 Internet shortcut text
->24    string  >\                      (URL=<%s>)
+>24    string  >\                      (URL=<%s>)
 
 # OS/2 URL objects
 # Provided 1998/08/22 by

diff --git a/magic/Magdir/tgif b/magic/Magdir/tgif
index a6ffe368161a073caab1c85be1bc6383b41cfab8..779883ac8488a0adc310bb569d8d274fc0411e10 100644 (file)
--- a/magic/Magdir/tgif
+++ b/magic/Magdir/tgif
@@ -2,5 +2,5 @@
 # file(1) magic for tgif(1) files
 # From Hendrik Scholz <hendrik@scholz.net>
 
-0   string  %TGIF\ 4   tgif version 4 object file
+0      string  %TGIF\ x                Tgif file version %s
 

diff --git a/magic/Magdir/varied.script b/magic/Magdir/varied.script
index a3e0972b96bbce2f06b2de1f92ad7fa3840ebd31..ab5becef2d63ba92633125cc6810ae8f38f2db80 100644 (file)
--- a/magic/Magdir/varied.script
+++ b/magic/Magdir/varied.script
@@ -3,7 +3,7 @@
 
 0      string          #!\ /                   a
 >3     string          >\0                     %s script text executable
-0      string          #!\     /               a
+0      string          #!\t/                   a
 >3     string          >\0                     %s script text executable
 0      string          #!/                     a
 >2     string          >\0                     %s script text executable

diff --git a/magic/Magdir/wordprocessors b/magic/Magdir/wordprocessors
index 9c06d8d6cba961d459d3faeb53f303b717bb1326..546d2616d9651bdfdd803e9c276d2ec269e14a98 100644 (file)
--- a/magic/Magdir/wordprocessors
+++ b/magic/Magdir/wordprocessors
@@ -3,7 +3,7 @@
 # wordprocessors:  file(1) magic fo word processors.
 #
 ####### PWP file format used on Smith Corona Personal Word Processors:
-2      string  \040\040\040\040\040\040\040\040\040\040\040ML4D\040\'92        Smith Corona PWP
+2      string  \040\040\040\040\040\040\040\040\040\040\040ML4D\040'92 Smith Corona PWP
 >24    byte    2       \b, single spaced
 >24    byte    3       \b, 1.5 spaced
 >24    byte    4       \b, double spaced

diff --git a/magic/magic.mime b/magic/magic.mime
index e665ff84749b8954eff79003d390e02792e3ab7d..6b909d0b41b697c06e3ed52fadabeb284662375a 100644 (file)
--- a/magic/magic.mime
+++ b/magic/magic.mime
@@ -679,9 +679,9 @@
 #
 # KDE
 0              string  [KDE\ Desktop\ Entry]   application/x-kdelnk
-0              string  \#\ KDE\ Config\ File   application/x-kdelnk
+0              string  #\ KDE\ Config\ File    application/x-kdelnk
 # xmcd database file for kscd
-0              string  \#\ xmcd                text/xmcd
+0              string  #\ xmcd                text/xmcd
 
 #------------------------------------------------------------------------------
 # pkgadd:  file(1) magic for SysV R4 PKG Datastreams