From: Christos Zoulas Date: Fri, 19 Jan 2007 19:53:18 +0000 (+0000) Subject: - Remove unneeded escapes. X-Git-Tag: FILE5_05~663 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e1f85a50117377ce00fafad49231ea4e00712154;p=file - 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 e110fd48..ed75127f 100644 --- 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 de72d129..0c804e72 100644 --- 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 0 string ICE! SNDH Atari ST music diff --git a/magic/Magdir/c-lang b/magic/Magdir/c-lang index 1dcf6368..fd3f9aa2 100644 --- 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 2bdffbeb..288d3cde 100644 --- 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 02826fa0..d8626505 100644 --- 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 -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 155e99ef..f04ccdb5 100644 --- 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 b9d3405d..0eca5d41 100644 --- 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 01027091..2219094f 100644 --- 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 9333bde9..634eff41 100644 --- 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 4f226dd9..09e04168 100644 --- 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 e4920311..99dd63ae 100644 --- a/magic/Magdir/os2 +++ b/magic/Magdir/os2 @@ -6,7 +6,7 @@ # Provided 1998/08/22 by # David Mediavilla 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 a6ffe368..779883ac 100644 --- a/magic/Magdir/tgif +++ b/magic/Magdir/tgif @@ -2,5 +2,5 @@ # file(1) magic for tgif(1) files # From Hendrik Scholz -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 a3e0972b..ab5becef 100644 --- 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 9c06d8d6..546d2616 100644 --- 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 e665ff84..6b909d0b 100644 --- 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