Add missing extensions/mime from Andrew Roazen

diff --git a/magic/Magdir/archive b/magic/Magdir/archive
index ecdb27ee6d71ca05c8bf04cb5dfff66de5f6c80b..ea0bb9ddfe400c75504b92a275ecd455b4dbe96b 100644 (file)
--- a/magic/Magdir/archive
+++ b/magic/Magdir/archive
@@ -1,5 +1,5 @@
 #------------------------------------------------------------------------------
-# $File: archive,v 1.98 2015/11/20 17:05:42 christos Exp $
+# $File: archive,v 1.99 2015/12/04 20:48:02 christos Exp $
 # archive:  file(1) magic for archive formats (see also "msdos" for self-
 #           extracting compressed archives)
 #
@@ -731,7 +731,7 @@
 # RAR (Roshal Archive) archive
 0      string          Rar!\x1a\7\0            RAR archive data
 !:mime application/x-rar
-!:ext  rar
+!:ext  rar/cbr
 # file header
 >(0xc.l+9)     byte    0x74
 >>(0xc.l+7)    use     rar-file-header
@@ -749,7 +749,7 @@
 # http://jasonblanks.com/wp-includes/images/papers/KnowyourarchiveRAR.pdf
 0      string          RE\x7e\x5e  RAR archive data (<v1.5)
 !:mime application/x-rar
-!:ext  rar
+!:ext  rar/cbr
 
 # SQUISH archiver (Greg Roelofs, newt@uchicago.edu)
 0      string          SQSH            squished archive data (Acorn RISCOS)
@@ -761,10 +761,13 @@
 # PKZIP multi-volume archive
 0      string          PK\x07\x08PK\x03\x04    Zip multi-volume archive data, at least PKZIP v2.50 to extract
 !:mime application/zip
+!:ext zip/cbz
 
 # Zip archives (Greg Roelofs, c/o zip-bugs@wkuvx1.wku.edu)
 0      string          PK\005\006      Zip archive data (empty)
 0      string          PK\003\004
+!:mime application/zip
+!:ext zip/cbz
 
 # Specialised zip formats which start with a member named 'mimetype'
 # (stored uncompressed, with no 'extra field') containing the file's MIME type.

diff --git a/magic/Magdir/compress b/magic/Magdir/compress
index 8452f52bb536418ad3a25da88af67dd6305750f8..910545a788c4abc1a1d5e48dab945616d569a7cd 100644 (file)
--- a/magic/Magdir/compress
+++ b/magic/Magdir/compress
@@ -1,5 +1,5 @@
 #------------------------------------------------------------------------------
-# $File: compress,v 1.64 2015/07/27 15:41:09 christos Exp $
+# $File: compress,v 1.65 2015/12/04 20:48:03 christos Exp $
 # compress:  file(1) magic for pure-compression formats (no archives)
 #
 # compress, gzip, pack, compact, huf, squeeze, crunch, freeze, yabba, etc.
@@ -188,6 +188,7 @@
 >6     byte            x                       version %d
 >7     byte            x                       \b.%d
 !:mime application/x-7z-compressed
+!:ext 7z/cb7
 
 # Type: LZMA
 0      lelong&0xffffff =0x5d