diff options
author | Bastien Nocera <hadess@hadess.net> | 2016-01-04 17:07:09 +0100 |
---|---|---|
committer | Bastien Nocera <hadess@hadess.net> | 2016-01-04 17:07:09 +0100 |
commit | 10fc17ec61c5b5c6c0e6ea2c8d7a2123271d07e3 (patch) | |
tree | 36dfb96621ae15a3a9848600243ecf3511d4ef06 | |
parent | 4ed3648868a2c2dddfa8c31aaf660e9d5131fefd (diff) | |
download | shared-mime-info-10fc17ec61c5b5c6c0e6ea2c8d7a2123271d07e3.tar.gz |
Bump priority for archives mime-types magic
When a long enough magic is available (4 characters in this case),
prefer the magic of the archive type to the one of the
maybe-not-compressed header of the first file in the archive.
For example, in https://bugs.freedesktop.org/show_bug.cgi?id=93549
a PDF inside the RAR archive made the archive be detected as a PDF.
-rw-r--r-- | freedesktop.org.xml.in | 38 | ||||
-rw-r--r-- | tests/list | 2 | ||||
-rw-r--r-- | tests/serafettin.rar | bin | 0 -> 524288 bytes |
3 files changed, 21 insertions, 19 deletions
diff --git a/freedesktop.org.xml.in b/freedesktop.org.xml.in index 142ca392..dc12655f 100644 --- a/freedesktop.org.xml.in +++ b/freedesktop.org.xml.in @@ -560,7 +560,7 @@ command to generate the output files. <mime-type type="application/vnd.ms-cab-compressed"> <_comment>Microsoft Cabinet archive</_comment> <generic-icon name="package-x-generic"/> - <magic priority="50"> + <magic priority="60"> <match offset="0" type="string" value="MSCF\0\0\0\0" /> </magic> <glob pattern="*.cab"/> @@ -1312,7 +1312,7 @@ command to generate the output files. <mime-type type="application/x-7z-compressed"> <_comment>7-zip archive</_comment> <generic-icon name="package-x-generic"/> - <magic priority="50"> + <magic priority="60"> <match type="string" value="7z\274\257\047\034" offset="0"/> </magic> <glob pattern="*.7z"/> @@ -1377,7 +1377,7 @@ command to generate the output files. <mime-type type="application/x-arc"> <_comment>ARC archive</_comment> <generic-icon name="package-x-generic"/> - <magic priority="50"> + <magic priority="60"> <match type="little32" mask="0x8080ffff" value="0x0000081a" offset="0"/> <match type="little32" mask="0x8080ffff" value="0x0000091a" offset="0"/> <match type="little32" mask="0x8080ffff" value="0x0000021a" offset="0"/> @@ -1522,7 +1522,7 @@ command to generate the output files. <mime-type type="application/x-lrzip"> <_comment>Lrzip archive</_comment> <generic-icon name="package-x-generic"/> - <magic priority="50"> + <magic priority="60"> <match type="string" value="LRZI" offset="0"/> </magic> <glob pattern="*.lrz"/> @@ -1629,7 +1629,7 @@ command to generate the output files. <mime-type type="application/x-cpio"> <_comment>CPIO archive</_comment> <generic-icon name="package-x-generic"/> - <magic priority="50"> + <magic priority="60"> <match type="host16" value="070707" offset="0"/> <match type="string" value="070701" offset="0"/> <match type="string" value="070702" offset="0"/> @@ -2249,7 +2249,7 @@ command to generate the output files. <mime-type type="application/x-java-pack200"> <_comment>Pack200 Java archive</_comment> <generic-icon name="package-x-generic"/> - <magic priority="50"> + <magic priority="60"> <match type="big32" value="0xcafed00d" offset="0"/> </magic> <glob pattern="*.pack"/> @@ -2530,7 +2530,7 @@ command to generate the output files. <mime-type type="application/x-lha"> <_comment>LHA archive</_comment> <generic-icon name="package-x-generic"/> - <magic priority="50"> + <magic priority="60"> <match type="string" value="-lh -" offset="2"/> <match type="string" value="-lh0-" offset="2"/> <match type="string" value="-lh1-" offset="2"/> @@ -2575,7 +2575,7 @@ command to generate the output files. <mime-type type="application/x-lz4"> <_comment>LZ4 archive</_comment> <generic-icon name="package-x-generic"/> - <magic priority="50"> + <magic priority="60"> <match type="little32" value="0x184d2204" offset="0"/> <match type="little32" value="0x184c2102" offset="0"/> </magic> @@ -2584,7 +2584,7 @@ command to generate the output files. <mime-type type="application/x-lzip"> <_comment>Lzip archive</_comment> <generic-icon name="package-x-generic"/> - <magic priority="50"> + <magic priority="60"> <match type="string" value="LZIP" offset="0"/> </magic> <glob pattern="*.lz"/> @@ -2608,7 +2608,7 @@ command to generate the output files. <acronym>LZO</acronym> <expanded-acronym>Lempel-Ziv-Oberhumer</expanded-acronym> <generic-icon name="package-x-generic"/> - <magic priority="50"> + <magic priority="60"> <match type="string" value="\x89\x4c\x5a\x4f\x00\x0d\x0a\x1a\x0a" offset="0"/> </magic> <glob pattern="*.lzo"/> @@ -2616,7 +2616,7 @@ command to generate the output files. <mime-type type="application/x-qpress"> <_comment>Qpress archive</_comment> <generic-icon name="package-x-generic"/> - <magic priority="50"> + <magic priority="60"> <match type="string" value="qpress10" offset="0"/> </magic> <glob pattern="*.qp"/> @@ -2626,7 +2626,7 @@ command to generate the output files. <acronym>XAR</acronym> <expanded-acronym>eXtensible ARchive</expanded-acronym> <generic-icon name="package-x-generic"/> - <magic> + <magic priority="60"> <match type="big32" value="0x78617221" offset="0"/> </magic> <glob pattern="*.xar"/> @@ -3053,7 +3053,7 @@ command to generate the output files. <acronym>Parchive</acronym> <expanded-acronym>Parity Volume Set Archive</expanded-acronym> <generic-icon name="package-x-generic"/> - <magic priority="50"> + <magic priority="60"> <match offset="0" type="string" value="PAR2" /> </magic> <glob pattern="*.PAR2" /> @@ -3197,7 +3197,7 @@ command to generate the output files. <expanded-acronym>Roshal ARchive</expanded-acronym> <alias type="application/x-rar-compressed"/> <generic-icon name="package-x-generic"/> - <magic priority="50"> + <magic priority="60"> <match type="string" value="Rar!" offset="0"/> </magic> <glob pattern="*.rar"/> @@ -3384,7 +3384,7 @@ command to generate the output files. <generic-icon name="package-x-generic"/> <alias type="application/stuffit"/> <alias type="application/x-sit"/> - <magic priority="50"> + <magic priority="60"> <match type="string" value="StuffIt " offset="0"/> <match type="string" value="SIT!" offset="0"/> </magic> @@ -3523,7 +3523,7 @@ command to generate the output files. <_comment>Tar archive</_comment> <generic-icon name="package-x-generic"/> <alias type="application/x-gtar"/> - <magic priority="50"> + <magic priority="60"> <match type="string" value="ustar\0" offset="257"/> <match type="string" value="ustar\040\040\0" offset="257"/> </magic> @@ -3609,7 +3609,7 @@ command to generate the output files. <mime-type type="application/x-xz"> <_comment>XZ archive</_comment> <generic-icon name="package-x-generic"/> - <magic priority="50"> + <magic priority="60"> <match type="string" value="\xfd\x37\x7a\x58\x5a\x00" offset="0"/> </magic> <glob pattern="*.xz"/> @@ -3657,7 +3657,7 @@ command to generate the output files. <mime-type type="application/x-zoo"> <_comment>Zoo archive</_comment> <generic-icon name="package-x-generic"/> - <magic priority="50"> + <magic priority="60"> <match type="little32" value="0xfdc4a7dc" offset="20"/> </magic> <glob pattern="*.zoo"/> @@ -5307,7 +5307,7 @@ command to generate the output files. <mime-type type="application/x-ace"> <_comment>ACE archive</_comment> <generic-icon name="package-x-generic"/> - <magic priority="50"> + <magic priority="60"> <match type="string" value="**ACE**" offset="7"/> </magic> <glob pattern="*.ace"/> @@ -385,6 +385,8 @@ test.qp application/x-qpress test.zz application/zlib ox # Created using xar 1.5.2 test.xar application/x-xar +# From https://bugs.freedesktop.org/show_bug.cgi?id=93549 +serafettin.rar application/x-rar # Audio/Video files # https://bugs.freedesktop.org/show_bug.cgi?id=20070#c4 diff --git a/tests/serafettin.rar b/tests/serafettin.rar Binary files differnew file mode 100644 index 00000000..aa1528eb --- /dev/null +++ b/tests/serafettin.rar |