magic text fixes from jan kaluza

diff --git a/magic/Magdir/animation b/magic/Magdir/animation
index 13513cb5cdafe9352ecaa926326460e3fd3d180b..e1b034c1656525ebb7dfc004e4e74629c59b1348 100644 (file)
--- a/magic/Magdir/animation
+++ b/magic/Magdir/animation
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------------
-# $File: animation,v 1.42 2010/08/13 16:13:01 christos Exp $
+# $File: animation,v 1.43 2010/09/20 19:19:16 rrt Exp $
 # animation:  file(1) magic for animation/movie formats
 #
 # animation formats
@@ -741,7 +741,7 @@
 
 # X3D (Extensible 3D) [http://www.web3d.org/specifications/x3d-3.0.dtd]
 # From Michel Briand <michelbriand@free.fr>
-0      string          \<?xml\ version="
+0      string/t                \<?xml\ version="
 !:strength +1
 >20    search/1000/cw  \<!DOCTYPE\ X3D         X3D (Extensible 3D) model xml text
 !:mime model/x3d

diff --git a/magic/Magdir/apple b/magic/Magdir/apple
index ef45b8998012622ee9c88b103c8b59450ab91da8..bee859e5403533f500f1f74cef27126eb26e8ccc 100644 (file)
--- a/magic/Magdir/apple
+++ b/magic/Magdir/apple
@@ -1,9 +1,9 @@
 
 #------------------------------------------------------------------------------
-# $File$
+# $File: apple,v 1.23 2009/09/19 16:28:08 christos Exp $
 # apple:  file(1) magic for Apple file formats
 #
-0      search/1        FiLeStArTfIlEsTaRt      binscii (apple ][) text
+0      search/1/t      FiLeStArTfIlEsTaRt      binscii (apple ][) text
 0      string          \x0aGL                  Binary II (apple ][) data
 0      string          \x76\xff                Squeezed (apple ][) data
 0      string          NuFile                  NuFile archive (apple ][) data

diff --git a/magic/Magdir/commands b/magic/Magdir/commands
index 0ffafa688b0971fa00d8e5946b18cdaa470af612..0284d2c9130ffac0bd4d8fe038ce82acfcce83d8 100644 (file)
--- a/magic/Magdir/commands
+++ b/magic/Magdir/commands
@@ -1,74 +1,74 @@
 
 #------------------------------------------------------------------------------
-# $File: commands,v 1.37 2010/09/20 18:55:20 rrt Exp $
+# $File: commands,v 1.38 2010/09/20 19:19:16 rrt Exp $
 # commands:  file(1) magic for various shells and interpreters
 #
-#0     string          :                       shell archive or script for antique kernel text
-0      string/w        #!\ /bin/sh             POSIX shell script text executable
+#0     string/w        :                       shell archive or script for antique kernel text
+0      string/wt       #!\ /bin/sh             POSIX shell script text executable
 !:mime text/x-shellscript
-0      string/w        #!\ /bin/csh            C shell script text executable
+0      string/wt       #!\ /bin/csh            C shell script text executable
 !:mime text/x-shellscript
 # korn shell magic, sent by George Wu, gwu@clyde.att.com
-0      string/w        #!\ /bin/ksh            Korn shell script text executable
+0      string/wt       #!\ /bin/ksh            Korn shell script text executable
 !:mime text/x-shellscript
-0      string/w        #!\ /bin/tcsh           Tenex C shell script text executable
+0      string/wt       #!\ /bin/tcsh           Tenex C shell script text executable
 !:mime text/x-shellscript
-0      string/w        #!\ /usr/bin/tcsh       Tenex C shell script text executable
+0      string/wt       #!\ /usr/bin/tcsh       Tenex C shell script text executable
 !:mime text/x-shellscript
-0      string/w        #!\ /usr/local/tcsh     Tenex C shell script text executable
+0      string/wt       #!\ /usr/local/tcsh     Tenex C shell script text executable
 !:mime text/x-shellscript
