|
 |
0467cc7 |
--- file-4.21/magic/Magdir/revision.magic 2007-04-09 18:33:07.000000000 +0200
|
|
|
0467cc7 |
+++ file-4.21/magic/Magdir/revision 2007-05-28 21:41:15.000000000 +0200
|
|
|
0467cc7 |
@@ -4,6 +4,11 @@
|
|
|
ed9eb9f |
# From Hendrik Scholz <hendrik@scholz.net>
|
|
|
0467cc7 |
0 string /1\ :pserver: cvs password text file
|
|
|
0467cc7 |
|
|
|
ed9eb9f |
+# Subversion (SVN) dumps
|
|
|
ed9eb9f |
+# Uwe Zeisberger <zeisberg@informatik.uni-freiburg.de>
|
|
|
ed9eb9f |
+0 string SVN-fs-dump-format-version: Subversion dumpfile
|
|
|
ed9eb9f |
+>28 string >\0 (version: %s)
|
|
|
ed9eb9f |
+
|
|
|
0467cc7 |
# Conary changesets
|
|
|
0467cc7 |
# From: Jonathan Smith <smithj@rpath.com>
|
|
|
0467cc7 |
0 belong 0xea3f81bb Conary changeset data
|
|
|
0467cc7 |
--- file-4.21/magic/Magdir/apple.magic 2006-03-02 23:10:26.000000000 +0100
|
|
|
0467cc7 |
+++ file-4.21/magic/Magdir/apple 2007-05-28 21:33:01.000000000 +0200
|
|
|
ed9eb9f |
@@ -10,6 +10,23 @@
|
|
|
ed9eb9f |
0 belong 0x00051600 AppleSingle encoded Macintosh file
|
|
|
ed9eb9f |
0 belong 0x00051607 AppleDouble encoded Macintosh file
|
|
|
ed9eb9f |
|
|
|
ed9eb9f |
+# Apple Emulator 2IMG format
|
|
|
ed9eb9f |
+#
|
|
|
ed9eb9f |
+0 string 2IMG Apple ][ 2IMG Disk Image
|
|
|
ed9eb9f |
+>4 string XGS! \b, XGS
|
|
|
ed9eb9f |
+>4 string CTKG \b, Catakig
|
|
|
ed9eb9f |
+>4 string ShIm \b, Sheppy's ImageMaker
|
|
|
ed9eb9f |
+>4 string WOOF \b, Sweet 16
|
|
|
ed9eb9f |
+>4 string B2TR \b, Bernie ][ the Rescue
|
|
|
ed9eb9f |
+>4 string !nfc \b, ASIMOV2
|
|
|
ed9eb9f |
+>4 string x \b, Unknown Format
|
|
|
ed9eb9f |
+>0xc byte 00 \b, DOS 3.3 sector order
|
|
|
ed9eb9f |
+>>0x10 byte 00 \b, Volume 254
|
|
|
ed9eb9f |
+>>0x10 byte&0x7f x \b, Volume %u
|
|
|
ed9eb9f |
+>0xc byte 01 \b, ProDOS sector order
|
|
|
ed9eb9f |
+>>0x14 short x \b, %u Blocks
|
|
|
ed9eb9f |
+>0xc byte 02 \b, NIB data
|
|
|
ed9eb9f |
+
|
|
|
ed9eb9f |
# magic for Newton PDA package formats
|
|
|
ed9eb9f |
# from Ruda Moura <ruda@helllabs.org>
|
|
|
ed9eb9f |
0 string package0 Newton package, NOS 1.x,
|
|
|
0467cc7 |
--- file-4.21/magic/Magdir/images.magic 2007-05-03 17:11:33.000000000 +0200
|
|
|
0467cc7 |
+++ file-4.21/magic/Magdir/images 2007-05-28 21:33:01.000000000 +0200
|
|
|
0467cc7 |
@@ -525,6 +525,12 @@
|
|
|
0467cc7 |
0 belong 0x0e031301 Hierarchical Data Format (version 4) data
|
|
|
0467cc7 |
0 string \211HDF\r\n\032 Hierarchical Data Format (version 5) data
|
|
|
0467cc7 |
|
|
|
0467cc7 |
+# The boot loaders syslinux and isolinux use a RLE based image format
|
|
|
0467cc7 |
+# called SLL16 to store splash screens.
|
|
|
0467cc7 |
+0 lelong 0x1413f33d Syslinux SLL16 image data,
|
|
|
0467cc7 |
+>4 leshort >0 %hd x
|
|
|
0467cc7 |
+>6 leshort >0 %hd
|
|
|
0467cc7 |
+
|
|
|
0467cc7 |
# From: Tobias Burnus <burnus@net-b.de>
|
|
|
0467cc7 |
# Xara (for a while: Corel Xara) is a graphic package, see
|
|
|
0467cc7 |
# http://www.xara.com/ for Windows and as GPL application for
|
|
|
0467cc7 |
--- file-4.21/magic/magic.mime.magic 2007-04-03 23:11:32.000000000 +0200
|
|
|
0467cc7 |
+++ file-4.21/magic/magic.mime 2007-05-28 21:47:26.000000000 +0200
|
|
|
0467cc7 |
@@ -196,7 +196,7 @@
|
|
|
0467cc7 |
# modified by Joerg Jenderek
|
|
|
0467cc7 |
# GRR the original test are too common for many DOS files
|
|
|
0467cc7 |
# so test 1 <= kbits nibble <= E
|
|
|
0467cc7 |
-0 beshort &0xffe0
|
|
|
0467cc7 |
+0 beshort&0xfffe =0xfffa audio/mpeg
|
|
|
0467cc7 |
>2 ubyte&0xF0 >0x0F
|
|
|
0467cc7 |
>>2 ubyte&0xF0 <0xE1 audio/mpeg
|
|
|
0467cc7 |
#MP3 with ID3 tag
|
|
|
0467cc7 |
@@ -402,16 +402,14 @@
|
|
|
ed9eb9f |
#
|
|
|
ed9eb9f |
# from Daniel Quinlan <quinlan@yggdrasil.com>
|
|
|
ed9eb9f |
#
|
|
|
ed9eb9f |
-0 string \
|
|
|
ed9eb9f |
-0 string \
|
|
|
ed9eb9f |
-0 string \
|
|
|
ed9eb9f |
-0 string \
|
|
|
ed9eb9f |
-0 string \
|
|
|
ed9eb9f |
-0 string \
|
|
|
ed9eb9f |
+0 string/cB \
|
|
|
ed9eb9f |
+0 string/cb \
|
|
|
ed9eb9f |
+0 string/cb \
|
|
|
ed9eb9f |
+0 string/bc \
|
|
|
ed9eb9f |
0 string \
|
|
|
ed9eb9f |
-0 string \
|
|
|
ed9eb9f |
-0 string \
|
|
|
ed9eb9f |
-0 string/c \
|
|
|
ed9eb9f |
+0 string/c \
|
|
|
ed9eb9f |
+
|
|
|
ed9eb9f |
+0 string \
|
|
|
ed9eb9f |
|
|
|
ed9eb9f |
#------------------------------------------------------------------------------
|
|
|
ed9eb9f |
# images: file(1) magic for image formats (see also "c-lang" for XPM bitmaps)
|
|
|
0467cc7 |
@@ -474,7 +472,7 @@
|
|
|
ed9eb9f |
0 beshort 0xffd8 image/jpeg
|
|
|
ed9eb9f |
|
|
|
ed9eb9f |
# PC bitmaps (OS/2, Windoze BMP files) (Greg Roelofs, newt@uchicago.edu)
|
|
|
ed9eb9f |
-0 string BM image/bmp
|
|
|
ed9eb9f |
+0 string BM image/x-ms-bmp
|
|
|
ed9eb9f |
#>14 byte 12 (OS/2 1.x format)
|
|
|
ed9eb9f |
#>14 byte 64 (OS/2 2.x format)
|
|
|
ed9eb9f |
#>14 byte 40 (Windows 3.x format)
|
|
|
0467cc7 |
@@ -939,6 +937,12 @@
|
|
|
ed9eb9f |
0 string fLaC audio/x-flac
|
|
|
ed9eb9f |
0 string CWS application/x-shockwave-flash
|
|
|
ed9eb9f |
|
|
|
ed9eb9f |
+
|
|
|
ed9eb9f |
+# Gnumeric spreadsheet
|
|
|
ed9eb9f |
+# This entry is only semi-helpful, as Gnumeric compresses its files, so
|
|
|
ed9eb9f |
+# they will ordinarily reported as "compressed", but at least -z helps
|
|
|
ed9eb9f |
+39 string =
|
|
|
ed9eb9f |
+
|
|
|
ed9eb9f |
# Hangul Document Files:
|
|
|
ed9eb9f |
# Reversed-engineered HWP magic numbers
|
|
|
ed9eb9f |
# From: Won-Kyu Park <wkpark@kldp.org>
|
|
|
0467cc7 |
--- file-4.21/src/fsmagic.c.magic 2007-01-12 18:40:53.000000000 +0100
|
|
|
0467cc7 |
+++ file-4.21/src/fsmagic.c 2007-05-28 21:33:01.000000000 +0200
|
|
|
ed9eb9f |
@@ -92,7 +92,8 @@
|
|
|
ed9eb9f |
if (file_printf(ms, "cannot open `%s' (%s)",
|
|
|
ed9eb9f |
fn, strerror(errno)) == -1)
|
|
|
ed9eb9f |
return -1;
|
|
|
ed9eb9f |
- return 1;
|
|
|
ed9eb9f |
+ ms->haderr++;
|
|
|
ed9eb9f |
+ return -1;
|
|
|
ed9eb9f |
}
|
|
|
ed9eb9f |
|
|
|
ed9eb9f |
if ((ms->flags & MAGIC_MIME) != 0) {
|