Fix mime entries that were attached to magic entries that did not yet

have descriptions.

diff --git a/magic/Magdir/animation b/magic/Magdir/animation
index fd19f5af889ff2bbab314810c41bd1408cc32d5a..f625a784323ec7df684dca660dfb5aafdc47fdce 100644 (file)
--- a/magic/Magdir/animation
+++ b/magic/Magdir/animation
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------------
-# $File: animation,v 1.49 2013/08/15 13:15:11 christos Exp $
+# $File: animation,v 1.50 2014/03/01 03:01:45 christos Exp $
 # animation:  file(1) magic for animation/movie formats
 #
 # animation formats
@@ -789,25 +789,26 @@
 
 #                                              MPEG file
 # MPEG sequences
-# FIXME: This section is from the old magic.mime file and needs integrating with the rest
-0       belong             0x000001BA
->4      byte               &0x40
-!:mime video/mp2p
->4      byte               ^0x40
-!:mime video/mpeg
-0       belong             0x000001BB
-!:mime video/mpeg
-0       belong             0x000001B0
-!:mime video/mp4v-es
-0       belong             0x000001B5
-!:mime video/mp4v-es
-0       belong             0x000001B3
-!:mime video/mpv
-0       belong&0xFF5FFF10  0x47400010
-!:mime video/mp2t
-0       belong             0x00000001
->4      byte&0x1F         0x07
-!:mime video/h264
+# FIXME: This section is from the old magic.mime file and needs
+# integrating with the rest
+#0       belong             0x000001BA
+#>4      byte               &0x40
+#!:mime        video/mp2p
+#>4      byte               ^0x40
+#!:mime        video/mpeg
+#0       belong             0x000001BB
+#!:mime        video/mpeg
+#0       belong             0x000001B0
+#!:mime        video/mp4v-es
+#0       belong             0x000001B5
+#!:mime        video/mp4v-es
+#0       belong             0x000001B3
+#!:mime        video/mpv
+#0       belong&0xFF5FFF10  0x47400010
+#!:mime        video/mp2t
+#0       belong             0x00000001
+#>4      byte&0x1F        0x07
+#!:mime        video/h264
 
 # Type: Bink Video
 # Extension: .bik

diff --git a/magic/Magdir/archive b/magic/Magdir/archive
index bae8a1596c7acd0333f7e7b9ffb10b8b1d03c0dc..89f2e1c542d2fed5b3840aa1ba6b9565ea048d1f 100644 (file)
--- a/magic/Magdir/archive
+++ b/magic/Magdir/archive
@@ -1,5 +1,5 @@
 #------------------------------------------------------------------------------
-# $File: archive,v 1.80 2014/01/06 13:27:05 rrt Exp $
+# $File: archive,v 1.81 2014/01/08 22:27:31 christos Exp $
 # archive:  file(1) magic for archive formats (see also "msdos" for self-
 #           extracting compressed archives)
 #
@@ -92,9 +92,10 @@
 # "debian".
 #
 0      string          =!<arch>\ndebian
-!:mime application/x-debian-package
 >8     string          debian-split    part of multipart Debian package
+!:mime application/x-debian-package
 >8     string          debian-binary   Debian binary package
+!:mime application/x-debian-package
 >8     string          !debian
 >68    string          >\0             (format %s)
 # These next two lines do not work, because a bzip2 Debian archive

diff --git a/magic/Magdir/cafebabe b/magic/Magdir/cafebabe
index e9135b6e91bc747977e57d223af11f091ade766c..35364771e67d0a396d6f4472fc36d190552a4d00 100644 (file)
--- a/magic/Magdir/cafebabe
+++ b/magic/Magdir/cafebabe
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------------
-# $File: cafebabe,v 1.13 2013/02/26 21:04:38 christos Exp $
+# $File: cafebabe,v 1.14 2013/02/27 16:59:59 christos Exp $
 # Cafe Babes unite!
 #
 # Since Java bytecode and Mach-O universal binaries have the same magic number,
@@ -16,8 +16,8 @@
 #
 ### JAVA START ###
 0      belong          0xcafebabe
-!:mime application/x-java-applet
 >4     belong          >30             compiled Java class data,