-0      string/w        #!\ /usr/local/bin/tcsh Tenex C shell script text executable
+0      string/wt       #!\ /usr/local/bin/tcsh Tenex C shell script text executable
 !:mime text/x-shellscript
 
 #
 # zsh/ash/ae/nawk/gawk magic from cameron@cs.unsw.oz.au (Cameron Simpson)
-0      string/w        #!\ /bin/zsh            Paul Falstad's zsh script text executable
+0      string/wt       #!\ /bin/zsh            Paul Falstad's zsh script text executable
 !:mime text/x-shellscript
-0      string/w        #!\ /usr/bin/zsh        Paul Falstad's zsh script text executable
+0      string/wt       #!\ /usr/bin/zsh        Paul Falstad's zsh script text executable
 !:mime text/x-shellscript
-0      string/w        #!\ /usr/local/bin/zsh  Paul Falstad's zsh script text executable
+0      string/wt       #!\ /usr/local/bin/zsh  Paul Falstad's zsh script text executable
 !:mime text/x-shellscript
-0      string/w        #!\ /usr/local/bin/ash  Neil Brown's ash script text executable
+0      string/wt       #!\ /usr/local/bin/ash  Neil Brown's ash script text executable
 !:mime text/x-shellscript
-0      string/w        #!\ /usr/local/bin/ae   Neil Brown's ae script text executable
+0      string/wt       #!\ /usr/local/bin/ae   Neil Brown's ae script text executable
 !:mime text/x-shellscript
-0      string/w        #!\ /bin/nawk           new awk script text executable
+0      string/wt       #!\ /bin/nawk           new awk script text executable
 !:mime text/x-nawk
-0      string/w        #!\ /usr/bin/nawk       new awk script text executable
+0      string/wt       #!\ /usr/bin/nawk       new awk script text executable
 !:mime text/x-nawk
-0      string/w        #!\ /usr/local/bin/nawk new awk script text executable
+0      string/wt       #!\ /usr/local/bin/nawk new awk script text executable
 !:mime text/x-nawk
-0      string/w        #!\ /bin/gawk           GNU awk script text executable
+0      string/wt       #!\ /bin/gawk           GNU awk script text executable
 !:mime text/x-gawk
-0      string/w        #!\ /usr/bin/gawk       GNU awk script text executable
+0      string/wt       #!\ /usr/bin/gawk       GNU awk script text executable
 !:mime text/x-gawk
-0      string/w        #!\ /usr/local/bin/gawk GNU awk script text executable
+0      string/wt       #!\ /usr/local/bin/gawk GNU awk script text executable
 !:mime text/x-gawk
 #
-0      string/w        #!\ /bin/awk            awk script text executable
+0      string/wt       #!\ /bin/awk            awk script text executable
 !:mime text/x-awk
