From: Christos Zoulas Date: Sat, 25 Nov 2006 18:36:10 +0000 (+0000) Subject: magic fixes X-Git-Tag: FILE4_19~6 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=156718fede39653decf5d7c4650b34a6294516df;p=file magic fixes --- diff --git a/ChangeLog b/ChangeLog index 7c7e1c90..a478abcc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2006-11-25 13:35 Christos Zoulas + + * Don't store the current offset in the magic + struct, because it needs to be restored and + it was not done properly all the time. Bug + found by: Arkadiusz Miskiewicz + + * Fix problem in the '\0' separator; and don't + print it as an additional separator; print + it as the only separator. + 2006-11-17 10:51 Christos Zoulas * Added a -0 option to print a '\0' separator diff --git a/magic/Magdir/linux b/magic/Magdir/linux index 36cc24fc..fc0c42d4 100644 --- a/magic/Magdir/linux +++ b/magic/Magdir/linux @@ -229,3 +229,10 @@ 0x618 string LVM2\ 001 LVM2 (Linux Logical Volume Manager) >(0x614.l+0x600) string >\0 , UUID: %s + +# SE Linux policy database +0 lelong 0xf97cff8c SE Linux policy +>16 lelong x v%d +>20 lelong 1 MLS +>24 lelong x %d symbols +>28 lelong x %d ocons diff --git a/magic/Magdir/python b/magic/Magdir/python index 5aea137f..9fac2b9a 100644 --- a/magic/Magdir/python +++ b/magic/Magdir/python @@ -13,6 +13,7 @@ 0 belong 0x2ded0d0a python 2.2 byte-compiled 0 belong 0x3bf20d0a python 2.3 byte-compiled 0 belong 0x6df20d0a python 2.4 byte-compiled +0 belong 0xb3f20d0a python 2.5 byte-compiled 0 string/b #!\ /usr/bin/python python script text executable diff --git a/magic/Makefile.am b/magic/Makefile.am index 8e904e6d..c7059c56 100644 --- a/magic/Makefile.am +++ b/magic/Makefile.am @@ -196,6 +196,7 @@ Magdir/troff \ Magdir/tuxedo \ Magdir/typeset \ Magdir/unknown \ +Magdir/unicode \ Magdir/uuencode \ Magdir/varied.out \ Magdir/varied.script \ diff --git a/magic/magic.mime b/magic/magic.mime index c4591b8b..3fa67e59 100644 --- a/magic/magic.mime +++ b/magic/magic.mime @@ -933,3 +933,6 @@ 0 string WordPro\0 application/vnd.lotus-wordpro 0 string WordPro\r\373 application/vnd.lotus-wordpro 0 string CPC\262 image/cpi + +# +128 string DICM application/dicom diff --git a/magic/magic2mime b/magic/magic2mime index f3fbe267..dfb12604 100755 --- a/magic/magic2mime +++ b/magic/magic2mime @@ -1,6 +1,6 @@ #! /usr/bin/env perl # -*- PERL -*- -# $Id: magic2mime,v 1.3 2006/03/02 22:10:26 christos Exp $ +# $Id: magic2mime,v 1.4 2006/11/25 18:36:10 christos Exp $ # Copyright (c) 1996, 1997 vax@linkdead.paranoia.com (VaX#n8) # # Usage: echo 'your-file-output-here' | file_to_ctype.pl @@ -42,6 +42,7 @@ '^Sun/NeXT audio data', 'audio/basic', '^MPEG', 'video/mpeg', '^Apple QuickTime movie', 'video/quicktime', + '^DICOM medical imaging data', 'application/dicom', # made up by me '^bitmap', 'image/x-bitmap', '^PC bitmap data, Windows 3.x format', 'image/x-msw3bmp',