+!:mime application/x-java-applet
 >>6    beshort         x               version %d.
 >>4    beshort         x               \b%d
 # Which is which?

diff --git a/magic/Magdir/compress b/magic/Magdir/compress
index 1abe5e0a4343f88ee4790a8653d9e4eec1648f51..b730b7b128a4f7b57565261d0daf40286313f601 100644 (file)
--- a/magic/Magdir/compress
+++ b/magic/Magdir/compress
@@ -1,5 +1,5 @@
 #------------------------------------------------------------------------------
-# $File: compress,v 1.52 2013/12/11 17:55:00 christos Exp $
+# $File: compress,v 1.53 2014/01/05 15:55:21 christos Exp $
 # compress:  file(1) magic for pure-compression formats (no archives)
 #
 # compress, gzip, pack, compact, huf, squeeze, crunch, freeze, yabba, etc.
@@ -191,8 +191,8 @@
 
 # Type: LZMA
 0      lelong&0xffffff =0x5d
-!:mime application/x-lzma
 >12    leshort         0xff                    LZMA compressed data,
+!:mime application/x-lzma
 >>5    lequad          =0xffffffffffffffff     streamed
 >>5    lequad          !0xffffffffffffffff     non-streamed, size %lld
 >12    leshort         0                       LZMA compressed data,

diff --git a/magic/Magdir/database b/magic/Magdir/database
index 3cceb66d24a802ad7a677f64bcaa77b2d67720ed..a29a0bd00aecb7b84ddfb938350fc17920f994c3 100644 (file)
--- a/magic/Magdir/database
+++ b/magic/Magdir/database
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------------
-# $File: database,v 1.35 2013/11/20 00:00:14 christos Exp $
+# $File: database,v 1.36 2013/12/09 20:31:53 christos Exp $
 # database:  file(1) magic for various databases
 #
 # extracted from header/code files by Graeme Wilford (eep2gw@ee.surrey.ac.uk)
@@ -170,7 +170,6 @@
 >>>>>>>>>>8    uleshort                >31             
 # skip PIC15736.PCX by test for language driver name or field name
 >>>>>>>>>>>32  ubyte                   >0              
-!:mime application/x-dbf
 #!:mime        application/x-dbf; charset=unknown-8bit ??
 #!:mime        application/x-dbase
 >>>>>>>>>>>>0  use                     xbase-type
@@ -237,47 +236,69 @@
 >>0    ubyte           0x02            FoxBase
 # FoxBase+/dBaseIII+, no memo
 >>0    ubyte           0x03            FoxBase+/dBase III
+!:mime application/x-dbf
 # dBASE IV no memo file
 >>0    ubyte           0x04            dBase IV
+!:mime application/x-dbf
 # dBASE V no memo file
 >>0    ubyte           0x05            dBase V
+!:mime application/x-dbf
 >>0    ubyte           0x30            Visual FoxPro
+!:mime application/x-dbf
 >>0    ubyte           0x31            Visual FoxPro, autoincrement
+!:mime application/x-dbf
 # Visual FoxPro, with field type Varchar or Varbinary
 >>0    ubyte           0x32            Visual FoxPro, with field type Varchar
+!:mime application/x-dbf
 # dBASE IV SQL, no memo;dbv memo var size (Flagship)
 >>0    ubyte           0x43            dBase IV, with SQL table
+!:mime application/x-dbf
 # http://msdn.microsoft.com/en-US/library/st4a0s68(v=vs.80).aspx
 #>>0   ubyte           0x62            dBase IV, with SQL table
+#!:mime        application/x-dbf
 # dBASE IV, with memo!!
 >>0    ubyte           0x7b            dBase IV, with memo
+!:mime application/x-dbf
 # http://msdn.microsoft.com/en-US/library/st4a0s68(v=vs.80).aspx
 #>>0   ubyte           0x82            dBase IV, with SQL system
+#!:mime        application/x-dbf
 # FoxBase+/dBaseIII+ with memo .DBT!
 >>0    ubyte           0x83            FoxBase+/dBase III, with memo .DBT