-0      string/w        #!\ /usr/bin/awk        awk script text executable
+0      string/wt       #!\ /usr/bin/awk        awk script text executable
 !:mime text/x-awk
 0      regex           =^\\s*BEGIN\\s*[{]      awk script text
 
 # AT&T Bell Labs' Plan 9 shell
-0      string/w        #!\ /bin/rc     Plan 9 rc shell script text executable
+0      string/wt       #!\ /bin/rc     Plan 9 rc shell script text executable
 
 # bash shell magic, from Peter Tobias (tobias@server.et-inf.fho-emden.de)
-0      string/w        #!\ /bin/bash   Bourne-Again shell script text executable
+0      string/wt       #!\ /bin/bash   Bourne-Again shell script text executable
 !:mime text/x-shellscript
-0      string/w        #!\ /usr/bin/bash       Bourne-Again shell script text executable
+0      string/wt       #!\ /usr/bin/bash       Bourne-Again shell script text executable
 !:mime text/x-shellscript
-0      string/w        #!\ /usr/local/bash     Bourne-Again shell script text executable
+0      string/wt       #!\ /usr/local/bash     Bourne-Again shell script text executable
 !:mime text/x-shellscript
-0      string/w        #!\ /usr/local/bin/bash Bourne-Again shell script text executable
+0      string/wt       #!\ /usr/local/bin/bash Bourne-Again shell script text executable
 !:mime text/x-shellscript
 
 # using env
-0      string          #!/usr/bin/env          a
->15    string          >\0                     %s script text executable
-0      string          #!\ /usr/bin/env        a
->16    string          >\0                     %s script text executable
+0      string/t        #!/usr/bin/env          a
+>15    string/t        >\0                     %s script text executable
+0      string/t        #!\ /usr/bin/env        a
+>16    string/t        >\0                     %s script text executable
 
 # PHP scripts
 # Ulf Harnhammar <ulfh@update.uu.se>
@@ -85,7 +85,7 @@
 
 0      string          Zend\x00                PHP script Zend Optimizer data
 
-0      string          $!                      DCL command file
+0      string/t                $!                      DCL command file
 
 # Type: Pdmenu
 # URL:  http://packages.debian.org/pdmenu

diff --git a/magic/Magdir/diff b/magic/Magdir/diff
index 397add4acf072ba73e92c480868fb7847ea821c9..3eeced086e1e794fbb50ec8d073134775419abba 100644 (file)
--- a/magic/Magdir/diff
+++ b/magic/Magdir/diff
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------------
-# $File$
+# $File: diff,v 1.10 2009/09/19 16:28:08 christos Exp $
 # diff:  file(1) magic for diff(1) output
 #
 0      search/1        diff\           diff output text
@@ -16,4 +16,4 @@
 !:mime text/x-diff
 
 # bsdiff:  file(1) magic for bsdiff(1) output
-0      string          BSDIFF40        bsdiff(1) patch file
+0      string/t                BSDIFF40        bsdiff(1) patch file

diff --git a/magic/Magdir/games b/magic/Magdir/games
index 13592e1ade098f7369d623e60fd3d3bfd3577c6c..b67397d82bea2e08ac2fcf900a287f7f62a3cbba 100644 (file)
--- a/magic/Magdir/games
+++ b/magic/Magdir/games
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------------
-# $File: games,v 1.10 2010/08/13 16:13:01 christos Exp $
+# $File: games,v 1.11 2010/09/20 19:19:17 rrt Exp $
 # games:  file(1) for games
 
 # Fabio Bonelli <fabiobonelli@libero.it>
@@ -180,7 +180,7 @@
 # Modified by (1): Abel Cheung (regex, more game format)
 # FIXME: Some games don't have GM (game type)
 0      regex           \\(;.*GM\\[[0-9]{1,2}\\]        Smart Game Format
->2     search/0x200    GM[
+>2     search/0x200/b  GM[
 >>&0   string          1]      (Go)
 >>&0   string          2]      (Othello)
 >>&0   string          3]      (chess)

diff --git a/magic/Magdir/images b/magic/Magdir/images
index a2e2af2163e8b63afd0eb55507a9dfdce81b8268..66443e30b0d75407100b85f825cae30124e8dd5a 100644 (file)
--- a/magic/Magdir/images
+++ b/magic/Magdir/images
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------------
-# $File: images,v 1.68 2010/09/20 19:19:17 rrt Exp $
+# $File: images,v 1.69 2010/10/20 20:22:58 christos Exp $
 # images:  file(1) magic for image formats (see also "iff", and "c-lang" for
 # XPM bitmaps)
 #
@@ -34,7 +34,7 @@
 # The next byte following the magic is always whitespace.
 0      search/1        P1              Netpbm PBM image text
 !:mime image/x-portable-bitmap
-0      search/1        P2              Netpbm PGM image text
+0      search/1b       P2              Netpbm PGM image text
 !:mime image/x-portable-greymap
 0      search/1        P3              Netpbm PPM image text
 !:mime image/x-portable-pixmap

diff --git a/magic/Magdir/kde b/magic/Magdir/kde
index 5fdea5fc64d912c915ff3897ba13e9b502242905..06e5d9be22285286210333a19386c50e909e05db 100644 (file)
--- a/magic/Magdir/kde
+++ b/magic/Magdir/kde
@@ -1,11 +1,11 @@
 
 #------------------------------------------------------------------------------
-# $File$
+# $File: kde,v 1.4 2009/09/19 16:28:10 christos Exp $
 # kde:  file(1) magic for KDE
 
-0              string  [KDE\ Desktop\ Entry]   KDE desktop entry
+0              string/t        [KDE\ Desktop\ Entry]   KDE desktop entry
 !:mime application/x-kdelnk
-0              string  #\ KDE\ Config\ File    KDE config file
+0              string/t        #\ KDE\ Config\ File    KDE config file
 !:mime application/x-kdelnk
-0              string  #\ xmcd xmcd database file for kscd
+0              string/t        #\ xmcd xmcd database file for kscd
 !:mime text/x-xmcd

diff --git a/magic/Magdir/kml b/magic/Magdir/kml
index 6a296cb09e02b218abc27ace4b49a51098001282..cef6e86d82b593f8dde999bf642456007ab4b376 100644 (file)
--- a/magic/Magdir/kml
+++ b/magic/Magdir/kml
@@ -1,12 +1,12 @@
 
 #------------------------------------------------------------------------------
-# $File$
+# $File: kml,v 1.2 2009/09/19 16:28:10 christos Exp $
 # Type: Google KML, formerly Keyhole Markup Language
 # Future development of this format has been handed
 # over to the Open Geospatial Consortium.
 # http://www.opengeospatial.org/standards/kml/
 # From: Asbjoern Sloth Toennesen <asbjorn@lila.io>
-0 string    \<?xml
+0 string/t    \<?xml
 >20  search/400 \ xmlns= 
 >>&0 regex ['"]http://earth.google.com/kml Google KML document
 !:mime application/vnd.google-earth.kml+xml
@@ -22,7 +22,7 @@
 # From: Asbjoern Sloth Toennesen <asbjorn@lila.io>
 >>&0 regex ['"]http://www.opengis.net/kml OpenGIS KML document
 !:mime application/vnd.google-earth.kml+xml
->>>&1 string 2.2 \b, version 2.2
+>>>&1 string/t 2.2 \b, version 2.2
 
 #------------------------------------------------------------------------------
 # Type: Google KML Archive (ZIP based) 

diff --git a/magic/Magdir/magic b/magic/Magdir/magic
index 91d19b424e81b13a7da58984e68280f9f621563e..2d39ed3a8be8fa3a252deb1b1dc2460e5304e443 100644 (file)
--- a/magic/Magdir/magic
+++ b/magic/Magdir/magic
@@ -1,9 +1,9 @@
 
 #------------------------------------------------------------------------------
-# $File$
+# $File: magic,v 1.9 2009/09/19 16:28:10 christos Exp $
 # magic:  file(1) magic for magic files
 #
-0      string          #\ Magic        magic text file for file(1) cmd
+0      string/t                #\ Magic        magic text file for file(1) cmd
 0      lelong          0xF11E041C      magic binary file for file(1) cmd
 >4     lelong          x               (version %d) (little endian)
 0      belong          0xF11E041C      magic binary file for file(1) cmd

diff --git a/magic/Magdir/mail.news b/magic/Magdir/mail.news
index 07ee23ce492e8cec7f2686c7e22fef56377d081c..77d37f56892513a5c740c1297d619ada7996988a 100644 (file)
--- a/magic/Magdir/mail.news
+++ b/magic/Magdir/mail.news
@@ -1,36 +1,36 @@
 
 #------------------------------------------------------------------------------
-# $File$
+# $File: mail.news,v 1.17 2009/09/19 16:28:10 christos Exp $
 # mail.news:  file(1) magic for mail and news
 #
 # Unfortunately, saved netnews also has From line added in some news software.
 #0     string          From            mail text
 # There are tests to ascmagic.c to cope with mail and news.
-0      string          Relay-Version:  old news text
+0      string/t                Relay-Version:  old news text
 !:mime message/rfc822
-0      string          #!\ rnews       batched news text
+0      string/t                #!\ rnews       batched news text
 !:mime message/rfc822
-0      string          N#!\ rnews      mailed, batched news text
+0      string/t                N#!\ rnews      mailed, batched news text
 !:mime message/rfc822
-0      string          Forward\ to     mail forwarding text
+0      string/t                Forward\ to     mail forwarding text
 !:mime message/rfc822
-0      string          Pipe\ to        mail piping text
+0      string/t                Pipe\ to        mail piping text
 !:mime message/rfc822
-0      string          Return-Path:    smtp mail text
+0      string/t                Return-Path:    smtp mail text
 !:mime message/rfc822
-0      string          Path:           news text
+0      string/t                Path:           news text
 !:mime message/news
-0      string          Xref:           news text
+0      string/t                Xref:           news text
 !:mime message/news
-0      string          From:           news or mail text
+0      string/t                From:           news or mail text
 !:mime message/rfc822
-0      string          Article         saved news text
+0      string/t                Article         saved news text
 !:mime message/news
-0      string          BABYL           Emacs RMAIL text
-0      string          Received:       RFC 822 mail text
+0      string/t                BABYL           Emacs RMAIL text
+0      string/t                Received:       RFC 822 mail text
 !:mime message/rfc822
-0      string          MIME-Version:   MIME entity text
-#0     string          Content-        MIME entity text
+0      string/t                MIME-Version:   MIME entity text
+#0     string/t                Content-        MIME entity text
 
 # TNEF files...
 0      lelong          0x223E9F78      Transport Neutral Encapsulation Format

diff --git a/magic/Magdir/mime b/magic/Magdir/mime
index 91353a84ed39a88e00204de6bc1b47a7c4f9443f..5e57366f8c5057b99324b4511a11a03f878cf57a 100644 (file)
--- a/magic/Magdir/mime
+++ b/magic/Magdir/mime
@@ -1,9 +1,9 @@
 
 #------------------------------------------------------------------------------
-# $File$
+# $File: mime,v 1.5 2009/09/19 16:28:10 christos Exp $
 # mime:  file(1) magic for MIME encoded files
 #
-0      string          Content-Type:\ 
+0      string/t                Content-Type:\ 
 >14    string          >\0             %s
-0      string          Content-Type:
+0      string/t                Content-Type:
 >13    string          >\0             %s

diff --git a/magic/Magdir/msdos b/magic/Magdir/msdos
index cf52afaed36d2ec99a0997928f17a5029c6759e9..7b5b55944cf335631db4e807f778aee48fecc263 100644 (file)
--- a/magic/Magdir/msdos
+++ b/magic/Magdir/msdos
@@ -1,12 +1,12 @@
 
 #------------------------------------------------------------------------------
-# $File: msdos,v 1.68 2010/03/18 19:51:08 christos Exp $
+# $File: msdos,v 1.69 2010/09/20 18:55:20 rrt Exp $
 # msdos:  file(1) magic for MS-DOS files
 #
 
 # .BAT files (Daniel Quinlan, quinlan@yggdrasil.com)
 # updated by Joerg Jenderek at Oct 2008
-0      string  @                       
+0      string/t        @                       
 >1     string/cW       \ echo\ off     DOS batch file text
 !:mime text/x-msdos-batch
 >1     string/cW       echo\ off       DOS batch file text

diff --git a/magic/Magdir/printer b/magic/Magdir/printer
index 8fd6e68d4e249da0ac3f6fa47db788c745bd5fd0..e73802439bd9a5d5a17cbd9a431ac36432320f4b 100644 (file)
--- a/magic/Magdir/printer
+++ b/magic/Magdir/printer
@@ -1,11 +1,11 @@
 
 #------------------------------------------------------------------------------
-# $File$
+# $File: printer,v 1.22 2009/09/19 16:28:11 christos Exp $
 # printer:  file(1) magic for printer-formatted files
 #
 
 # PostScript, updated by Daniel Quinlan (quinlan@yggdrasil.com)
-0      string          %!              PostScript document text
+0      string/t                %!              PostScript document text
 !:mime application/postscript
 !:apple        ASPSTEXT
 >2     string          PS-Adobe-       conforming

diff --git a/magic/Magdir/python b/magic/Magdir/python
index 7abe0341c8e356f22b6749e9100afa6c6c725f34..065f875ad381f66caa2427d9850bdd8565b60445 100644 (file)
--- a/magic/Magdir/python
+++ b/magic/Magdir/python
@@ -1,11 +1,11 @@
 
 #------------------------------------------------------------------------------
-# $File: python,v 1.12 2009/10/27 14:49:57 christos Exp $
+# $File: python,v 1.13 2010/08/12 16:16:44 christos Exp $
 # python:  file(1) magic for python
 #
 # From: David Necas <yeti@physics.muni.cz>
 # often the module starts with a multiline string
-0      string          """     a python script text executable
+0      string/t        """     a python script text executable
 # MAGIC as specified in Python/import.c (1.5 to 2.7a0 and 3.1a0, assuming
 # that Py_UnicodeFlag is off for Python 2)
 # 20121  ( YEAR - 1995 ) + MONTH  + DAY (little endian followed by "\r\n"

diff --git a/magic/Magdir/revision b/magic/Magdir/revision
index f41aa9b9d6ebf9904ec9372c1ab1b5d3d534548f..4804f25fa19426db98ca6ea3e9be52fca819935a 100644 (file)
--- a/magic/Magdir/revision
+++ b/magic/Magdir/revision
@@ -1,9 +1,9 @@
 
 #------------------------------------------------------------------------------
-# $File: revision,v 1.6 2009/09/19 16:28:12 christos Exp $
+# $File: revision,v 1.7 2010/09/20 19:19:17 rrt Exp $
 # file(1) magic for revision control files
 # From Hendrik Scholz <hendrik@scholz.net>
-0      string  /1\ :pserver:   cvs password text file
+0      string/t        /1\ :pserver:   cvs password text file
 
 # Conary changesets
 # From: Jonathan Smith <smithj@rpath.com>

diff --git a/magic/Magdir/sgi b/magic/Magdir/sgi
index d3080ea93f5738a848d9ecdccab41dfb88e47c0f..8c52b26087b0862b81d5a68df8094ea511217f5c 100644 (file)
--- a/magic/Magdir/sgi
+++ b/magic/Magdir/sgi
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------------
-# $File$
+# $File: sgi,v 1.17 2009/09/19 16:28:12 christos Exp $
 # sgi:  file(1) magic for Silicon Graphics applications
 
 #
@@ -61,7 +61,7 @@
 >11    byte    x                               dataformat %d
 
 # Alias Maya files
-0      string  //Maya ASCII    Alias Maya Ascii File,
+0      string/t        //Maya ASCII    Alias Maya Ascii File,
 >13    string  >\0     version %s
 8      string  MAYAFOR4        Alias Maya Binary File,
 >32    string  >\0     version %s scene

diff --git a/magic/Magdir/sgml b/magic/Magdir/sgml
index 6c3a3a342819787af92a0cac697fb49d6072f075..2a8de4c66480106205c46083b4e09bb0e0b963c8 100644 (file)
--- a/magic/Magdir/sgml
+++ b/magic/Magdir/sgml
@@ -1,8 +1,8 @@
 #------------------------------------------------------------------------------
-# $File: sgml,v 1.23 2009/09/19 16:28:12 christos Exp $
+# $File: sgml,v 1.24 2009/09/19 17:31:35 christos Exp $
 # Type:        SVG Vectorial Graphics
 # From:        Noel Torres <tecnico@ejerciciosresueltos.com>
-0      string          \<?xml\ version="
+0      string/t                \<?xml\ version="
 >15    string          >\0
 >>19   search/4096     \<svg                   SVG Scalable Vector Graphics image
 !:mime image/svg+xml
@@ -10,21 +10,21 @@
 !:mime application/x-gnucash
 
 # Sitemap file
-0      string          \<?xml\ version="
+0      string/t                \<?xml\ version="
 >15    string          >\0
 >>19   search/4096     \<urlset                XML Sitemap document text
 !:mime application/xml-sitemap
 
 # xhtml
-0      string          \<?xml\ version="
+0      string/t                \<?xml\ version="
 >15    string          >\0
 >>19   search/4096/cWbt        \<!doctype\ html        xHTML document text
 !:mime text/html
-0      string          \<?xml\ version='
+0      string/t                \<?xml\ version='
 >15    string          >\0
 >>19   search/4096/cWbt        \<!doctype\ html        xHTML document text
 !:mime text/html
-0      string          \<?xml\ version="
+0      string/t                \<?xml\ version="
 >15    string          >\0
 >>19   search/4096/cWbt        \<html  broken xHTML document text
 !:mime text/html
@@ -34,30 +34,30 @@
 # HyperText Markup Language (HTML) is an SGML document type,
 # from Daniel Quinlan (quinlan@yggdrasil.com)
 # adapted to string extenstions by Anthon van der Neut <anthon@mnt.org)
-0      search/4096/cWbt        \<!doctype\ html        HTML document text
+0      search/4096/cWt \<!doctype\ html        HTML document text
 !:mime text/html
-0      search/4096/cwbt        \<head                  HTML document text
+0      search/4096/cwt \<head                  HTML document text
 !:mime text/html
-0      search/4096/cwbt        \<title                 HTML document text
+0      search/4096/cwt \<title                 HTML document text
 !:mime text/html
-0      search/4096/cwbt        \<html                  HTML document text
+0      search/4096/cwt \<html                  HTML document text
 !:mime text/html
-0      search/4096/cwbt        \<script                HTML document text
+0      search/4096/cwt \<script                HTML document text
 !:mime text/html
-0      search/4096/cwbt        \<style                 HTML document text
+0      search/4096/cwt \<style                 HTML document text
 !:mime text/html
-0      search/4096/cwbt        \<table                 HTML document text
+0      search/4096/cwt \<table                 HTML document text
 !:mime text/html
-0      search/4096/cwbt        \<a\ href=              HTML document text
+0      search/4096/cwt \<a\ href=              HTML document text
 !:mime text/html
 
 # Extensible markup language (XML), a subset of SGML
 # from Marc Prud'hommeaux (marc@apocalypse.org)
-0      search/1/cwbt   \<?xml                  XML document text
+0      search/1/cwt    \<?xml                  XML document text
 !:mime application/xml
-0      string          \<?xml\ version\ "      XML
+0      string/t                \<?xml\ version\ "      XML
 !:mime application/xml
-0      string          \<?xml\ version="       XML
+0      string/t                \<?xml\ version="       XML
 !:mime application/xml
 >15    search/1        >\0                     %.3s document text
 >>23   search/1        \<xsl:stylesheet        (XSL stylesheet)
@@ -70,15 +70,15 @@
 0      search/1/wbt    \<?xml                  XML document text
 !:mime application/xml
 !:strength - 10
-0      search/1/wbt    \<?XML                  broken XML document text
+0      search/1/wt     \<?XML                  broken XML document text
 !:mime application/xml
 !:strength - 10
 
 
 # SGML, mostly from rph@sq
-0      search/4096/cwbt        \<!doctype              exported SGML document text
-0      search/4096/cwbt        \<!subdoc               exported SGML subdocument text
-0      search/4096/cwbt        \<!--                   exported SGML document text
+0      search/4096/cwt \<!doctype              exported SGML document text
+0      search/4096/cwt \<!subdoc               exported SGML subdocument text
+0      search/4096/cwt \<!--                   exported SGML document text
 !:strength - 10
 
 # Web browser cookie files

diff --git a/magic/Magdir/varied.script b/magic/Magdir/varied.script
index 6dc8bfa2a0c5624b9c9b2aec5bba459f4e4409cd..a8eb334929ad7947d5f396b6c0c4d2ae9d86c66c 100644 (file)
--- a/magic/Magdir/varied.script
+++ b/magic/Magdir/varied.script
@@ -1,15 +1,15 @@
 
 #------------------------------------------------------------------------------
-# $File$
+# $File: varied.script,v 1.6 2009/09/19 16:28:13 christos Exp $
 # varied.script:  file(1) magic for various interpreter scripts
 
-0      string          #!\ /                   a
+0      string/t                #!\ /                   a
 >3     string          >\0                     %s script text executable
-0      string          #!\t/                   a
+0      string/t                #!\t/                   a
 >3     string          >\0                     %s script text executable
-0      string          #!/                     a
+0      string/t                #!/                     a
 >2     string          >\0                     %s script text executable
-0      string          #!\                     script text executable
+0      string/t                #!\                     script text executable
 >3     string          >\0                     for %s
 
 # From: arno <arenevier@fdn.fr>