Bump the strength of gzip and reorder printing of attributes (Thomas Ledoux)

diff --git a/magic/Magdir/compress b/magic/Magdir/compress
index a8b2e061cecea711d28e93de1f60d0d368273c90..23267145eb76b3120d5afb1f50a59005f8cd7233 100644 (file)
--- a/magic/Magdir/compress
+++ b/magic/Magdir/compress
@@ -1,5 +1,5 @@
 #------------------------------------------------------------------------------
-# $File: compress,v 1.50 2013/08/15 12:53:10 christos Exp $
+# $File: compress,v 1.51 2013/11/19 20:38:57 christos Exp $
 # compress:  file(1) magic for pure-compression formats (no archives)
 #
 # compress, gzip, pack, compact, huf, squeeze, crunch, freeze, yabba, etc.
@@ -22,6 +22,7 @@
 #         other than 8 ("deflate", the only method defined in RFC 1952).
 0       string          \037\213        gzip compressed data
 !:mime application/x-gzip
+!:strength * 2
 >2     byte            <8              \b, reserved method
 >2     byte            >8              \b, unknown method
 >3     byte            &0x01           \b, ASCII
@@ -30,6 +31,10 @@
 >3     byte&0xC        =0x08
 >>10   string          x               \b, was "%s"
 >3     byte            &0x10           \b, has comment
+>3     byte            &0x20           \b, encrypted
+>4     ledate          >0              \b, last modified: %s
+>8     byte            2               \b, max compression
+>8     byte            4               \b, max speed
 >9     byte            =0x00           \b, from FAT filesystem (MS-DOS, OS/2, NT)
 >9     byte            =0x01           \b, from Amiga
 >9     byte            =0x02           \b, from VMS
@@ -44,11 +49,6 @@
 >9     byte            =0x0B           \b, from NTFS filesystem (NT)
 >9     byte            =0x0C           \b, from QDOS
 >9     byte            =0x0D           \b, from Acorn RISCOS
->3     byte            &0x10           \b, comment
->3     byte            &0x20           \b, encrypted
->4     ledate          >0              \b, last modified: %s
->8     byte            2               \b, max compression
->8     byte            4               \b, max speed
 
 # packed data, Huffman (minimum redundancy) codes on a byte-by-byte basis
 0      string          \037\036        packed data