Add some more MIME types, mainly for scripting languages. Change some

that were "application/x-foo" to "text/x-foo".

Move the gnu gettext catalog patterns to "gnu" from "lisp".

diff --git a/magic/Magdir/commands b/magic/Magdir/commands
index cdfc66d8a54326fbb0c561ec2b4259ca19e78675..0942802d9101819443173b3be9919161877afdbf 100644 (file)
--- a/magic/Magdir/commands
+++ b/magic/Magdir/commands
@@ -4,48 +4,48 @@
 #
 #0     string          :                       shell archive or script for antique kernel text
 0      string/b        #!\ /bin/sh             POSIX shell script text executable
-!:mime application/x-shellscript
+!:mime text/x-shellscript
 0      string/b        #!\ /bin/csh            C shell script text executable
-!:mime application/x-shellscript
+!:mime text/x-shellscript
 # korn shell magic, sent by George Wu, gwu@clyde.att.com
 0      string/b        #!\ /bin/ksh            Korn shell script text executable
-!:mime application/x-shellscript
+!:mime text/x-shellscript
 0      string/b        #!\ /bin/tcsh           Tenex C shell script text executable
-!:mime application/x-shellscript
+!:mime text/x-shellscript
 0      string/b        #!\ /usr/local/tcsh     Tenex C shell script text executable
-!:mime application/x-shellscript
+!:mime text/x-shellscript
 0      string/b        #!\ /usr/local/bin/tcsh Tenex C shell script text executable
-!:mime application/x-shellscript
+!:mime text/x-shellscript
 
 #
 # zsh/ash/ae/nawk/gawk magic from cameron@cs.unsw.oz.au (Cameron Simpson)
 0      string/b        #!\ /bin/zsh            Paul Falstad's zsh script text executable
-!:mime application/x-shellscript
+!:mime text/x-shellscript
 0      string/b        #!\ /usr/bin/zsh        Paul Falstad's zsh script text executable
-!:mime application/x-shellscript
+!:mime text/x-shellscript
 0      string/b        #!\ /usr/local/bin/zsh  Paul Falstad's zsh script text executable
-!:mime application/x-shellscript
+!:mime text/x-shellscript
 0      string/b        #!\ /usr/local/bin/ash  Neil Brown's ash script text executable
-!:mime application/x-shellscript
+!:mime text/x-shellscript
 0      string/b        #!\ /usr/local/bin/ae   Neil Brown's ae script text executable
-!:mime application/x-shellscript
+!:mime text/x-shellscript
 0      string/b        #!\ /bin/nawk           new awk script text executable
-!:mime application/x-nawk
+!:mime text/x-nawk
 0      string/b        #!\ /usr/bin/nawk       new awk script text executable
-!:mime application/x-nawk
+!:mime text/x-nawk
 0      string/b        #!\ /usr/local/bin/nawk new awk script text executable
-!:mime application/x-nawk
+!:mime text/x-nawk
 0      string/b        #!\ /bin/gawk           GNU awk script text executable
-!:mime application/x-gawk
+!:mime text/x-gawk
 0      string/b        #!\ /usr/bin/gawk       GNU awk script text executable
-!:mime application/x-gawk
+!:mime text/x-gawk
 0      string/b        #!\ /usr/local/bin/gawk GNU awk script text executable
-!:mime application/x-gawk
+!:mime text/x-gawk
 #
 0      string/b        #!\ /bin/awk            awk script text executable
-!:mime application/x-awk
+!:mime text/x-awk
 0      string/b        #!\ /usr/bin/awk        awk script text executable
-!:mime application/x-awk
+!:mime text/x-awk
 # update to distinguish from *.vcf files
 # this is broken because postscript has /EBEGIN{ for example.
 #0     search/Bb       BEGIN {                 awk script text
@@ -55,9 +55,9 @@
 
 # bash shell magic, from Peter Tobias (tobias@server.et-inf.fho-emden.de)
 0      string/b        #!\ /bin/bash   Bourne-Again shell script text executable
