Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/dist/file file 4.08: bugfixes 'n more magic 'n stuff
details: https://anonhg.NetBSD.org/src/rev/f5f2b418f615
branches: trunk
changeset: 559744:f5f2b418f615
user: pooka <pooka%NetBSD.org@localhost>
date: Tue Mar 23 08:31:19 2004 +0000
description:
file 4.08: bugfixes 'n more magic 'n stuff
diffstat:
dist/file/ChangeLog | 50 ++++++
dist/file/magic/Makefile.am | 4 +
dist/file/magic/magdir/amigaos | 19 ++-
dist/file/magic/magdir/animation | 26 +++-
dist/file/magic/magdir/archive | 10 +-
dist/file/magic/magdir/c-lang | 2 +-
dist/file/magic/magdir/cad | 36 ++++
dist/file/magic/magdir/console | 30 +++-
dist/file/magic/magdir/dact | 10 +
dist/file/magic/magdir/database | 8 +
dist/file/magic/magdir/filesystems | 3 +
dist/file/magic/magdir/flash | 2 +
dist/file/magic/magdir/games | 131 +++++++++++++++++
dist/file/magic/magdir/geos | 19 ++
dist/file/magic/magdir/gnu | 30 ++++
dist/file/magic/magdir/human68k | 44 +++---
dist/file/magic/magdir/images | 30 +++-
dist/file/magic/magdir/intel | 12 +
dist/file/magic/magdir/jpeg | 10 +-
dist/file/magic/magdir/linux | 9 +-
dist/file/magic/magdir/macintosh | 248 +++++++++++++++++----------------
dist/file/magic/magdir/maple | 4 +-
dist/file/magic/magdir/msdos | 50 +++++-
dist/file/magic/magdir/netscape | 3 +
dist/file/magic/magdir/os2 | 20 +-
dist/file/magic/magdir/palm | 12 +-
dist/file/magic/magdir/plan9 | 4 +
dist/file/magic/magdir/python | 2 +-
dist/file/magic/magdir/rpm | 2 +-
dist/file/magic/magdir/sgml | 3 +-
dist/file/magic/magdir/sniffer | 40 ++++-
dist/file/magic/magdir/sun | 15 ++
dist/file/magic/magdir/ti-8x | 2 +-
dist/file/magic/magdir/vmware | 6 +-
dist/file/magic/magdir/vorbis | 4 +-
dist/file/magic/magdir/wordprocessors | 7 +
dist/file/magic/magic.mime | 168 ++++++++++++++++++++++-
dist/file/src/Makefile.am | 2 +-
dist/file/src/apptype.c | 9 +-
dist/file/src/ascmagic.c | 14 +-
dist/file/src/compress.c | 36 +++-
dist/file/src/funcs.c | 11 +-
dist/file/src/is_tar.c | 8 +-
dist/file/src/names.h | 9 +-
dist/file/src/patchlevel.h | 12 +-
dist/file/src/softmagic.c | 9 +-
46 files changed, 938 insertions(+), 247 deletions(-)
diffs (truncated from 1936 to 300 lines):
diff -r 474b6f2b73dd -r f5f2b418f615 dist/file/ChangeLog
--- a/dist/file/ChangeLog Tue Mar 23 06:02:48 2004 +0000
+++ b/dist/file/ChangeLog Tue Mar 23 08:31:19 2004 +0000
@@ -1,5 +1,55 @@
+2004-03-22 15:25 Christos Zoulas <christos%zoulas.com@localhost>
+
+ * Lots of mime fixes
+ (Joerg Ostertag) <ostertag%rechengilde.de@localhost>
+
+ * FreeBSD ELF version handling
+ (Edwin Groothuis) <edwin%mavetju.org@localhost>
+
+ * correct cleanup in all cases; don't just close the file.
+ (Christos Zoulas) <christos%zoulas.com@localhost>
+
+ * add gettext message catalogue support
+ (Michael Piefel) <piefel%debian.org@localhost>
+
+ * better printout for unreadable files
+ (Michael Piefel) <piefel%debian.org@localhost>
+
+ * compensate for missing MAXPATHLEN
+ (Michael Piefel) <piefel%debian.org@localhost>
+
+ * add wide character string length computation
+ (Michael Piefel) <piefel%debian.org@localhost>
+
+ * Avoid infinite loops caused by bad elf alignments
+ or name and description note sizes. Reported by
+ (Mikael Magnusson) <mmikael%comhem.se@localhost>
+
+2004-03-09 13:55 Christos Zoulas <christos%zoulas.com@localhost>
+
+ * Fix possible memory leak on error and add missing regfree
+ (Dmitry V. Levin) <ldv%altlinux.org@localhost>
+
+2003-12-23 12:12 Christos Zoulas <christos%zoulas.com@localhost>
+
+ * fix -k flag (Maciej W. Rozycki)
+
+2003-11-18 14:10 Christos Zoulas <christos%zoulas.com@localhost>
+
+ * Try to give us much info as possible on corrupt elf files.
+ (Willy Tarreau) <willy%w.ods.org@localhost>
+ * Updated python bindings (Brett Funderburg)
+ <brettf%deepfile.com@localhost>
+
+2003-11-11 15:03 Christos Zoulas <christos%zoulas.com@localhost>
+
+ * Include file.h first, because it includes config.h
+ breaks largefile test macros otherwise.
+ (Paul Eggert <eggert%CS.UCLA.EDU@localhost> via
+ Lars Hecking <lhecking%nmrc.ie@localhost>)
2003-10-14 21:39 Christos Zoulas <christos%zoulas.com@localhost>
+
* Python bindings (Brett Funderburg) <brettf%deepfile.com@localhost>
* Don't lookup past the end of the buffer
(Chad Hanson) <chanson%tcs-sec.com@localhost>
diff -r 474b6f2b73dd -r f5f2b418f615 dist/file/magic/Makefile.am
--- a/dist/file/magic/Makefile.am Tue Mar 23 06:02:48 2004 +0000
+++ b/dist/file/magic/Makefile.am Tue Mar 23 08:31:19 2004 +0000
@@ -43,6 +43,7 @@
Magdir/blit \
Magdir/bout \
Magdir/bsdi \
+Magdir/cad \
Magdir/c-lang \
Magdir/c64 \
Magdir/cddb \
@@ -58,6 +59,7 @@
Magdir/console \
Magdir/convex \
Magdir/ctags \
+Magdir/dact \
Magdir/database \
Magdir/diamond \
Magdir/diff \
@@ -77,6 +79,7 @@
Magdir/freebsd \
Magdir/fsav \
Magdir/games \
+Magdir/geos \
Magdir/gcc \
Magdir/gimp \
Magdir/gnu \
@@ -140,6 +143,7 @@
Magdir/perl \
Magdir/pgp \
Magdir/pkgadd \
+Magdir/plan9 \
Magdir/plus5 \
Magdir/printer \
Magdir/project \
diff -r 474b6f2b73dd -r f5f2b418f615 dist/file/magic/magdir/amigaos
--- a/dist/file/magic/magdir/amigaos Tue Mar 23 06:02:48 2004 +0000
+++ b/dist/file/magic/magdir/amigaos Tue Mar 23 08:31:19 2004 +0000
@@ -33,9 +33,10 @@
0 string ARP. The Holy Noise Module sound file
0 string BeEp\0 JamCracker Module sound file
0 string COSO\0 Hippel-COSO Module sound file
-26 string V.3 Brian Postma's Soundmon Module sound file v3
-26 string BPSM Brian Postma's Soundmon Module sound file v3
-26 string V.2 Brian Postma's Soundmon Module sound file v2
+# Too simple (short, pure ASCII, deep), MPi
+#26 string V.3 Brian Postma's Soundmon Module sound file v3
+#26 string BPSM Brian Postma's Soundmon Module sound file v3
+#26 string V.2 Brian Postma's Soundmon Module sound file v2
# The following are from: "Stefan A. Haubenthal" <polluks%web.de@localhost>
0 beshort 0x0f00 AmigaOS bitmap font
@@ -55,3 +56,15 @@
>35 byte 3 os: Unix
0 belong 0x000003fa AmigaOS shared library
+
+# Amiga disk types
+#
+0 string RDSK Rigid Disk Block
+>160 string x on %.24s
+0 string DOS\0 Amiga DOS disk
+0 string DOS\1 Amiga FFS disk
+0 string DOS\2 Amiga Inter DOS disk
+0 string DOS\3 Amiga Inter FFS disk
+0 string DOS\4 Amiga Fastdir DOS disk
+0 string DOS\5 Amiga Fastdir FFS disk
+0 string KICK Kickstart disk
diff -r 474b6f2b73dd -r f5f2b418f615 dist/file/magic/magdir/animation
--- a/dist/file/magic/magdir/animation Tue Mar 23 06:02:48 2004 +0000
+++ b/dist/file/magic/magdir/animation Tue Mar 23 08:31:19 2004 +0000
@@ -121,7 +121,7 @@
#From: Johan Gade <jgade%diku.dk@localhost>
# MPEG-4 Advanced Audio Coding (AAC) file (perhaps also MPEG-2 ACC?)
-16 string M4A MPEG-4 Advanced Audio Coding file (ACC)
+16 string M4A MPEG-4 Advanced Audio Coding file (AAC)
# FLI animation format
@@ -163,10 +163,19 @@
# \003. Most of them start with non-null values at hex offset 0x34 or so.
#0 string \3\0\0\0\0\0\0\0\0\0\0\0 DL version 3
-# SGI and Apple formats
+# SGI formats
0 string MOVI Silicon Graphics movie file
+
+# Apple Quicktime: Scan for all known top-level QT atom markers
4 string moov Apple QuickTime movie file (moov)
4 string mdat Apple QuickTime movie file (mdat)
+4 string ftyp Apple QuickTime movie file (ftyp)
+4 string free Apple QuickTime movie file (free)
+4 string junk Apple QuickTime movie file (junk)
+4 string pnot Apple QuickTime movie file (pnot)
+4 string skip Apple QuickTime movie file (skip)
+4 string wide Apple QuickTime movie file (wide)
+4 string pict Apple QuickTime movie file (pict)
# iso 13818 transport stream
#
@@ -216,3 +225,16 @@
# VRML (Virtual Reality Modelling Language)
0 string/b #VRML\ V1.0\ ascii VRML 1 file
0 string/b #VRML\ V2.0\ utf8 ISO/IEC 14772 VRML 97 file
+
+#---------------------------------------------------------------------------
+# HVQM4: compressed movie format designed by Hudson for Nintendo GameCube
+# From Mark Sheppard <msheppard%climax.co.uk@localhost>, 2002-10-03
+#
+0 string HVQM4 %s
+>6 string >\0 v%s
+>0 byte x GameCube movie,
+>0x34 ubeshort x %d x
+>0x36 ubeshort x %d,
+>0x26 ubeshort x %dµs,
+>0x42 ubeshort 0 no audio
+>0x42 ubeshort >0 %dHz audio
diff -r 474b6f2b73dd -r f5f2b418f615 dist/file/magic/magdir/archive
--- a/dist/file/magic/magdir/archive Tue Mar 23 06:02:48 2004 +0000
+++ b/dist/file/magic/magdir/archive Tue Mar 23 08:31:19 2004 +0000
@@ -35,7 +35,7 @@
>68 string >\0 (format %s)
>81 string bz2 \b, uses bzip2 compression
>84 string gz \b, uses gzip compression
->136 ledate x created: %s
+#>136 ledate x created: %s
# other archives
0 long 0177555 very old archive
@@ -241,9 +241,11 @@
# Microsoft cabinets
# by David Necas (Yeti) <yeti%physics.muni.cz@localhost>
-0 string MSCF\0\0\0\0 Microsoft cabinet file data,
->25 byte x v%d
->24 byte x \b.%d
+#0 string MSCF\0\0\0\0 Microsoft cabinet file data,
+#>25 byte x v%d
+#>24 byte x \b.%d
+# MPi: All CABs have version 1.3, so this is pointless.
+# Better magic in debian-additions.
# GTKtalog catalogs
# by David Necas (Yeti) <yeti%physics.muni.cz@localhost>
diff -r 474b6f2b73dd -r f5f2b418f615 dist/file/magic/magdir/c-lang
--- a/dist/file/magic/magdir/c-lang Tue Mar 23 06:02:48 2004 +0000
+++ b/dist/file/magic/magdir/c-lang Tue Mar 23 08:31:19 2004 +0000
@@ -10,7 +10,7 @@
# this first will upset you if you're a PL/1 shop...
# in which case rm it; ascmagic will catch real C programs
#0 string /* C or REXX program text
-0 string // C++ program text
+#0 string // C++ program text
# From: Mikhail Teterin <mi%aldan.algebra.com@localhost>
0 string cscope cscope reference data
diff -r 474b6f2b73dd -r f5f2b418f615 dist/file/magic/magdir/cad
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/dist/file/magic/magdir/cad Tue Mar 23 08:31:19 2004 +0000
@@ -0,0 +1,36 @@
+
+#------------------------------------------------------------------------------
+# autocad: file(1) magic for cad files
+#
+
+# AutoCAD DWG versions R13/R14 (www.autodesk.com)
+# Written December 01, 2003 by Lester Hightower
+# Based on the DWG File Format Specifications at http://www.opendwg.org/
+0 string \101\103\061\060\061 AutoCAD
+>5 string \062\000\000\000\000 DWG ver. R13
+>5 string \064\000\000\000\000 DWG ver. R14
+
+# Microstation DGN/CIT Files (www.bentley.com)
+# Written October 30, 2003 by Lester Hightower
+# DGN is the default file extension of Microstation/Intergraph CAD files.
+# CIT is the proprietary raster format (similar to TIFF) used to attach
+# raster underlays to Microstation DGN (vector) drawings.
+#
+# http://www.wotsit.org/search.asp
+# http://filext.com/detaillist.php?extdetail=DGN
+# http://filext.com/detaillist.php?extdetail=CIT
+#
+# http://www.bentley.com/products/default.cfm?objectid=97F351F5-9C35-4E5E-89C2
+# 3F86C928&method=display&p_objectid=97F351F5-9C35-4E5E-89C280A93F86C928
+# http://www.bentley.com/products/default.cfm?objectid=A5C2FD43-3AC9-4C71-B682
+# 721C479F&method=display&p_objectid=A5C2FD43-3AC9-4C71-B682C7BE721C479F
+0 string \010\011\376 Microstation
+>3 string \002
+>>30 string \372\104 DGN File
+>>30 string \172\104 DGN File
+>>30 string \026\105 DGN File
+>4 string \030\000\000 CIT File
+
+# AutoCad, from Nahuel Greco
+0 string AC1012 AutoCad (release 12)
+0 string AC1014 AutoCad (release 14)
diff -r 474b6f2b73dd -r f5f2b418f615 dist/file/magic/magdir/console
--- a/dist/file/magic/magdir/console Tue Mar 23 06:02:48 2004 +0000
+++ b/dist/file/magic/magdir/console Tue Mar 23 08:31:19 2004 +0000
@@ -119,9 +119,37 @@
#------------------------------------------------------------------------------
# msx: file(1) magic for MSX game cartridge dumps
-0 beshort 0x4142 MSX game cartridge dump
+# Too simple - MPi
+#0 beshort 0x4142 MSX game cartridge dump
+#------------------------------------------------------------------------------
# Sony Playstation executables (Adam Sjoegren <asjo%diku.dk@localhost>) :
0 string PS-X\ EXE Sony Playstation executable
# Area:
>113 string x (%s)
+
+#------------------------------------------------------------------------------
+# Microsoft Xbox executables .xbe (Esa Hyytiä <ehyytia%cc.hut.fi@localhost>)
+0 string XBEH XBE, Microsoft Xbox executable
+# probabilistic checks whether signed or not
+>0x0004 ulelong =0x0
+>>&2 ulelong =0x0
+>>>&2 ulelong =0x0 \b, not signed
+>0x0004 ulelong >0
+>>&2 ulelong >0
+>>>&2 ulelong >0 \b, signed
+# expect base address of 0x10000
+>0x0104 ulelong =0x10000
+>>(0x0118-0x0FF60) ulelong&0x80000007 0x80000007 \b, all regions
+>>(0x0118-0x0FF60) ulelong&0x80000007 !0x80000007
+>>>(0x0118-0x0FF60) ulelong >0 (regions:
+>>>>(0x0118-0x0FF60) ulelong &0x00000001 NA
+>>>>(0x0118-0x0FF60) ulelong &0x00000002 Japan
+>>>>(0x0118-0x0FF60) ulelong &0x00000004 Rest_of_World
+>>>>(0x0118-0x0FF60) ulelong &0x80000000 Manufacturer
+>>>(0x0118-0x0FF60) ulelong >0 \b)
+
+# --------------------------------
+# Microsoft Xbox data file formats
+0 string XIP0 XIP, Microsoft Xbox data
+0 string XTF0 XTF, Microsoft Xbox data
diff -r 474b6f2b73dd -r f5f2b418f615 dist/file/magic/magdir/dact
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
Home |
Main Index |
Thread Index |
Old Index