gc some of the weak magic inone place.

diff --git a/magic/Magdir/archive b/magic/Magdir/archive
index 1a90625dbb13f5304421078fbc02133d52cea5c9..b75fac0838b58731478ad5c99dc75e482a012e1e 100644 (file)
--- a/magic/Magdir/archive
+++ b/magic/Magdir/archive
@@ -566,7 +566,7 @@
 !:mime application/zip
 >4     byte            0x09            Zip archive data, at least v0.9 to extract
 !:mime application/zip
->4     BYTE            0x0a            Zip archive data, at least v1.0 to extract
+>4     byte            0x0a            Zip archive data, at least v1.0 to extract
 !:mime application/zip
 >4     byte            0x0b            Zip archive data, at least v1.1 to extract
 !:mime application/zip

diff --git a/magic/Magdir/images b/magic/Magdir/images
index 1a16c5f934638d6f2825d8b6227a0bcfb4d123d0..e3f473bc7dca1258aea0ea0e8235626b59d24187 100644 (file)
--- a/magic/Magdir/images
+++ b/magic/Magdir/images
@@ -160,9 +160,6 @@
 
 # CGM image files
 0      string          BEGMF           clear text Computer Graphics Metafile
-# XXX - questionable magic
-#0     beshort&0xffe0  0x0020          binary Computer Graphics Metafile
-#0     beshort         0x3020          character Computer Graphics Metafile
 
 # MGR bitmaps  (Michael Haardt, u31b3hs@pool.informatik.rwth-aachen.de)
 0      string  yz      MGR bitmap, modern format, 8-bit aligned
@@ -292,7 +289,6 @@
 
 # other images
 0      string  This\ is\ a\ BitMap\ file       Lisp Machine bit-array-file
-#0     string          =!!             Bennet Yee's "face" format
 
 # From SunOS 5.5.1 "/etc/magic" - appeared right before Sun raster image
 # stuff.

diff --git a/magic/Magdir/weak b/magic/Magdir/weak
new file mode 100644 (file)
index 0000000..21324ea
--- /dev/null
+++ b/magic/Magdir/weak
@@ -0,0 +1,15 @@
+#------------------------------------------------------------------------------
+# weak:  file(1) magic for very weak magic entries, disabled by default
+#
+# These entries are so weak that they might interfere identification of
+# other formats. Example include:
+# - Only identify for 1 or 2 bytes
+# - Match against very wide range of values
+# - Match against generic word in some spoken languages (e.g. English)
+
+# Summary: Computer Graphics Metafile
+# Extension: .cgm
+#0     beshort&0xffe0  0x0020          binary Computer Graphics Metafile
+#0     beshort         0x3020          character Computer Graphics Metafile
+
+#0     string          =!!             Bennet Yee's "face" format