-!:mime application/x-shellscript
+!:mime text/x-shellscript
 0      string/b        #!\ /usr/local/bin/bash Bourne-Again shell script text executable
-!:mime application/x-shellscript
+!:mime text/x-shellscript
 
 # using env
 0      string          #!/usr/bin/env          a
@@ -68,10 +68,15 @@
 # PHP scripts
 # Ulf Harnhammar <ulfh@update.uu.se>
 0      search/1/c      =<?php                  PHP script text
+!:mime text/x-php
 0      search/1        =<?\n                   PHP script text
+!:mime text/x-php
 0      search/1        =<?\r                   PHP script text
+!:mime text/x-php
 0      search/1/b      #!\ /usr/local/bin/php  PHP script text executable
+!:mime text/x-php
 0      search/1/b      #!\ /usr/bin/php        PHP script text executable
+!:mime text/x-php
 
 0      string          Zend\x00                PHP script Zend Optimizer data
 

diff --git a/magic/Magdir/diff b/magic/Magdir/diff
index c93a172281558e4b55ce9cd4b0a7de5e784cecd7..291bae67f55e43640ca1ec8b6df7be6a8c589317 100644 (file)
--- a/magic/Magdir/diff
+++ b/magic/Magdir/diff
@@ -2,8 +2,13 @@
 # diff:  file(1) magic for diff(1) output
 #
 0      search/1        diff\           diff output text
+!:mime text/x-diff
 0      search/1        ***\            diff output text
+!:mime text/x-diff
 0      search/1        Only\ in\       diff output text
+!:mime text/x-diff
 0      search/1        Common\ subdirectories:\        diff output text
+!:mime text/x-diff
 
 0      search/1        Index:          RCS/CVS diff output text
+!:mime text/x-diff

diff --git a/magic/Magdir/gnu b/magic/Magdir/gnu
index a237f530cf98cfae5ca206b6447954e2cbfca39d..66c670c55fa7f94862b81fd7d85809b982f0d48d 100644 (file)
--- a/magic/Magdir/gnu
+++ b/magic/Magdir/gnu
@@ -36,3 +36,7 @@
 0      string  \0LOCATE        GNU findutils locate database data
 >7     string  >\0             \b, format %s
 >7     string  02              \b (frcode)
+
+# Files produced by GNU gettext
+0      long    0xDE120495              GNU-format message catalog data
+0      long    0x950412DE              GNU-format message catalog data