+!:mime application/x-dbf
 # VISUAL OBJECTS (first 1.0 versions) for the Dbase III files (NTX clipper driver); memo file
 >>0    ubyte           0x87            VISUAL OBJECTS, with memo file
+!:mime application/x-dbf
 # http://msdn.microsoft.com/en-US/library/st4a0s68(v=vs.80).aspx
 #>>0   ubyte           0x8A            FoxBase+/dBase III, with memo .DBT
+#!:mime        application/x-dbf
 # dBASE IV with memo!
 >>0    ubyte           0x8B            dBase IV, with memo .DBT
+!:mime application/x-dbf
 # dBase IV with SQL Table,no memo?
 >>0    ubyte           0x8E            dBase IV, with SQL table
+!:mime application/x-dbf
 # .dbv and .dbt memo (Flagship)?
 >>0    ubyte           0xB3            Flagship
 # http://msdn.microsoft.com/en-US/library/st4a0s68(v=vs.80).aspx
 #>>0   ubyte           0xCA            dBase IV with memo .DBT
+#!:mime        application/x-dbf
 # dBASE IV with SQL table, with memo .DBT
 >>0    ubyte           0xCB            dBase IV with SQL table, with memo .DBT
+!:mime application/x-dbf
 # HiPer-Six format;Clipper SIX, with SMT memo file             
 >>0    ubyte           0xE5            Clipper SIX with memo
+!:mime application/x-dbf
 # http://msdn.microsoft.com/en-US/library/st4a0s68(v=vs.80).aspx
 #>>0   ubyte           0xF4            dBase IV, with SQL table, with memo
+#!:mime        application/x-dbf
 >>0    ubyte           0xF5            FoxPro with memo
+!:mime application/x-dbf
 # http://msdn.microsoft.com/en-US/library/st4a0s68(v=vs.80).aspx
 #>>0   ubyte           0xFA            FoxPro 2.x, with memo
-# unkown version (should not happen)
+#!:mime        application/x-dbf
+# unknown version (should not happen)
 >>0    default         x               xBase
+!:mime application/x-dbf
 >>>0   ubyte           x               (0x%x)
 # flags in version byte
 # DBT flag (with dBASE III memo .DBT)!!

diff --git a/magic/Magdir/msdos b/magic/Magdir/msdos
index 7b00bd6a5a4e715c7541f6c92072b1fe7a0a32db..4743680456dc0f2c74e4b142ae0bbfce221558d3 100644 (file)
--- a/magic/Magdir/msdos
+++ b/magic/Magdir/msdos
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------------
-# $File: msdos,v 1.90 2014/03/09 11:18:24 kim Exp $
+# $File: msdos,v 1.91 2014/03/10 08:48:18 kim Exp $
 # msdos:  file(1) magic for MS-DOS files
 #
 
@@ -42,9 +42,9 @@
 # Many of the compressed formats were extraced from IDARC 1.23 source code.
 #
 0      string/b        MZ
-!:mime application/x-dosexec
 # All non-DOS EXE extensions have the relocation table more than 0x40 bytes into the file.
 >0x18  leshort <0x40 MS-DOS executable
+!:mime application/x-dosexec
 # These traditional tests usually work but not always.  When test quality support is
 # implemented these can be turned on.
 #>>0x18        leshort 0x1c    (Borland compiler)
@@ -590,13 +590,14 @@
 >4  ubyte   !0  \b, %d colors
 
 0   belong  0x00000100
-!:mime image/x-icon
 
 >9  byte    0
 >>0 byte    x           MS Windows icon resource
+!:mime image/x-icon
 >>4 use     ico-dir
 >9  ubyte   0xff
 >>0 byte    x           MS Windows icon resource
+!:mime image/x-icon
 >>4 use     ico-dir
 
 # Windows non-animated cursors
@@ -612,12 +613,13 @@
 >8  uleshort    x   \b%d
 
 0   belong  0x00000200
-!:mime image/x-cur
 >9  byte    0
 >>0 byte    x           MS Windows cursor resource
+!:mime image/x-cur
 >>4 use     cur-dir
 >9  ubyte   0xff
 >>0 byte    x           MS Windows cursor resource
+!:mime image/x-cur
 >>4 use     cur-dir
 
 # .chr files