From: Reuben Thomas Date: Mon, 20 Sep 2010 21:11:35 +0000 (+0000) Subject: Magic patches from Fedora and Ubuntu. X-Git-Tag: FILE5_07~117 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=14881fc6fb976a4656127d9095b154cf9ed78d7f;p=file Magic patches from Fedora and Ubuntu. --- diff --git a/magic/Magdir/filesystems b/magic/Magdir/filesystems index ae5cb840..25de7ece 100644 --- a/magic/Magdir/filesystems +++ b/magic/Magdir/filesystems @@ -1,6 +1,6 @@ #------------------------------------------------------------------------------ -# $File: filesystems,v 1.58 2010/09/20 18:55:20 rrt Exp $ +# $File: filesystems,v 1.59 2010/09/20 19:19:17 rrt Exp $ # filesystems: file(1) magic for different filesystems # 0 string \366\366\366\366 PC formatted floppy with no filesystem @@ -884,15 +884,19 @@ # Minix filesystems - Juan Cespedes 0x410 leshort 0x137f +!:strength / 2 >0x402 beshort < 100 Minix filesystem, V1, %d zones >0x1e string minix \b, bootable 0x410 beshort 0x137f +!:strength / 2 >0x402 beshort < 100 Minix filesystem, V1 (big endian), %d zones >0x1e string minix \b, bootable 0x410 leshort 0x138f +!:strength / 2 >0x402 beshort < 100 Minix filesystem, V1, 30 char names, %d zones >0x1e string minix \b, bootable 0x410 beshort 0x138f +!:strength / 2 >0x402 beshort < 100 Minix filesystem, V1, 30 char names (big endian), %d zones >0x1e string minix \b, bootable 0x410 leshort 0x2468 @@ -1229,7 +1233,7 @@ # CDROM Filesystems # Modified for UDF by gerardo.cacciari@gmail.com -32769 string CD001 +32769 string CD001 # !:mime application/x-iso9660-image >38913 string !NSR0 ISO 9660 CD-ROM filesystem data >38913 string NSR0 UDF filesystem data diff --git a/magic/Magdir/matroska b/magic/Magdir/matroska index 4db48ea7..d3d73490 100644 --- a/magic/Magdir/matroska +++ b/magic/Magdir/matroska @@ -1,6 +1,6 @@ #------------------------------------------------------------------------------ -# $File: matroska,v 1.4 2009/09/19 16:28:10 christos Exp $ +# $File: matroska,v 1.5 2009/09/27 19:02:12 christos Exp $ # matroska: file(1) magic for Matroska files # # See http://www.matroska.org/ @@ -13,3 +13,11 @@ # DocType contents: >>8 string matroska Matroska data !:mime video/x-matroska + +# EBML id: +0 belong 0x1a45dfa3 +# DocType id: +>0 search/4096 \x42\x82 +# DocType contents: +>>&1 string webm WebM +!:mime video/webm