diff --git a/magic/Magdir/lisp b/magic/Magdir/lisp
index 2144992682c02d176279ea899025d3db4ecd61fc..5144e26e1927b09fe15bc3dd0d2129b53894879a 100644 (file)
--- a/magic/Magdir/lisp
+++ b/magic/Magdir/lisp
@@ -12,12 +12,19 @@
 #>2    search/2048     \r              Windows INF file
 
 0      search/256      (if\                    Lisp/Scheme program text
+!:mime text/x-lisp
 0      search/256      (setq\                  Lisp/Scheme program text
+!:mime text/x-lisp
 0      search/256      (defvar\                Lisp/Scheme program text
+!:mime text/x-lisp
 0      search/256      (defparam\              Lisp/Scheme program text
+!:mime text/x-lisp
 0      search/256      (defun\                 Lisp/Scheme program text
+!:mime text/x-lisp
 0      search/256      (autoload\              Lisp/Scheme program text
+!:mime text/x-lisp
 0      search/256      (custom-set-variables\  Lisp/Scheme program text
+!:mime text/x-lisp
 
 # Emacs 18 - this is always correct, but not very magical.
 0      string  \012(                   Emacs v18 byte-compiled Lisp data
@@ -35,10 +42,6 @@
 0      long    0x70768BD2              CLISP memory image data
 0      long    0xD28B7670              CLISP memory image data, other endian
 
-# Files produced by GNU gettext
-0      long    0xDE120495              GNU-format message catalog data
-0      long    0x950412DE              GNU-format message catalog data
-
 #.com and .bin for MIT scheme 
 0      string  \372\372\372\372        MIT scheme (library?)
 

diff --git a/magic/Magdir/msdos b/magic/Magdir/msdos
index bb81498d8c98c976317d6a699b587649ed398b8c..f449643decd392409b15439c42fd09a3f8eee901 100644 (file)
--- a/magic/Magdir/msdos
+++ b/magic/Magdir/msdos
@@ -7,9 +7,13 @@
 # updated by Joerg Jenderek
 0      string  @                       
 >1     string/cB       \ echo\ off     MS-DOS batch file text
+!:mime text/x-msdos-batch
 >1     string/cB       echo\ off       MS-DOS batch file text
+!:mime text/x-msdos-batch
 >1     string/cB       rem\            MS-DOS batch file text
+!:mime text/x-msdos-batch
 >1     string/cB       set\            MS-DOS batch file text
+!:mime text/x-msdos-batch
 
 
 # OS/2 batch files are REXX. the second regex is a bit generic, oh well

diff --git a/magic/Magdir/perl b/magic/Magdir/perl
index 045edcbbc72a93cd8b08875e30b982a93651c6b5..73fb88ba4b2860081577e2a447f24fe58665134c 100644 (file)
--- a/magic/Magdir/perl
+++ b/magic/Magdir/perl
@@ -5,19 +5,19 @@
 # Keith Waclena <keith@cerberus.uchicago.edu>
 # Send additions to <perl5-porters@perl.org>
 0      search/1/b      #!\ /bin/perl                   Perl script text executable
-!:mime application/x-perl
+!:mime text/x-perl
 0      search/1        eval\ "exec\ /bin/perl          Perl script text
-!:mime application/x-perl
+!:mime text/x-perl
 0      search/1/b      #!\ /usr/bin/perl               Perl script text executable
-!:mime application/x-perl
+!:mime text/x-perl
 0      search/1        eval\ "exec\ /usr/bin/perl      Perl script text
-!:mime application/x-perl
+!:mime text/x-perl
 0      search/1/b      #!\ /usr/local/bin/perl         Perl script text executable
-!:mime application/x-perl
+!:mime text/x-perl
 0      search/1        eval\ "exec\ /usr/local/bin/perl        Perl script text
-!:mime application/x-perl
+!:mime text/x-perl
 0      search/1        eval\ '(exit\ $?0)'\ &&\ eval\ 'exec    Perl script text
-!:mime application/x-perl
+!:mime text/x-perl
 
 
 # by Dmitry V. Levin and Alexey Tourbin

diff --git a/magic/Magdir/sgml b/magic/Magdir/sgml
index 203b84e17630d5e7b0414f77b59f43eac057061f..3742caf05da0ce2ebea64d529349ccbfaee49fae 100644 (file)
--- a/magic/Magdir/sgml
+++ b/magic/Magdir/sgml
@@ -25,14 +25,20 @@
 # Extensible markup language (XML), a subset of SGML
 # from Marc Prud'hommeaux (marc@apocalypse.org)
 0      search/1/cb     \<?xml                  XML document text
+!:mime application/xml
 0      string          \<?xml\ version\ "      XML
+!:mime application/xml
 0      string          \<?xml\ version="       XML
+!:mime application/xml
 0      string          \<?xml\ version='       XML
+!:mime application/xml
 >15    search/1        >\0                     %.3s document text
 >>23   search/1        \<xsl:stylesheet        (XSL stylesheet)
 >>24   search/1        \<xsl:stylesheet        (XSL stylesheet)
 0      search/1/b      \<?xml                  XML document text
+!:mime application/xml
 0      search/1/b      \<?XML                  broken XML document text
+!:mime application/xml
 
 
 # SGML, mostly from rph@sq