summaryrefslogtreecommitdiff
path: root/magic/Magdir
diff options
context:
space:
mode:
authorChristos Zoulas <christos@zoulas.com>2004-03-22 20:03:21 +0000
committerChristos Zoulas <christos@zoulas.com>2004-03-22 20:03:21 +0000
commit53c48160c0a8bd47cb3e47b0be1bb6d8f3ee7679 (patch)
tree3890313d1c744f6201bda2b9b6f52a19f144858d /magic/Magdir
parent6d75429ed391d64cb11869b5f53e522a67312213 (diff)
downloadfile-git-53c48160c0a8bd47cb3e47b0be1bb6d8f3ee7679.tar.gz
Debian changes.
Diffstat (limited to 'magic/Magdir')
-rw-r--r--magic/Magdir/amigaos7
-rw-r--r--magic/Magdir/animation15
-rw-r--r--magic/Magdir/archive10
-rw-r--r--magic/Magdir/audio3
-rw-r--r--magic/Magdir/c-lang2
-rw-r--r--magic/Magdir/cad3
-rw-r--r--magic/Magdir/console30
-rw-r--r--magic/Magdir/dact10
-rw-r--r--magic/Magdir/database8
-rw-r--r--magic/Magdir/filesystems3
-rw-r--r--magic/Magdir/flash2
-rw-r--r--magic/Magdir/games127
-rw-r--r--magic/Magdir/geos19
-rw-r--r--magic/Magdir/gnu30
-rw-r--r--magic/Magdir/images9
-rw-r--r--magic/Magdir/intel12
-rw-r--r--magic/Magdir/jpeg10
-rw-r--r--magic/Magdir/linux9
-rw-r--r--magic/Magdir/macintosh213
-rw-r--r--magic/Magdir/msdos44
-rw-r--r--magic/Magdir/netscape3
-rw-r--r--magic/Magdir/os220
-rw-r--r--magic/Magdir/palm10
-rw-r--r--magic/Magdir/python2
-rw-r--r--magic/Magdir/sgml3
-rw-r--r--magic/Magdir/sun15
-rw-r--r--magic/Magdir/ti-8x2
-rw-r--r--magic/Magdir/vmware6
-rw-r--r--magic/Magdir/vorbis4
-rw-r--r--magic/Magdir/wordprocessors6
30 files changed, 475 insertions, 162 deletions
diff --git a/magic/Magdir/amigaos b/magic/Magdir/amigaos
index 4d655e91..f7acbcf0 100644
--- a/magic/Magdir/amigaos
+++ b/magic/Magdir/amigaos
@@ -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>
0 beshort 0x0f00 AmigaOS bitmap font
diff --git a/magic/Magdir/animation b/magic/Magdir/animation
index e9ebf08d..815a2088 100644
--- a/magic/Magdir/animation
+++ b/magic/Magdir/animation
@@ -121,7 +121,7 @@
#From: Johan Gade <jgade@diku.dk>
# 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
@@ -225,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>, 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 --git a/magic/Magdir/archive b/magic/Magdir/archive
index 35a6f1e2..d27e39b7 100644
--- a/magic/Magdir/archive
+++ b/magic/Magdir/archive
@@ -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>
-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>
diff --git a/magic/Magdir/audio b/magic/Magdir/audio
index ed4c5bdd..17011b65 100644
--- a/magic/Magdir/audio
+++ b/magic/Magdir/audio
@@ -337,3 +337,6 @@
0 string A#S#C#S#S#L#V#3 Synthesizer Generator or Kimwitu data
# Kimwitu++ uses a slightly different magic
0 string A#S#C#S#S#L#HUB Kimwitu++ data
+
+# From "Simon Hosie
+0 string TFMX-SONG TFMX module sound data
diff --git a/magic/Magdir/c-lang b/magic/Magdir/c-lang
index 2d350f6d..1dcf6368 100644
--- a/magic/Magdir/c-lang
+++ b/magic/Magdir/c-lang
@@ -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>
0 string cscope cscope reference data
diff --git a/magic/Magdir/cad b/magic/Magdir/cad
index 911ab5ee..92aa837e 100644
--- a/magic/Magdir/cad
+++ b/magic/Magdir/cad
@@ -31,3 +31,6 @@
>>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 --git a/magic/Magdir/console b/magic/Magdir/console
index d3fcc1ad..7f5f5ec4 100644
--- a/magic/Magdir/console
+++ b/magic/Magdir/console
@@ -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>) :
0 string PS-X\ EXE Sony Playstation executable
# Area:
>113 string x (%s)
+
+#------------------------------------------------------------------------------
+# Microsoft Xbox executables .xbe (Esa Hyytiä <ehyytia@cc.hut.fi>)
+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 --git a/magic/Magdir/dact b/magic/Magdir/dact
new file mode 100644
index 00000000..5cca8d96
--- /dev/null
+++ b/magic/Magdir/dact
@@ -0,0 +1,10 @@
+
+#------------------------------------------------------------------------------
+# dact: file(1) magic for DACT compressed files
+#
+0 long 0x444354C3 DACT compressed data
+>4 byte >-1 (version %i.
+>5 byte >-1 $BS%i.
+>6 byte >-1 $BS%i)
+>7 long >0 $BS, original size: %i bytes
+>15 long >30 $BS, block size: %i bytes
diff --git a/magic/Magdir/database b/magic/Magdir/database
index 9a81c631..f31aee50 100644
--- a/magic/Magdir/database
+++ b/magic/Magdir/database
@@ -192,4 +192,12 @@
2 string ICE ICE authority data
# X11 Xauthority file (Wolfram Kleff)
+10 string MIT-MAGIC-COOKIE-1 X11 Xauthority data
+11 string MIT-MAGIC-COOKIE-1 X11 Xauthority data
+12 string MIT-MAGIC-COOKIE-1 X11 Xauthority data
+13 string MIT-MAGIC-COOKIE-1 X11 Xauthority data
14 string MIT-MAGIC-COOKIE-1 X11 Xauthority data
+15 string MIT-MAGIC-COOKIE-1 X11 Xauthority data
+16 string MIT-MAGIC-COOKIE-1 X11 Xauthority data
+17 string MIT-MAGIC-COOKIE-1 X11 Xauthority data
+18 string MIT-MAGIC-COOKIE-1 X11 Xauthority data
diff --git a/magic/Magdir/filesystems b/magic/Magdir/filesystems
index df259c55..c7985258 100644
--- a/magic/Magdir/filesystems
+++ b/magic/Magdir/filesystems
@@ -332,3 +332,6 @@
>4 string PPCBoot
>>12 string x version %s
+# JFFS2 file system
+0 leshort 0x1984 Linux old jffs2 filesystem data little endian
+0 lelong 0xe0011985 Linux jffs2 filesystem data little endian
diff --git a/magic/Magdir/flash b/magic/Magdir/flash
index 0db9bfe2..2f343d8c 100644
--- a/magic/Magdir/flash
+++ b/magic/Magdir/flash
@@ -8,6 +8,8 @@
#
0 string FWS Macromedia Flash data,
>3 byte x version %d
+0 string CWS Macromedia Flash data (compressed),
+>3 byte x version %d
#
# From Dave Wilson
0 string AGD4\xbe\xb8\xbb\xcb\x00 Macromedia Freehand 9 Document
diff --git a/magic/Magdir/games b/magic/Magdir/games
index ff0f4fae..476be171 100644
--- a/magic/Magdir/games
+++ b/magic/Magdir/games
@@ -24,3 +24,130 @@
>4 long 0x2E III Map file (BSP)
0 string IDS2 Quake II SP2 sprite file
+
+#---------------------------------------------------------------------------
+# Doom and Quake
+# submitted by Nicolas Patrois
+
+# DOOM
+
+0 string IWAD DOOM or DOOM ][ world
+0 string PWAD DOOM or DOOM ][ extension world
+
+0 string \xcb\x1dBoom\xe6\xff\x03\x01 Boom or linuxdoom demo
+# some doom lmp files don't match, I've got one beginning with \x6d\x02\x01\x01
+
+24 string LxD\ 203 Linuxdoom save
+>0 string x , name=%s
+>44 string x , world=%s
+
+# Quake
+
+0 string PACK Quake I or II world or extension
+
+#0 string -1\x0a Quake I demo
+#>30 string x version %.4s
+#>61 string x level %s
+
+#0 string 5\x0a Quake I save
+
+# The levels
+
+# Quake 1
+
+0 string 5\x0aIntroduction Quake I save: start Introduction
+0 string 5\x0athe_Slipgate_Complex Quake I save: e1m1 The slipgate complex
+0 string 5\x0aCastle_of_the_Damned Quake I save: e1m2 Castle of the damned
+0 string 5\x0athe_Necropolis Quake I save: e1m3 The necropolis
+0 string 5\x0athe_Grisly_Grotto Quake I save: e1m4 The grisly grotto
+0 string 5\x0aZiggurat_Vertigo Quake I save: e1m8 Ziggurat vertigo (secret)
+0 string 5\x0aGloom_Keep Quake I save: e1m5 Gloom keep
+0 string 5\x0aThe_Door_To_Chthon Quake I save: e1m6 The door to Chthon
+0 string 5\x0aThe_House_of_Chthon Quake I save: e1m7 The house of Chthon
+0 string 5\x0athe_Installation Quake I save: e2m1 The installation
+0 string 5\x0athe_Ogre_Citadel Quake I save: e2m2 The ogre citadel
+0 string 5\x0athe_Crypt_of_Decay Quake I save: e2m3 The crypt of decay (dopefish lives!)
+0 string 5\x0aUnderearth Quake I save: e2m7 Underearth (secret)
+0 string 5\x0athe_Ebon_Fortress Quake I save: e2m4 The ebon fortress
+0 string 5\x0athe_Wizard's_Manse Quake I save: e2m5 The wizard's manse
+0 string 5\x0athe_Dismal_Oubliette Quake I save: e2m6 The dismal oubliette
+0 string 5\x0aTermination_Central Quake I save: e3m1 Termination central
+0 string 5\x0aVaults_of_Zin Quake I save: e3m2 Vaults of Zin
+0 string 5\x0athe_Tomb_of_Terror Quake I save: e3m3 The tomb of terror
+0 string 5\x0aSatan's_Dark_Delight Quake I save: e3m4 Satan's dark delight
+0 string 5\x0athe_Haunted_Halls Quake I save: e3m7 The haunted halls (secret)
+0 string 5\x0aWind_Tunnels Quake I save: e3m5 Wind tunnels
+0 string 5\x0aChambers_of_Torment Quake I save: e3m6 Chambers of torment
+0 string 5\x0athe_Sewage_System Quake I save: e4m1 The sewage system
+0 string 5\x0aThe_Tower_of_Despair Quake I save: e4m2 The tower of despair
+0 string 5\x0aThe_Elder_God_Shrine Quake I save: e4m3 The elder god shrine
+0 string 5\x0athe_Palace_of_Hate Quake I save: e4m4 The palace of hate
+0 string 5\x0aHell's_Atrium Quake I save: e4m5 Hell's atrium
+0 string 5\x0athe_Nameless_City Quake I save: e4m8 The nameless city (secret)
+0 string 5\x0aThe_Pain_Maze Quake I save: e4m6 The pain maze
+0 string 5\x0aAzure_Agony Quake I save: e4m7 Azure agony
+0 string 5\x0aShub-Niggurath's_Pit Quake I save: end Shub-Niggurath's pit
+
+# Quake DeathMatch levels
+
+0 string 5\x0aPlace_of_Two_Deaths Quake I save: dm1 Place of two deaths
+0 string 5\x0aClaustrophobopolis Quake I save: dm2 Claustrophobopolis
+0 string 5\x0aThe_Abandoned_Base Quake I save: dm3 The abandoned base
+0 string 5\x0aThe_Bad_Place Quake I save: dm4 The bad place
+0 string 5\x0aThe_Cistern Quake I save: dm5 The cistern
+0 string 5\x0aThe_Dark_Zone Quake I save: dm6 The dark zone
+
+# Scourge of Armagon
+
+0 string 5\x0aCommand_HQ Quake I save: start Command HQ
+0 string 5\x0aThe_Pumping_Station Quake I save: hip1m1 The pumping station
+0 string 5\x0aStorage_Facility Quake I save: hip1m2 Storage facility
+0 string 5\x0aMilitary_Complex Quake I save: hip1m5 Military complex (secret)
+0 string 5\x0athe_Lost_Mine Quake I save: hip1m3 The lost mine
+0 string 5\x0aResearch_Facility Quake I save: hip1m4 Research facility
+0 string 5\x0aAncient_Realms Quake I save: hip2m1 Ancient realms
+0 string 5\x0aThe_Gremlin's_Domain Quake I save: hip2m6 The gremlin's domain (secret)
+0 string 5\x0aThe_Black_Cathedral Quake I save: hip2m2 The black cathedral
+0 string 5\x0aThe_Catacombs Quake I save: hip2m3 The catacombs
+0 string 5\x0athe_Crypt__ Quake I save: hip2m4 The crypt
+0 string 5\x0aMortum's_Keep Quake I save: hip2m5 Mortum's keep
+0 string 5\x0aTur_Torment Quake I save: hip3m1 Tur torment
+0 string 5\x0aPandemonium Quake I save: hip3m2 Pandemonium
+0 string 5\x0aLimbo Quake I save: hip3m3 Limbo
+0 string 5\x0athe_Edge_of_Oblivion Quake I save: hipdm1 The edge of oblivion (secret)
+0 string 5\x0aThe_Gauntlet Quake I save: hip3m4 The gauntlet
+0 string 5\x0aArmagon's_Lair Quake I save: hipend Armagon's lair
+
+# Malice
+
+0 string 5\x0aThe_Academy Quake I save: start The academy
+0 string 5\x0aThe_Lab Quake I save: d1 The lab
+0 string 5\x0aArea_33 Quake I save: d1b Area 33
+0 string 5\x0aSECRET_MISSIONS Quake I save: d3b Secret missions
+0 string 5\x0aThe_Hospital Quake I save: d10 The hospital (secret)
+0 string 5\x0aThe_Genetics_Lab Quake I save: d11 The genetics lab (secret)
+0 string 5\x0aBACK_2_MALICE Quake I save: d4b Back to Malice
+0 string 5\x0aArea44 Quake I save: d1c Area 44
+0 string 5\x0aTakahiro_Towers Quake I save: d2 Takahiro towers
+0 string 5\x0aA_Rat's_Life Quake I save: d3 A rat's life
+0 string 5\x0aInto_The_Flood Quake I save: d4 Into the flood
+0 string 5\x0aThe_Flood Quake I save: d5 The flood
+0 string 5\x0aNuclear_Plant Quake I save: d6 Nuclear plant
+0 string 5\x0aThe_Incinerator_Plant Quake I save: d7 The incinerator plant
+0 string 5\x0aThe_Foundry Quake I save: d7b The foundry
+0 string 5\x0aThe_Underwater_Base Quake I save: d8 The underwater base
+0 string 5\x0aTakahiro_Base Quake I save: d9 Takahiro base
+0 string 5\x0aTakahiro_Laboratories Quake I save: d12 Takahiro laboratories
+0 string 5\x0aStayin'_Alive Quake I save: d13 Stayin' alive
+0 string 5\x0aB.O.S.S._HQ Quake I save: d14 B.O.S.S. HQ
+0 string 5\x0aSHOWDOWN! Quake I save: d15 Showdown!
+
+# Malice DeathMatch levels
+
+0 string 5\x0aThe_Seventh_Precinct Quake I save: ddm1 The seventh precinct
+0 string 5\x0aSub_Station Quake I save: ddm2 Sub station
+0 string 5\x0aCrazy_Eights! Quake I save: ddm3 Crazy eights!
+0 string 5\x0aEast_Side_Invertationa Quake I save: ddm4 East side invertationa
+0 string 5\x0aSlaughterhouse Quake I save: ddm5 Slaughterhouse
+0 string 5\x0aDOMINO Quake I save: ddm6 Domino
+0 string 5\x0aSANDRA'S_LADDER Quake I save: ddm7 Sandra's ladder
diff --git a/magic/Magdir/geos b/magic/Magdir/geos
new file mode 100644
index 00000000..af1df7b7
--- /dev/null
+++ b/magic/Magdir/geos
@@ -0,0 +1,19 @@
+
+#------------------------------------------------------------------------------
+# GEOS files (Vidar Madsen, vidar@gimp.org)
+# semi-commonly used in embedded and handheld systems.
+0 belong 0xc745c153 GEOS
+>40 byte 1 executable
+>40 byte 2 VMFile
+>40 byte 3 binary
+>40 byte 4 directory label
+>40 byte <1 unknown
+>40 byte >4 unknown
+>4 string >\0 \b, name "%s"
+#>44 short x \b, version %d
+#>46 short x \b.%d
+#>48 short x \b, rev %d
+#>50 short x \b.%d
+#>52 short x \b, proto %d
+#>54 short x \br%d
+#>168 string >\0 \b, copyright "%s"
diff --git a/magic/Magdir/gnu b/magic/Magdir/gnu
index a385fc97..e84695a5 100644
--- a/magic/Magdir/gnu
+++ b/magic/Magdir/gnu
@@ -10,3 +10,33 @@
# message catalogs, from Mitchum DSouza <m.dsouza@mrc-apu.cam.ac.uk>
0 string *nazgul* Nazgul style compiled message catalog
>8 lelong >0 \b, version %ld
+# GnuPG
+# The format is very similar to pgp
+0 string \001gpg GPG key trust database
+>4 byte x version %d
+0 beshort 0x9901 GPG key public ring
+# This magic is not particularly good, as the keyrings don't have true
+# magic. Nevertheless, it covers many keyrings.
+
+# Gnumeric spreadsheet
+# This entry is only semi-helpful, as Gnumeric compresses its files, so
+# they will ordinarily reported as "compressed", but at least -z helps
+39 string =<gmr:Workbook Gnumeric spreadsheet
+
+#------------------------------------------------------------------------------
+# gcc: file(1) magic for GCC special files
+#
+0 string gpch GCC precompiled header
+
+# The version field is annoying. It's 3 characters, not zero-terminated.
+>5 byte x (version %c
+>6 byte x \b%c
+>7 byte x \b%c)
+
+# 67 = 'C', 111 = 'o', 43 = '+', 79 = 'O'
+>4 byte 67 for C
+>4 byte 111 for Objective C
+>4 byte 43 for C++
+>4 byte 79 for Objective C++
+
+
diff --git a/magic/Magdir/images b/magic/Magdir/images
index 1a1fdc08..61792c02 100644
--- a/magic/Magdir/images
+++ b/magic/Magdir/images
@@ -164,10 +164,11 @@
>>18 lelong x \b, %d x
>>22 lelong x %d x
>>28 leshort x %d
-0 string IC PC icon data
-0 string PI PC pointer image data
-0 string CI PC color icon data
-0 string CP PC color pointer image data
+# Too simple - MPi
+#0 string IC PC icon data
+#0 string PI PC pointer image data
+#0 string CI PC color icon data
+#0 string CP PC color pointer image data
# Conflicts with other entries [BABYL]
#0 string BA PC bitmap array data
diff --git a/magic/Magdir/intel b/magic/Magdir/intel
index d450e266..00942c2b 100644
--- a/magic/Magdir/intel
+++ b/magic/Magdir/intel
@@ -33,3 +33,15 @@
0 leshort =0514 80386 COFF executable
>12 lelong >0 not stripped
>22 leshort >0 - version %ld
+
+# rom: file(1) magic for BIOS ROM Extensions found in intel machines
+# mapped into memory between 0xC0000 and 0xFFFFF
+# From Gürkan Sengün <gurkan@linuks.mine.nu>, www.linuks.mine.nu
+0 beshort 0x55AA BIOS (ia32) ROM Ext.
+>5 string USB USB
+>7 string LDR UNDI image
+>30 string IBM IBM comp. Video
+>26 string Adaptec Adaptec
+>28 string Adaptec Adaptec
+>42 string PROMISE Promise
+>2 byte x (%d*512)
diff --git a/magic/Magdir/jpeg b/magic/Magdir/jpeg
index bedc6c99..e118846c 100644
--- a/magic/Magdir/jpeg
+++ b/magic/Magdir/jpeg
@@ -19,9 +19,9 @@
>11 byte x \b %d.
>12 byte x \b%02d
# Next, the resolution or aspect ratio of the image:
->13 byte 0 \b, aspect ratio
->13 byte 1 \b, resolution (DPI)
->13 byte 2 \b, resolution (DPCM)
+#>13 byte 0 \b, aspect ratio
+#>13 byte 1 \b, resolution (DPI)
+#>13 byte 2 \b, resolution (DPCM)
#>4 beshort x \b, segment length %d
# Next, show thumbnail info, if it exists:
>18 byte !0 \b, thumbnail %dx
@@ -54,8 +54,8 @@
# I've commented-out quantisation table reporting. I doubt anyone cares yet.
#>(4.S+5) byte 0xDB \b, quantisation table
#>>(4.S+6) beshort x \b length=%d
->14 beshort x \b, %d x
->16 beshort x \b %d
+#>14 beshort x \b, %d x
+#>16 beshort x \b %d
# HSI is Handmade Software's proprietary JPEG encoding scheme
0 string hsi1 JPEG image data, HSI proprietary
diff --git a/magic/Magdir/linux b/magic/Magdir/linux
index a0ea7e84..1b8961c2 100644
--- a/magic/Magdir/linux
+++ b/magic/Magdir/linux
@@ -44,11 +44,6 @@
# this can be overridden by the DOS executable (COM) entry
2 string LILO Linux/i386 LILO boot/chain loader
#
-# Debian Packages, from Peter Tobias <tobias@server.et-inf.fho-emden.de>
-0 string 0.9
->8 byte 0x0a old Debian Binary Package
->>3 byte >0 \b, created by dpkg 0.9%c
->>4 byte >0 pl%c
# PSF fonts, from H. Peter Anvin <hpa@yggdrasil.com>
0 leshort 0x0436 Linux/i386 PC Screen Font data,
>2 byte 0 256 characters, no directory,
@@ -102,10 +97,10 @@
>0x1e3 string Loading version 1.3.79 or older
>0x1e9 string Loading from prehistoric times
-# System.map files - Nicol=EF=BF=BDs Lichtmaier <nick@debian.org>
+# System.map files - Nicolás Lichtmaier <nick@debian.org>
8 string \ A\ _text Linux kernel symbol map text
-# LSM entries - Nicol=EF=BF=BDs Lichtmaier <nick@debian.org>
+# LSM entries - Nicolás Lichtmaier <nick@debian.org>
0 string Begin3 Linux Software Map entry text
0 string Begin4 Linux Software Map entry text (new format)
diff --git a/magic/Magdir/macintosh b/magic/Magdir/macintosh
index 1e8e5f3d..b4a32d0e 100644
--- a/magic/Magdir/macintosh
+++ b/magic/Magdir/macintosh
@@ -88,7 +88,8 @@
# that the first one be 0x80, 0x81, 0x82, or 0x83, and that the second
# be 0x81. This works for the files I have, but maybe not for everyone's.
-122 beshort&0xFCFF 0x8081 Macintosh MacBinary data
+# Unfortunately, this magic is quite weak - MPi
+#122 beshort&0xFCFF 0x8081 Macintosh MacBinary data
# MacBinary I doesn't have the version number field at all, but MacBinary II
# has been in use since 1987 so I hope there aren't many really old files
@@ -111,117 +112,117 @@
# >73 byte&0x10 0x40 \b, invisible
# >73 byte&0x10 0x80 \b, locked
->65 string x \b, type "%4.4s"
+#>65 string x \b, type "%4.4s"
->65 string 8BIM (PhotoShop)
->65 string ALB3 (PageMaker 3)
->65 string ALB4 (PageMaker 4)
->65 string ALT3 (PageMaker 3)
->65 string APPL (application)
->65 string AWWP (AppleWorks word processor)
->65 string CIRC (simulated circuit)
->65 string DRWG (MacDraw)
->65 string EPSF (Encapsulated PostScript)
->65 string FFIL (font suitcase)
->65 string FKEY (function key)
->65 string FNDR (Macintosh Finder)
->65 string GIFf (GIF image)
->65 string Gzip (GNU gzip)
->65 string INIT (system extension)
->65 string LIB\ (library)
->65 string LWFN (PostScript font)
->65 string MSBC (Microsoft BASIC)
->65 string PACT (Compact Pro archive)
->65 string PDF\ (Portable Document Format)
->65 string PICT (picture)
->65 string PNTG (MacPaint picture)
->65 string PREF (preferences)
->65 string PROJ (Think C project)
->65 string QPRJ (Think Pascal project)
->65 string SCFL (Defender scores)
->65 string SCRN (startup screen)
->65 string SITD (StuffIt Deluxe)
->65 string SPn3 (SuperPaint)
->65 string STAK (HyperCard stack)
->65 string Seg\ (StuffIt segment)
->65 string TARF (Unix tar archive)
->65 string TEXT (ASCII)
->65 string TIFF (TIFF image)
->65 string TOVF (Eudora table of contents)
->65 string WDBN (Microsoft Word word processor)
->65 string WORD (MacWrite word processor)
->65 string XLS\ (Microsoft Excel)
->65 string ZIVM (compress (.Z))
->65 string ZSYS (Pre-System 7 system file)
->65 string acf3 (Aldus FreeHand)
->65 string cdev (control panel)
->65 string dfil (Desk Acessory suitcase)
->65 string libr (library)
->65 string nX^d (WriteNow word processor)
->65 string nX^w (WriteNow dictionary)
->65 string rsrc (resource)
->65 string scbk (Scrapbook)
->65 string shlb (shared library)
->65 string ttro (SimpleText read-only)
->65 string zsys (system file)
+#>65 string 8BIM (PhotoShop)
+#>65 string ALB3 (PageMaker 3)
+#>65 string ALB4 (PageMaker 4)
+#>65 string ALT3 (PageMaker 3)
+#>65 string APPL (application)
+#>65 string AWWP (AppleWorks word processor)
+#>65 string CIRC (simulated circuit)
+#>65 string DRWG (MacDraw)
+#>65 string EPSF (Encapsulated PostScript)
+#>65 string FFIL (font suitcase)
+#>65 string FKEY (function key)
+#>65 string FNDR (Macintosh Finder)
+#>65 string GIFf (GIF image)
+#>65 string Gzip (GNU gzip)
+#>65 string INIT (system extension)
+#>65 string LIB\ (library)
+#>65 string LWFN (PostScript font)
+#>65 string MSBC (Microsoft BASIC)
+#>65 string PACT (Compact Pro archive)
+#>65 string PDF\ (Portable Document Format)
+#>65 string PICT (picture)
+#>65 string PNTG (MacPaint picture)
+#>65 string PREF (preferences)
+#>65 string PROJ (Think C project)
+#>65 string QPRJ (Think Pascal project)
+#>65 string SCFL (Defender scores)
+#>65 string SCRN (startup screen)
+#>65 string SITD (StuffIt Deluxe)
+#>65 string SPn3 (SuperPaint)
+#>65 string STAK (HyperCard stack)
+#>65 string Seg\ (StuffIt segment)
+#>65 string TARF (Unix tar archive)
+#>65 string TEXT (ASCII)
+#>65 string TIFF (TIFF image)
+#>65 string TOVF (Eudora table of contents)
+#>65 string WDBN (Microsoft Word word processor)
+#>65 string WORD (MacWrite word processor)
+#>65 string XLS\ (Microsoft Excel)
+#>65 string ZIVM (compress (.Z))
+#>65 string ZSYS (Pre-System 7 system file)
+#>65 string acf3 (Aldus FreeHand)
+#>65 string cdev (control panel)
+#>65 string dfil (Desk Acessory suitcase)
+#>65 string libr (library)
+#>65 string nX^d (WriteNow word processor)
+#>65 string nX^w (WriteNow dictionary)
+#>65 string rsrc (resource)
+#>65 string scbk (Scrapbook)
+#>65 string shlb (shared library)
+#>65 string ttro (SimpleText read-only)
+#>65 string zsys (system file)
->69 string x \b, creator "%4.4s"
+#>69 string x \b, creator "%4.4s"
# Somewhere, Apple has a repository of registered Creator IDs. These are
# just the ones that I happened to have files from and was able to identify.
->69 string 8BIM (Adobe Photoshop)
->69 string ALD3 (PageMaker 3)
->69 string ALD4 (PageMaker 4)
->69 string ALFA (Alpha editor)
->69 string APLS (Apple Scanner)
->69 string APSC (Apple Scanner)
->69 string BRKL (Brickles)
->69 string BTFT (BitFont)
->69 string CCL2 (Common Lisp 2)
->69 string CCL\ (Common Lisp)
->69 string CDmo (The Talking Moose)
->69 string CPCT (Compact Pro)
->69 string CSOm (Eudora)
->69 string DMOV (Font/DA Mover)
->69 string DSIM (DigSim)
->69 string EDIT (Macintosh Edit)
->69 string ERIK (Macintosh Finder)
->69 string EXTR (self-extracting archive)
->69 string Gzip (GNU gzip)
->69 string KAHL (Think C)
->69 string LWFU (LaserWriter Utility)
->69 string LZIV (compress)
->69 string MACA (MacWrite)
->69 string MACS (Macintosh operating system)
->69 string MAcK (MacKnowledge terminal emulator)
->69 string MLND (Defender)
->69 string MPNT (MacPaint)
->69 string MSBB (Microsoft BASIC (binary))
->69 string MSWD (Microsoft Word)
->69 string NCSA (NCSA Telnet)
->69 string PJMM (Think Pascal)
->69 string PSAL (Hunt the Wumpus)
->69 string PSI2 (Apple File Exchange)
->69 string R*ch (BBEdit)
->69 string RMKR (Resource Maker)
->69 string RSED (Resource Editor)
->69 string Rich (BBEdit)
->69 string SIT! (StuffIt)
->69 string SPNT (SuperPaint)
->69 string Unix (NeXT Mac filesystem)
->69 string VIM! (Vim editor)
->69 string WILD (HyperCard)
->69 string XCEL (Microsoft Excel)
->69 string aCa2 (Fontographer)
->69 string aca3 (Aldus FreeHand)
->69 string dosa (Macintosh MS-DOS file system)
->69 string movr (Font/DA Mover)
->69 string nX^n (WriteNow)
->69 string pdos (Apple ProDOS file system)
->69 string scbk (Scrapbook)
->69 string ttxt (SimpleText)
->69 string ufox (Foreign File Access)
+#>69 string 8BIM (Adobe Photoshop)
+#>69 string ALD3 (PageMaker 3)
+#>69 string ALD4 (PageMaker 4)
+#>69 string ALFA (Alpha editor)
+#>69 string APLS (Apple Scanner)
+#>69 string APSC (Apple Scanner)
+#>69 string BRKL (Brickles)
+#>69 string BTFT (BitFont)
+#>69 string CCL2 (Common Lisp 2)
+#>69 string CCL\ (Common Lisp)
+#>69 string CDmo (The Talking Moose)
+#>69 string CPCT (Compact Pro)
+#>69 string CSOm (Eudora)
+#>69 string DMOV (Font/DA Mover)
+#>69 string DSIM (DigSim)
+#>69 string EDIT (Macintosh Edit)
+#>69 string ERIK (Macintosh Finder)
+#>69 string EXTR (self-extracting archive)
+#>69 string Gzip (GNU gzip)
+#>69 string KAHL (Think C)
+#>69 string LWFU (LaserWriter Utility)
+#>69 string LZIV (compress)
+#>69 string MACA (MacWrite)
+#>69 string MACS (Macintosh operating system)
+#>69 string MAcK (MacKnowledge terminal emulator)
+#>69 string MLND (Defender)
+#>69 string MPNT (MacPaint)
+#>69 string MSBB (Microsoft BASIC (binary))
+#>69 string MSWD (Microsoft Word)
+#>69 string NCSA (NCSA Telnet)
+#>69 string PJMM (Think Pascal)
+#>69 string PSAL (Hunt the Wumpus)
+#>69 string PSI2 (Apple File Exchange)
+#>69 string R*ch (BBEdit)
+#>69 string RMKR (Resource Maker)
+#>69 string RSED (Resource Editor)
+#>69 string Rich (BBEdit)
+#>69 string SIT! (StuffIt)
+#>69 string SPNT (SuperPaint)
+#>69 string Unix (NeXT Mac filesystem)
+#>69 string VIM! (Vim editor)
+#>69 string WILD (HyperCard)
+#>69 string XCEL (Microsoft Excel)
+#>69 string aCa2 (Fontographer)
+#>69 string aca3 (Aldus FreeHand)
+#>69 string dosa (Macintosh MS-DOS file system)
+#>69 string movr (Font/DA Mover)
+#>69 string nX^n (WriteNow)
+#>69 string pdos (Apple ProDOS file system)
+#>69 string scbk (Scrapbook)
+#>69 string ttxt (SimpleText)
+#>69 string ufox (Foreign File Access)
# Just in case...
diff --git a/magic/Magdir/msdos b/magic/Magdir/msdos
index 35848641..f2c1e6f3 100644
--- a/magic/Magdir/msdos
+++ b/magic/Magdir/msdos
@@ -181,9 +181,6 @@
# Help files
0 string ?_\3\0 MS Windows Help Data
-# Microsoft CAB distribution format Dale Worley <root@dworley.ny.mediaone.net>
-0 string MSCF\000\000\000\000 Microsoft CAB file
-
# DeIsL1.isu what this is I don't know
0 string \161\250\000\000\001\002 DeIsL1.isu whatever that is
@@ -239,11 +236,6 @@
>>8 byte >0 \b, %d-colors
-# True Type fonts currently misidentified as raw G3 data
-
-0 string \000\001\000\000\000 MS-Windows true type font .ttf
-
-
# .chr files
0 string PK\010\010BGI Borland font
>4 string >\0 %s
@@ -279,7 +271,8 @@
0 string DCU1 Borland Delphi .DCU file
0 string !<spell> MKS Spell hash list (old format)
0 string !<spell2> MKS Spell hash list
-0 string AH Halo(TM) bitmapped font file
+# Too simple - MPi
+#0 string AH Halo(TM) bitmapped font file
0 lelong 0x08086b70 TurboC BGI file
0 lelong 0x08084b50 TurboC Font file
@@ -332,3 +325,36 @@
>9 pstring x '%s'
0 beshort 0xFB01 QDOS object
>2 pstring x '%s'
+
+#------------------------------------------------------------------------------
+# From Stuart Caie <kyzer@4u.net> (developer of cabextract)
+# Microsoft Cabinet files
+0 string MSCF\0\0\0\0 Microsoft Cabinet file
+>8 lelong x \b, %u bytes
+>28 leshort 1 \b, 1 file
+>28 leshort >1 \b, %u files
+
+# InstallShield Cabinet files
+0 string ISc( InstallShield Cabinet file
+>5 byte&0xf0 =0x60 version 6,
+>5 byte&0xf0 !0x60 version 4/5,
+>(12.l+40) lelong x %u files
+
+# Windows CE package files
+0 string MSCE\0\0\0\0 Microsoft WinCE install header
+>20 lelong 0 \b, architecture-independent
+>20 lelong 103 \b, Hitachi SH3
+>20 lelong 104 \b, Hitachi SH4
+>20 lelong 0xA11 \b, StrongARM
+>20 lelong 4000 \b, MIPS R4000
+>20 lelong 10003 \b, Hitachi SH3
+>20 lelong 10004 \b, Hitachi SH3E
+>20 lelong 10005 \b, Hitachi SH4
+>20 lelong 70001 \b, ARM 7TDMI
+>52 leshort 1 \b, 1 file
+>52 leshort >1 \b, %u files
+>56 leshort 1 \b, 1 registry entry
+>56 leshort >1 \b, %u registry entries
+
+# Outlook Personal Folders
+0 lelong 0x4E444221 Microsoft Outlook binary email folder
diff --git a/magic/Magdir/netscape b/magic/Magdir/netscape
index eb4361c0..f14227db 100644
--- a/magic/Magdir/netscape
+++ b/magic/Magdir/netscape
@@ -8,6 +8,9 @@
# Netscape Address book .nab
0 string \000\017\102\104\000\000\000\000\000\000\001\000\000\000\000\002\000\000\000\002\000\000\004\000 Netscape Address book
+# Netscape Communicator address book
+0 string \000\017\102\111 Netscape Communicator address book
+
# .snm Caches
0 string #\ Netscape\ folder\ cache Netscape folder cache
0 string \000\036\204\220\000 Netscape folder cache
diff --git a/magic/Magdir/os2 b/magic/Magdir/os2
index 7ae67c7c..e4920311 100644
--- a/magic/Magdir/os2
+++ b/magic/Magdir/os2
@@ -11,16 +11,16 @@
# OS/2 URL objects
# Provided 1998/08/22 by
# David Mediavilla <davidme.news@REMOVEIFNOTSPAMusa.net>
-0 string http: OS/2 URL object text
->5 string >\ (WWW) <http:%s>
-0 string mailto: OS/2 URL object text
->7 string >\ (email) <%s>
-0 string news: OS/2 URL object text
->5 string >\ (Usenet) <%s>
-0 string ftp: OS/2 URL object text
->4 string >\ (FTP) <ftp:%s>
-0 string file: OS/2 URL object text
->5 string >\ (Local file) <%s>
+#0 string http: OS/2 URL object text
+#>5 string >\ (WWW) <http:%s>
+#0 string mailto: OS/2 URL object text
+#>7 string >\ (email) <%s>
+#0 string news: OS/2 URL object text
+#>5 string >\ (Usenet) <%s>
+#0 string ftp: OS/2 URL object text
+#>4 string >\ (FTP) <ftp:%s>
+#0 string file: OS/2 URL object text
+#>5 string >\ (Local file) <%s>
# >>>>> OS/2 INF/HLP <<<<< (source: Daniel Dissett ddissett@netcom.com)
# Carl Hauser (chauser.parc@xerox.com) and
diff --git a/magic/Magdir/palm b/magic/Magdir/palm
index 01de0041..79af1f00 100644
--- a/magic/Magdir/palm
+++ b/magic/Magdir/palm
@@ -65,7 +65,7 @@
# annotations.
# For other versions, just outputs version.
#
-0x3C string zTXT A GutenPalm zTXT e-book
+60 string zTXT A GutenPalm zTXT e-book
>0 string >\0 "%s"
>(0x4E.L) byte 0
>>(0x4E.L+1) byte x (v0.%02d)
@@ -81,7 +81,11 @@
>>(0x4E.L+1) byte x %02d)
# Palm OS .prc file types
-0x3C string libr Palm OS dynamic library data
+60 string libr Palm OS dynamic library data
>0 string >\0 "%s"
-0x3C string ptch Palm OS operating system patch data
+60 string ptch Palm OS operating system patch data
>0 string >\0 "%s"
+
+# Mobipocket (www.mobipocket.com), donated by Carl Witty
+60 string BOOKMOBI Mobipocket E-book
+>0 string >\0 "%s"
diff --git a/magic/Magdir/python b/magic/Magdir/python
index 1932fd26..ec4c1216 100644
--- a/magic/Magdir/python
+++ b/magic/Magdir/python
@@ -11,4 +11,4 @@
0 belong 0x87c60d0a python 2.0 byte-compiled
0 belong 0x2aeb0d0a python 2.1 byte-compiled
0 belong 0x2ded0d0a python 2.2 byte-compiled
-#0 belong 0x31f20d0a python 2.3 byte-compiled
+0 belong 0x3bf20d0a python 2.3 byte-compiled
diff --git a/magic/Magdir/sgml b/magic/Magdir/sgml
index a333818e..9f335292 100644
--- a/magic/Magdir/sgml
+++ b/magic/Magdir/sgml
@@ -4,7 +4,7 @@
# HyperText Markup Language (HTML) is an SGML document type,
# from Daniel Quinlan (quinlan@yggdrasil.com)
# adapted to string extenstions by Anthon van der Neut <anthon@mnt.org)
-0 string/cB \<!doctype\ html HTML document text
+0 string/cB \<!DOCTYPE\ html HTML document text
0 string/cb \<head HTML document text
0 string/cb \<title HTML document text
0 string/cb \<html HTML document text
@@ -13,6 +13,7 @@
# from Marc Prud'hommeaux (marc@apocalypse.org)
0 string/cb \<?xml XML document text
0 string \<?xml\ version " XML
+0 string \<?xml\ version=" XML
>15 string >\0 %.3s document text
>>23 string \<xsl:stylesheet (XSL stylesheet)
>>24 string \<xsl:stylesheet (XSL stylesheet)
diff --git a/magic/Magdir/sun b/magic/Magdir/sun
index 55c8ba39..4c43b27a 100644
--- a/magic/Magdir/sun
+++ b/magic/Magdir/sun
@@ -106,3 +106,18 @@
36 string acspMSFT Microsoft ICM Color Profile
# Sun KCMS
36 string acsp Kodak Color Management System, ICC Profile
+
+#---------------------------------------------------------------------------
+# The following entries have been tested by Duncan Laurie <duncan@sun.com> (a
+# lead Sun/Cobalt developer) who agrees that they are good and worthy of
+# inclusion.
+
+# Boot ROM images for Sun/Cobalt Linux server appliances
+0 string Cobalt\ Networks\ Inc.\nFirmware\ v Paged COBALT boot rom
+>38 string x V%.4s
+
+# New format for Sun/Cobalt boot ROMs is annoying, it stores the version code
+# at the very end where file(1) can't get it.
+0 string CRfs COBALT boot rom data (Flat boot rom or file system)
+
+
diff --git a/magic/Magdir/ti-8x b/magic/Magdir/ti-8x
index 25cf00e0..89e22040 100644
--- a/magic/Magdir/ti-8x
+++ b/magic/Magdir/ti-8x
@@ -1,5 +1,5 @@
# ------------------------------------------------------------------------
-# ti-8x: file(1) magic for the TI-8x and TI-92 Graphing Calculators.
+# ti-8x: file(1) magic for the TI-8x and TI-9x Graphing Calculators.
#
# From: Ryan McGuire (rmcguire@freenet.columbus.oh.us).
#
diff --git a/magic/Magdir/vmware b/magic/Magdir/vmware
index 857a4a94..6af543c4 100644
--- a/magic/Magdir/vmware
+++ b/magic/Magdir/vmware
@@ -3,10 +3,10 @@
# VMware specific files (deducted from version 1.1 and log file entries)
# Anthon van der Neut (anthon@mnt.org)
0 belong 0x4d52564e VMware nvram
-0 belong 0x434f5744
->8 byte 3 VMware virtual disk
+0 belong 0x434f5744 VMware
+>4 byte 3 virtual disk
>>32 lelong x (%d/
>>36 lelong x \b%d/
>>40 lelong x \b%d)
->8 byte 2 VMware undoable disk
+>4 byte 2 undoable disk
>>32 string >\0 (%s)
diff --git a/magic/Magdir/vorbis b/magic/Magdir/vorbis
index 0c533e88..e2596cbc 100644
--- a/magic/Magdir/vorbis
+++ b/magic/Magdir/vorbis
@@ -17,11 +17,11 @@
##>4 byte 0 revision 0
>4 byte 0
##>>14 lelong x (Serial %lX)
-# --- First vorbis packet - general header ---
->>28 string \x01vorbis \b, Vorbis audio,
# non-Vorbis content: FLAC (Free Loss-lessy Audio Codec,
# http://flac.sourceforge.net)
>>28 string fLaC \b, FLAC audio
+# --- First vorbis packet - general header ---
+>>28 string \x01vorbis \b, Vorbis audio,
>>>35 lelong !0 UNKNOWN VERSION %lu,
##>>>35 lelong 0 version 0,
>>>35 lelong 0
diff --git a/magic/Magdir/wordprocessors b/magic/Magdir/wordprocessors
index 563b8224..1edaf143 100644
--- a/magic/Magdir/wordprocessors
+++ b/magic/Magdir/wordprocessors
@@ -102,3 +102,9 @@
>8 long 18219264 WordPerfect graphic image (1.0)
>8 long 18219520 WordPerfect graphic image (2.0)
#end of WordPerfect type files Version 1.6 - PLEASE DO NOT REMOVE THIS LINE
+
+# Hangul (Korean) Word Processor File
+0 string HWP\ Document\ File Hangul (Korean) Word Processor File
+
+# CosmicBook, from Benoît Rouits
+0 string CSBK Ted Neslson's CosmicBook hypertext file
View Lorry Controller Status