summaryrefslogtreecommitdiffstats
path: root/contrib/file/Magdir
diff options
context:
space:
mode:
authorobrien <obrien@FreeBSD.org>2007-05-24 21:59:38 +0000
committerobrien <obrien@FreeBSD.org>2007-05-24 21:59:38 +0000
commit240c77918bbcf0d5f67799916b808b8a65d434c5 (patch)
treef1050a93b4cf4d5e56408bc87c1da5741ccf4e65 /contrib/file/Magdir
parent09615277daeb6e2f432f5fd5dbc254e4b0428f99 (diff)
downloadFreeBSD-src-240c77918bbcf0d5f67799916b808b8a65d434c5.zip
FreeBSD-src-240c77918bbcf0d5f67799916b808b8a65d434c5.tar.gz
Virgin import of Christos Zoulas's FILE 4.21.
Diffstat (limited to 'contrib/file/Magdir')
-rw-r--r--contrib/file/Magdir/animation6
-rw-r--r--contrib/file/Magdir/archive10
-rw-r--r--contrib/file/Magdir/audio19
-rw-r--r--contrib/file/Magdir/c-lang4
-rw-r--r--contrib/file/Magdir/commands2
-rw-r--r--contrib/file/Magdir/console26
-rw-r--r--contrib/file/Magdir/database4
-rw-r--r--contrib/file/Magdir/editors3
-rw-r--r--contrib/file/Magdir/elf4
-rw-r--r--contrib/file/Magdir/filesystems394
-rw-r--r--contrib/file/Magdir/fonts3
-rw-r--r--contrib/file/Magdir/images7
-rw-r--r--contrib/file/Magdir/linux10
-rw-r--r--contrib/file/Magdir/lisp14
-rw-r--r--contrib/file/Magdir/mathematica2
-rw-r--r--contrib/file/Magdir/mime2
-rw-r--r--contrib/file/Magdir/mips4
-rw-r--r--contrib/file/Magdir/misctools4
-rw-r--r--contrib/file/Magdir/msdos9
-rw-r--r--contrib/file/Magdir/os22
-rw-r--r--contrib/file/Magdir/os40049
-rw-r--r--contrib/file/Magdir/perl16
-rw-r--r--contrib/file/Magdir/revision6
-rw-r--r--contrib/file/Magdir/sgml3
-rw-r--r--contrib/file/Magdir/sql19
-rw-r--r--contrib/file/Magdir/tex28
-rw-r--r--contrib/file/Magdir/tgif2
-rw-r--r--contrib/file/Magdir/varied.out6
-rw-r--r--contrib/file/Magdir/varied.script2
-rw-r--r--contrib/file/Magdir/wordprocessors2
30 files changed, 494 insertions, 168 deletions
diff --git a/contrib/file/Magdir/animation b/contrib/file/Magdir/animation
index 95c842e..b2cdd74 100644
--- a/contrib/file/Magdir/animation
+++ b/contrib/file/Magdir/animation
@@ -320,11 +320,11 @@
#>3 byte&0x03 3 \b, NR: CCIT J.17
# MPA, M1A
-# modified by Joerg Jenderek
+# updated by Joerg Jenderek
# GRR the original test are too common for many DOS files, so test 32 <= kbits <= 448
0 beshort&0xFFFE 0xFFFE
->2 byte&0xF0 >0x0F
->>2 byte&0xF0 <0xE1 MPEG ADTS, layer I, v1
+>2 ubyte&0xF0 >0x0F
+>>2 ubyte&0xF0 <0xE1 MPEG ADTS, layer I, v1
# rate
>>>2 byte&0xF0 0x10 \b, 32 kBits
>>>2 byte&0xF0 0x20 \b, 64 kBits
diff --git a/contrib/file/Magdir/archive b/contrib/file/Magdir/archive
index e110fd4..6aed3c8 100644
--- a/contrib/file/Magdir/archive
+++ b/contrib/file/Magdir/archive
@@ -478,7 +478,7 @@
0 string HPAK HPACK archive data
# JAM Archive volume format, by Dmitry.Kohmanyuk@UA.net
-0 string \351,\001JAM\ JAM archive,
+0 string \351,\001JAM\ JAM archive,
>7 string >\0 version %.4s
>0x26 byte =0x27 -
>>0x2b string >\0 label %.11s,
@@ -723,3 +723,11 @@
>14 byte 0x54 end slice
>14 beshort 0x4e4e multi-part
>14 beshort 0x4e53 multi-part, with -S
+
+# Symbian installation files
+# http://www.thouky.co.uk/software/psifs/sis.html
+# http://developer.symbian.com/main/downloads/papers/SymbianOSv91/softwareinstallsis.pdf
+8 lelong 0x10000419 Symbian installation file
+>4 lelong 0x1000006D (EPOC release 3/4/5)
+>4 lelong 0x10003A12 (EPOC release 6)
+0 lelong 0x10201A7A Symbian installation file (Symbian OS 9.x)
diff --git a/contrib/file/Magdir/audio b/contrib/file/Magdir/audio
index fd9d771..e199988 100644
--- a/contrib/file/Magdir/audio
+++ b/contrib/file/Magdir/audio
@@ -500,13 +500,13 @@
# Since I saw only eqf files with version v1.1 I think that it's OK
>23 string x \b%.4s
# .preset
-0 string \[Equalizer\ preset\] XMMS equalizer preset
+0 string [Equalizer\ preset] XMMS equalizer preset
# .m3u
-0 string \#EXTM3U M3U playlist
+0 string #EXTM3U M3U playlist
# .pls
-0 string \[playlist\] PLS playlist
+0 string [playlist] PLS playlist
# licq.conf
-1 string \[licq\] LICQ configuration file
+1 string [licq] LICQ configuration file
# Atari ST audio files by Dirk Jagdmann <doj@cubic.org>
0 string ICE! SNDH Atari ST music
@@ -545,3 +545,14 @@
>>27 byte 113 \b, Alpha 1.13
>>27 byte 114 \b, Beta 1.14
>>27 byte 115 \b, Alpha 1.15
+
+# IMY
+# from http://filext.com/detaillist.php?extdetail=IMY
+# http://cellphones.about.com/od/cellularfaqs/f/rf_imelody.htm
+# http://download.ncl.ie/doc/api/ie/ncl/media/music/IMelody.html
+# http://www.wx800.com/msg/download/irda/iMelody.pdf
+0 string BEGIN:IMELODY iMelody Ringtone Format
+
+# From: Matthew Flaschen <matthew.flaschen@gatech.edu>
+0 string #EXTM3U M3U playlist text
+
diff --git a/contrib/file/Magdir/c-lang b/contrib/file/Magdir/c-lang
index 1dcf636..fd3f9aa 100644
--- a/contrib/file/Magdir/c-lang
+++ b/contrib/file/Magdir/c-lang
@@ -20,5 +20,5 @@
# The inverted index functionality was added some time betwen
# versions 11 and 15, so look for -q if version is above 14:
>7 string >14
->>10 regex .+\ -q\ with inverted index
->10 regex .+\ -c\ text (non-compressed)
+>>10 regex .+\ -q\ with inverted index
+>10 regex .+\ -c\ text (non-compressed)
diff --git a/contrib/file/Magdir/commands b/contrib/file/Magdir/commands
index 2bdffbe..288d3cd 100644
--- a/contrib/file/Magdir/commands
+++ b/contrib/file/Magdir/commands
@@ -53,4 +53,4 @@
0 string Zend\x00 PHP script Zend Optimizer data
-0 string \$! DCL command file
+0 string $! DCL command file
diff --git a/contrib/file/Magdir/console b/contrib/file/Magdir/console
index 65fe327..40a3c2e 100644
--- a/contrib/file/Magdir/console
+++ b/contrib/file/Magdir/console
@@ -165,3 +165,29 @@
# From: Serge van den Boom <svdb@stack.nl>
0 string \x01ZZZZZ\x01 3DO "Opera" file system
+# From Gürkan Sengün <gurkan@linuks.mine.nu>, www.linuks.mine.nu
+0 string GBS Nintendo Gameboy Music/Audio Data
+12 string GameBoy\ Music\ Module Nintendo Gameboy Music Module
+
+# Playstations Patch Files from: From: Thomas Klausner <tk@giga.or.at>
+0 string PPF30 Playstation Patch File version 3.0
+>5 byte 0 \b, PPF 1.0 patch
+>5 byte 1 \b, PPF 2.0 patch
+>5 byte 2 \b, PPF 3.0 patch
+>>56 byte 0 \b, Imagetype BIN (any)
+>>56 byte 1 \b, Imagetype GI (PrimoDVD)
+>>57 byte 0 \b, Blockcheck disabled
+>>57 byte 1 \b, Blockcheck enabled
+>>58 byte 0 \b, Undo data not available
+>>58 byte 1 \b, Undo data available
+>6 string x \b, description: %s
+
+0 string PPF20 Playstation Patch File version 2.0
+>5 byte 0 \b, PPF 1.0 patch
+>5 byte 1 \b, PPF 2.0 patch
+>>56 lelong >0 \b, size of file to patch %d
+>6 string x \b, description: %s
+
+0 string PPF10 Playstation Patch File version 1.0
+>5 byte 0 \b, Simple Encoding
+>6 string x \b, description: %s
diff --git a/contrib/file/Magdir/database b/contrib/file/Magdir/database
index b2f68d9..aef8469 100644
--- a/contrib/file/Magdir/database
+++ b/contrib/file/Magdir/database
@@ -210,7 +210,3 @@
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
-
-# SQLite (Ty Sarna)
-0 string **\ This\ file\ contains\ an\ SQLite SQLite Database
->&1 regex [^\ ]+ Version %s
diff --git a/contrib/file/Magdir/editors b/contrib/file/Magdir/editors
index 02826fa..0b15bf8 100644
--- a/contrib/file/Magdir/editors
+++ b/contrib/file/Magdir/editors
@@ -13,4 +13,5 @@
0 string VimCrypt~ Vim encrypted file data
# Vi IMproved Swap file
# by Sven Wegener <swegener@gentoo.org>
-0 string b0VIM\ Vim swap file, version %s
+0 string b0VIM\ Vim swap file
+>&0 string >\0 \b, version %s
diff --git a/contrib/file/Magdir/elf b/contrib/file/Magdir/elf
index 6c9976f..52b5e4c 100644
--- a/contrib/file/Magdir/elf
+++ b/contrib/file/Magdir/elf
@@ -101,6 +101,7 @@
>>18 leshort 88 Renesas M32R,
>>18 leshort 94 Tensilica Xtensa,
>>18 leshort 97 NatSemi 32k,
+>>18 leshort 106 Analog Devices Blackfin,
>>18 leshort 0x9026 Alpha (unofficial),
>>20 lelong 0 invalid version
>>20 lelong 1 version 1
@@ -167,8 +168,9 @@
>>>36 belong&0xffff00 &0x000400 HaL R1 Extensions Required,
>>>36 belong&0xffff00 &0x000800 Sun UltraSPARC3 Extensions Required,
>>18 beshort 20 PowerPC or cisco 4500,
->>18 beshort 21 cisco 7500,
+>>18 beshort 21 64-bit PowerPC or cisco 7500,
>>18 beshort 22 IBM S/390,
+>>18 beshort 23 Cell SPU,
>>18 beshort 24 cisco SVIP,
>>18 beshort 25 cisco 7200,
>>18 beshort 36 NEC V800 or cisco 12000,
diff --git a/contrib/file/Magdir/filesystems b/contrib/file/Magdir/filesystems
index dd4910a..eadfeb3 100644
--- a/contrib/file/Magdir/filesystems
+++ b/contrib/file/Magdir/filesystems
@@ -5,22 +5,25 @@
0 string \366\366\366\366 PC formatted floppy with no filesystem
# Sun disk labels
# From /usr/include/sun/dklabel.h:
-0774 beshort 0xdabe Sun disk label
->0 string x '%s
->>31 string >\0 \b%s
->>>63 string >\0 \b%s
->>>>95 string >\0 \b%s
->0 string x \b'
->0734 short >0 %d rpm,
->0736 short >0 %d phys cys,
->0740 short >0 %d alts/cyl,
->0746 short >0 %d interleave,
->0750 short >0 %d data cyls,
->0752 short >0 %d alt cyls,
->0754 short >0 %d heads/partition,
->0756 short >0 %d sectors/track,
->0764 long >0 start cyl %ld,
->0770 long x %ld blocks
+0774 beshort 0xdabe
+# modified by Joerg Jenderek, because original test
+# succeeds for Cabinet archive dao360.dl_ with negative blocks
+>0770 long >0 Sun disk label
+>>0 string x '%s
+>>>31 string >\0 \b%s
+>>>>63 string >\0 \b%s
+>>>>>95 string >\0 \b%s
+>>0 string x \b'
+>>0734 short >0 %d rpm,
+>>0736 short >0 %d phys cys,
+>>0740 short >0 %d alts/cyl,
+>>0746 short >0 %d interleave,
+>>0750 short >0 %d data cyls,
+>>0752 short >0 %d alt cyls,
+>>0754 short >0 %d heads/partition,
+>>0756 short >0 %d sectors/track,
+>>0764 long >0 start cyl %ld,
+>>0770 long x %ld blocks
# Is there a boot block written 1 sector in?
>512 belong&077777777 0600407 \b, boot block present
# Joerg Jenderek: Smart Boot Manager backup file is 41 byte header + first sectors of disc
@@ -100,75 +103,140 @@
>>96 string read\ error\ while\ reading\ drive \b, FREE-DOS Beta 0.9 MBR
>271 string Operating\ system\ loading
>>296 string error\r \b, SYSLINUX MBR (2.10)
+# http://www.acronis.de/
+>362 string MBR\ Error\ \0\r
+>>376 string ress\ any\ key\ to\
+>>>392 string boot\ from\ floppy...\0 \b, Acronis MBR
+# added by Joerg Jenderek
+# http://www.visopsys.org/
+# http://partitionlogic.org.uk/
+>309 string No\ bootable\ partition\ found\r
+>>339 string I/O\ Error\ reading\ boot\ sector\r \b, Visopsys MBR
+>349 string No\ bootable\ partition\ found\r
+>>379 string I/O\ Error\ reading\ boot\ sector\r \b, simple Visopsys MBR
# bootloader, bootmanager
->43 string SMART\ BTMGRFAT12\ \ \
->>430 string SBMK\ Bad!\r
->>>3 string SBM \b, Smart Boot Manager
->>>>6 string >\0 \b, version %s
+>0x40 string SBML
+# label with 11 characters of FAT 12 bit filesystem
+>>43 string SMART\ BTMGR
+>>>430 string SBMK\ Bad!\r
+>>>>3 string SBM \b, Smart Boot Manager
+>>>>>6 string >\0 \b, version %s
>382 string XOSLLOADXCF \b, eXtended Operating System Loader
>6 string LILO \b, LInux i386 boot LOader
>>120 string LILO \b, version 22.3.4 SuSe
>>172 string LILO \b, version 22.5.8 Debian
->402 string Geom\0Hard\ Disk\0Read\0\ Error\0
->>394 string stage1 \b, GRand Unified Bootloader (0.5.95)
->343 string Geom\0Read\0\ Error\0
->>321 string Loading\ stage1.5 \b, Grand Unified Bootloader
->380 string Geom\0Hard\ Disk\0Read\0\ Error\0
->>374 string GRUB\ \0 \b, GRand Unified Bootloader
->382 string Geom\0Hard\ Disk\0Read\0\ Error\0
->>376 string GRUB\ \0 \b, GRand Unified Bootloader (0.93)
->383 string Geom\0Hard\ Disk\0Read\0\ Error\0
->>377 string GRUB\ \0 \b, GRand Unified Bootloader (0.94)
->385 string Geom\0Hard\ Disk\0Read\0\ Error\0
->>379 string GRUB\ \0 \b, GRand Unified Bootloader (0.95)
+# updated by Joerg Jenderek
+# variables according to grub-0.97/stage1/stage1.S or
+# http://www.gnu.org/software/grub/manual/grub.html#Embedded-data
+# usual values are marked with comments to get only informations of strange GRUB loaders
+>0 ulelong 0x009048EB
+>>0x41 ubyte <2
+>>>0x3E ubyte >2 \b; GRand Unified Bootloader
+# 0x3 for 0.5.95,0.93,0.94,0.96 0x4 for 1.90
+>>>>0x3E ubyte x \b, stage1 version 0x%x
+#If it is 0xFF, use a drive passed by BIOS
+>>>>0x40 ubyte <0xFF \b, boot drive 0x%x
+# in most case 0,1,0x2e for GRUB 0.5.95
+>>>>0x41 ubyte >0 \b, LBA flag 0x%x
+>>>>0x42 uleshort <0x8000 \b, stage2 address 0x%x
+#>>>>0x42 uleshort =0x8000 \b, stage2 address 0x%x (usual)
+>>>>0x42 uleshort >0x8000 \b, stage2 address 0x%x
+#>>>>0x44 ulelong =1 \b, 1st sector stage2 0x%x (default)
+>>>>0x44 ulelong >1 \b, 1st sector stage2 0x%x
+>>>>0x48 uleshort <0x800 \b, stage2 segment 0x%x
+#>>>>0x48 uleshort =0x800 \b, stage2 segment 0x%x (usual)
+>>>>0x48 uleshort >0x800 \b, stage2 segment 0x%x
+>>>>402 string Geom\0Hard\ Disk\0Read\0\ Error\0
+>>>>>394 string stage1 \b, GRUB version 0.5.95
+>>>>382 string Geom\0Hard\ Disk\0Read\0\ Error\0
+>>>>>376 string GRUB\ \0 \b, GRUB version 0.93 or 1.94
+>>>>383 string Geom\0Hard\ Disk\0Read\0\ Error\0
+>>>>>377 string GRUB\ \0 \b, GRUB version 0.94
+>>>>385 string Geom\0Hard\ Disk\0Read\0\ Error\0
+>>>>>379 string GRUB\ \0 \b, GRUB version 0.95 or 0.96
+>>>>391 string Geom\0Hard\ Disk\0Read\0\ Error\0
+>>>>>385 string GRUB\ \0 \b, GRUB version 0.97
+#unkown version
+>>>343 string Geom\0Read\0\ Error\0
+>>>>321 string Loading\ stage1.5 \b, GRUB version x.y
+>>>380 string Geom\0Hard\ Disk\0Read\0\ Error\0
+>>>>374 string GRUB\ \0 \b, GRUB version n.m
+# http://syslinux.zytor.com/
+>478 string Boot\ failed\r
+>>495 string LDLINUX\ SYS \b, SYSLINUX bootloader (1.62)
>480 string Boot\ failed\r
->>495 string LDLINUX\ SYS \b, SYSLINUX bootloader (2.06)
+>>495 string LDLINUX\ SYS \b, SYSLINUX bootloader (2.06 or 2.11)
+>484 string Boot\ error\r \b, SYSLINUX bootloader (3.11)
>395 string chksum\0\ ERROR!\0 \b, Gujin bootloader
-# mbr partion table entries, if not fat boot secor, activ flag 0 or 0x80 and type > 0
+# http://www.bcdwb.de/bcdw/index_e.htm
+>3 string BCDL
+>>498 string BCDL\ \ \ \ BIN \b, Bootable CD Loader (1.50Z)
+# mbr partion table entries
+# OEM-ID not Microsoft,SYSLINUX,or MTOOLs
>3 string !MS
>>3 string !SYSLINUX
->>>82 string !FAT32
->>>>446 ubyte <0x81
->>>>>446 ubyte&0x7F 0
->>>>>>450 ubyte >0 \b; partition 1: ID=0x%x
->>>>>>>446 ubyte 0x80 \b, active
->>>>>>>447 ubyte x \b, starthead %u
-#>>>>>>>448 ubyte x \b, start C_S: 0x%x
-#>>>>>>448 ubeshort&1023 x \b, startcylinder? %d
->>>>>>>454 ulelong x \b, startsector %u
->>>>>>>458 ulelong x \b, %u sectors
+>>>3 string !MTOOL
+# not FAT (32 bit)
+>>>>82 string !FAT32
+#not IO.SYS
+>>>>>472 string !IO\ \ \ \ \ \ SYS
+#not Linux kernel
+>>>>>>514 string !HdrS
+# active flag 0 or 0x80 and type > 0
+>>>>>>>446 ubyte <0x81
+>>>>>>>>446 ubyte&0x7F 0
+>>>>>>>>>>>450 ubyte >0 \b; partition 1: ID=0x%x
+>>>>>>>>>>446 ubyte 0x80 \b, active
+>>>>>>>>>>447 ubyte x \b, starthead %u
+#>>>>>>>>>>448 ubyte x \b, start C_S: 0x%x
+#>>>>>>>>>>448 ubeshort&1023 x \b, startcylinder? %d
+>>>>>>>>>>454 ulelong x \b, startsector %u
+>>>>>>>>>>458 ulelong x \b, %u sectors
#
->>>>462 ubyte <0x81
->>>>>462 ubyte&0x7F 0
->>>>>>466 ubyte >0 \b; partition 2: ID=0x%x
->>>>>>>462 ubyte 0x80 \b, active
->>>>>>>463 ubyte x \b, starthead %u
-#>>>>>>>464 ubyte x \b, start C_S: 0x%x
-#>>>>>>>464 ubeshort&1023 x \b, startcylinder? %d
->>>>>>>470 ulelong x \b, startsector %u
->>>>>>>474 ulelong x \b, %u sectors
+>>>>>>>462 ubyte <0x81
+>>>>>>>>462 ubyte&0x7F 0
+>>>>>>>>>466 ubyte >0 \b; partition 2: ID=0x%x
+>>>>>>>>>>462 ubyte 0x80 \b, active
+>>>>>>>>>>463 ubyte x \b, starthead %u
+#>>>>>>>>>>464 ubyte x \b, start C_S: 0x%x
+#>>>>>>>>>>464 ubeshort&1023 x \b, startcylinder? %d
+>>>>>>>>>>470 ulelong x \b, startsector %u
+>>>>>>>>>>474 ulelong x \b, %u sectors
#
->>>>478 ubyte <0x81
->>>>>478 ubyte&0x7F 0
->>>>>>482 ubyte >0 \b; partition 3: ID=0x%x
->>>>>>>478 ubyte 0x80 \b, active
->>>>>>>479 ubyte x \b, starthead %u
-#>>>>>>>480 ubyte x \b, start C_S: 0x%x
-#>>>>>>>481 ubyte x \b, start C2S: 0x%x
-#>>>>>>>480 ubeshort&1023 x \b, startcylinder? %d
->>>>>>>486 ulelong x \b, startsector %u
->>>>>>>490 ulelong x \b, %u sectors
+>>>>>>>478 ubyte <0x81
+>>>>>>>>478 ubyte&0x7F 0
+>>>>>>>>>482 ubyte >0 \b; partition 3: ID=0x%x
+>>>>>>>>>>478 ubyte 0x80 \b, active
+>>>>>>>>>>479 ubyte x \b, starthead %u
+#>>>>>>>>>>480 ubyte x \b, start C_S: 0x%x
+#>>>>>>>>>>481 ubyte x \b, start C2S: 0x%x
+#>>>>>>>>>>480 ubeshort&1023 x \b, startcylinder? %d
+>>>>>>>>>>486 ulelong x \b, startsector %u
+>>>>>>>>>>490 ulelong x \b, %u sectors
#
->>>>494 ubyte <0x81
->>>>>494 ubyte&0x7F 0
->>>>>>498 ubyte >0 \b; partition 4: ID=0x%x
->>>>>>>494 ubyte 0x80 \b, active
->>>>>>>495 ubyte x \b, starthead %u
-#>>>>>>>496 ubyte x \b, start C_S: 0x%x
-#>>>>>>>496 ubeshort&1023 x \b, startcylinder? %d
->>>>>>>502 ulelong x \b, startsector %u
->>>>>>>506 ulelong x \b, %u sectors
+>>>>>>>494 ubyte <0x81
+>>>>>>>>494 ubyte&0x7F 0
+>>>>>>>>>498 ubyte >0 \b; partition 4: ID=0x%x
+>>>>>>>>>>494 ubyte 0x80 \b, active
+>>>>>>>>>>495 ubyte x \b, starthead %u
+#>>>>>>>>>>496 ubyte x \b, start C_S: 0x%x
+#>>>>>>>>>>496 ubeshort&1023 x \b, startcylinder? %d
+>>>>>>>>>>502 ulelong x \b, startsector %u
+>>>>>>>>>>506 ulelong x \b, %u sectors
# mbr partion table entries end
+# http://www.acronis.de/
+#FAT label=ACRONIS\ SZ
+#OEM-ID=BOOTWIZ0
+>442 string Non-system\ disk,\
+>>459 string press\ any\ key...\x7\0 \b, Acronis Startup Recovery Loader
+# DOS names like F11.SYS are 8 right space padded bytes+3 bytes
+>>>477 ubyte&0xDF >0
+>>>>477 string x \b %-.3s
+>>>>>480 ubyte&0xDF >0
+>>>>>>480 string x \b%-.5s
+>>>>485 ubyte&0xDF >0
+>>>>>485 string x \b.%-.3s
+#
>185 string FDBOOT\ Version\
>>204 string \rNo\ Systemdisk.\
>>>220 string Booting\ from\ harddisk.\n\r
@@ -251,13 +319,12 @@
>>>>>>>422 string x \b%-.3s
>>>>>425 ubyte&0xDF >0
>>>>>>425 string >\ \b.%-.3s
-#
->>>>368 ubyte&0xDF >0
->>>>>368 string x %-.5s
->>>>>>373 ubyte&0xDF >0
->>>>>>>373 string x \b%-.3s
->>>>>376 ubyte&0xDF >0
->>>>>>376 string x \b.%-.3s
+# offset variant
+>>>>379 string \0
+>>>>>368 ubyte&0xDF >0
+>>>>>>368 string x %-.5s
+>>>>>>>373 ubyte&0xDF >0
+>>>>>>>>373 string x \b%-.3s
#
>430 string NTLDR\ fehlt\xFF\r\n
>>444 string Datentr\204gerfehler\xFF\r\n
@@ -528,6 +595,90 @@
>>>>>>>>504 string x \b%-.1s
>>>>505 ubyte&0xDF >0
>>>>>505 string x \b.%-.3s
+# added by Joerg Jenderek
+# http://www.visopsys.org/
+# http://partitionlogic.org.uk/
+# OEM-ID=Visopsys
+>478 ulelong 0
+>>(1.b+326) string I/O\ Error\ reading\
+>>>(1.b+344) string Visopsys\ loader\r
+>>>>(1.b+361) string Press\ any\ key\ to\ continue.\r \b, Visopsys loader
+# http://alexfru.chat.ru/epm.html#bootprog
+>494 ubyte >0x4D
+>>495 string >E
+>>>495 string <S
+#OEM-ID is not reliable
+>>>>3 string BootProg
+# It just looks for a program file name at the root directory
+# and loads corresponding file with following execution.
+# DOS names like STARTUP.BIN,STARTUPC.COM,STARTUPE.EXE are 8 right space padded bytes+3 bytes
+>>>>499 ubyte&0xDF >0 \b, COM/EXE Bootloader
+>>>>>499 string x \b %-.1s
+>>>>>>500 ubyte&0xDF >0
+>>>>>>>500 string x \b%-.1s
+>>>>>>>>501 ubyte&0xDF >0
+>>>>>>>>>501 string x \b%-.1s
+>>>>>>>>>>502 ubyte&0xDF >0
+>>>>>>>>>>>502 string x \b%-.1s
+>>>>>>>>>>>>503 ubyte&0xDF >0
+>>>>>>>>>>>>>503 string x \b%-.1s
+>>>>>>>>>>>>>>504 ubyte&0xDF >0
+>>>>>>>>>>>>>>>504 string x \b%-.1s
+>>>>>>>>>>>>>>>>505 ubyte&0xDF >0
+>>>>>>>>>>>>>>>>>505 string x \b%-.1s
+>>>>>>>>>>>>>>>>>>506 ubyte&0xDF >0
+>>>>>>>>>>>>>>>>>>>506 string x \b%-.1s
+#name extension
+>>>>>507 ubyte&0xDF >0 \b.
+>>>>>>507 string x \b%-.1s
+>>>>>>>508 ubyte&0xDF >0
+>>>>>>>>508 string x \b%-.1s
+>>>>>>>>>509 ubyte&0xDF >0
+>>>>>>>>>>509 string x \b%-.1s
+#If the boot sector fails to read any other sector,
+#it prints a very short message ("RE") to the screen and hangs the computer.
+#If the boot sector fails to find needed program in the root directory,
+#it also hangs with another message ("NF").
+>>>>>492 string RENF \b, FAT (12 bit)
+>>>>>495 string RENF \b, FAT (16 bit)
+# http://alexfru.chat.ru/epm.html#bootprog
+>494 ubyte >0x4D
+>>495 string >E
+>>>495 string <S
+#OEM-ID is not reliable
+>>>>3 string BootProg
+# It just looks for a program file name at the root directory
+# and loads corresponding file with following execution.
+# DOS names like STARTUP.BIN,STARTUPC.COM,STARTUPE.EXE are 8 right space padded bytes+3 bytes
+>>>>499 ubyte&0xDF >0 \b, COM/EXE Bootloader
+>>>>>499 string x \b %-.1s
+>>>>>>500 ubyte&0xDF >0
+>>>>>>>500 string x \b%-.1s
+>>>>>>>>501 ubyte&0xDF >0
+>>>>>>>>>501 string x \b%-.1s
+>>>>>>>>>>502 ubyte&0xDF >0
+>>>>>>>>>>>502 string x \b%-.1s
+>>>>>>>>>>>>503 ubyte&0xDF >0
+>>>>>>>>>>>>>503 string x \b%-.1s
+>>>>>>>>>>>>>>504 ubyte&0xDF >0
+>>>>>>>>>>>>>>>504 string x \b%-.1s
+>>>>>>>>>>>>>>>>505 ubyte&0xDF >0
+>>>>>>>>>>>>>>>>>505 string x \b%-.1s
+>>>>>>>>>>>>>>>>>>506 ubyte&0xDF >0
+>>>>>>>>>>>>>>>>>>>506 string x \b%-.1s
+#name extension
+>>>>>507 ubyte&0xDF >0 \b.
+>>>>>>507 string x \b%-.1s
+>>>>>>>508 ubyte&0xDF >0
+>>>>>>>>508 string x \b%-.1s
+>>>>>>>>>509 ubyte&0xDF >0
+>>>>>>>>>>509 string x \b%-.1s
+#If the boot sector fails to read any other sector,
+#it prints a very short message ("RE") to the screen and hangs the computer.
+#If the boot sector fails to find needed program in the root directory,
+#it also hangs with another message ("NF").
+>>>>>492 string RENF \b, FAT (12 bit)
+>>>>>495 string RENF \b, FAT (16 bit)
# loader end
# Joerg Jenderek
>446 ubyte 0
@@ -658,6 +809,61 @@
0x18b string OS/2 OS/2 Boot Manager
+# added by Joerg Jenderek
+# In the second sector (+0x200) are variables according to grub-0.97/stage2/asm.S or
+# grub-1.94/kern/i386/pc/startup.S
+# http://www.gnu.org/software/grub/manual/grub.html#Embedded-data
+# usual values are marked with comments to get only informations of strange GRUB loaders
+0x200 uleshort 0x70EA
+# found only version 3.{1,2}
+>0x206 ubeshort >0x0300
+# GRUB version (0.5.)95,0.93,0.94,0.96,0.97 > "00"
+>>0x212 ubyte >0x29
+>>>0x213 ubyte >0x29
+# not iso9660_stage1_5
+#>>>0 ulelong&0x00BE5652 0x00BE5652
+>>>>0x213 ubyte >0x29 GRand Unified Bootloader
+# config_file for stage1_5 is 0xffffffff + default "/boot/grub/stage2"
+>>>>0x217 ubyte 0xFF stage1_5
+>>>>0x217 ubyte <0xFF stage2
+>>>>0x206 ubyte x \b version %u
+>>>>0x207 ubyte x \b.%u
+# module_size for 1.94
+>>>>0x208 ulelong <0xffffff \b, installed partition %u
+#>>>>0x208 ulelong =0xffffff \b, %u (default)
+>>>>0x208 ulelong >0xffffff \b, installed partition %u
+# GRUB 0.5.95 unofficial
+>>>>0x20C ulelong&0x2E300000 0x2E300000
+# 0=stage2 1=ffs 2=e2fs 3=fat 4=minix 5=reiserfs
+>>>>>0x20C ubyte x \b, identifier 0x%x
+#>>>>>0x20D ubyte =0 \b, LBA flag 0x%x (default)
+>>>>>0x20D ubyte >0 \b, LBA flag 0x%x
+# GRUB version as string
+>>>>>0x20E string >\0 \b, GRUB version %-s
+# for stage1_5 is 0xffffffff + config_file "/boot/grub/stage2" default
+>>>>>>0x215 ulong 0xffffffff
+>>>>>>>0x219 string >\0 \b, configuration file %-s
+>>>>>>0x215 ulong !0xffffffff
+>>>>>>>0x215 string >\0 \b, configuration file %-s
+# newer GRUB versions
+>>>>0x20C ulelong&0x2E300000 !0x2E300000
+##>>>>>0x20C ulelong =0 \b, saved entry %d (usual)
+>>>>>0x20C ulelong >0 \b, saved entry %d
+# for 1.94 contains kernel image size
+# for 0.93,0.94,0.96,0.97
+# 0=stage2 1=ffs 2=e2fs 3=fat 4=minix 5=reiserfs 6=vstafs 7=jfs 8=xfs 9=iso9660 a=ufs2
+>>>>>0x210 ubyte x \b, identifier 0x%x
+# The flag for LBA forcing is in most cases 0
+#>>>>>0x211 ubyte =0 \b, LBA flag 0x%x (default)
+>>>>>0x211 ubyte >0 \b, LBA flag 0x%x
+# GRUB version as string
+>>>>>0x212 string >\0 \b, GRUB version %-s
+# for stage1_5 is 0xffffffff + config_file "/boot/grub/stage2" default
+>>>>>0x217 ulong 0xffffffff
+>>>>>>0x21b string >\0 \b, configuration file %-s
+>>>>>0x217 ulong !0xffffffff
+>>>>>>0x217 string >\0 \b, configuration file %-s
+
9564 lelong 0x00011954 Unix Fast File system [v1] (little-endian),
>8404 string x last mounted on %s,
#>9504 ledate x last checked at %s,
@@ -979,10 +1185,28 @@
>>>>>>>>&0 bedate =0 full dump
>>>>>>>>&0 bedate !0 incremental since: %s
+#----------------------------------------------------------
# VMS backup savesets - gerardo.cacciari@gmail.com
-# had to comment out GEM Image and G3 raw data entries due to conflict
-#0 byte x
-#>(0.s+16) string \x01\x01
-#>>&(&0.b+8) byte 0x42 OpenVMS backup saveset data
-#>>>40 lelong x (block size %d
-#>>>49 string >\0 original name '%s')
+#
+4 string \x01\x00\x01\x00\x01\x00
+>(0.s+16) string \x01\x01
+>>&(&0.b+8) byte 0x42 OpenVMS backup saveset data
+>>>40 lelong x (block size %d,
+>>>49 string >\0 original name '%s',
+>>>2 short 1024 VAX generated)
+>>>2 short 2048 AXP generated)
+>>>2 short 4096 I64 generated)
+
+# Compaq/HP RILOE floppy image
+# From: Dirk Jagdmann <doj@cubic.org>
+0 string CPQRFBLO Compaq/HP RILOE floppy image
+
+#------------------------------------------------------------------------------
+# Files-11 On-Disk Structure (OpenVMS file system) - gerardo.cacciari@gmail.com
+# These bits come from LBN 1 (home block) of ODS-2 and ODS-5 volumes, which is
+# mapped to VBN 2 of [000000]INDEXF.SYS;1
+#
+1008 string DECFILE11B Files-11 On-Disk Structure
+>525 byte x Level %d
+>525 byte x (ODS-%d OpenVMS file system),
+>984 string x volume label is '%-12.12s'
diff --git a/contrib/file/Magdir/fonts b/contrib/file/Magdir/fonts
index 6a1ad34..cf6e0d7 100644
--- a/contrib/file/Magdir/fonts
+++ b/contrib/file/Magdir/fonts
@@ -59,3 +59,6 @@
# Opentype font data from Avi Bercovich
0 string OTTO OpenType font data
+# Gürkan Sengün <gurkan@linuks.mine.nu>, www.linuks.mine.nu
+0 string SplineFontDB: Spline Font Database
+>14 string x version %s
diff --git a/contrib/file/Magdir/images b/contrib/file/Magdir/images
index 155e99e..fd9e14f 100644
--- a/contrib/file/Magdir/images
+++ b/contrib/file/Magdir/images
@@ -267,9 +267,6 @@
#
0 beshort 0x1010 PEX Binary Archive
-# Tgif files
-0 string \%TGIF\ x Tgif file version %s
-
# DICOM medical imaging data
128 string DICM DICOM medical imaging data
@@ -310,6 +307,10 @@
>5 byte 0x00 (white background)
>5 byte 0xFF (black background)
+# Gürkan Sengün <gurkan@linuks.mine.nu>, www.linuks.mine.nu
+# http://www.atarimax.com/jindroush.atari.org/afmtatr.html
+0 leshort 0x0296 Atari ATR image
+
# XXX:
# This is bad magic 0x5249 == 'RI' conflicts with RIFF and other
# magic.
diff --git a/contrib/file/Magdir/linux b/contrib/file/Magdir/linux
index fc0c42d..fe68013 100644
--- a/contrib/file/Magdir/linux
+++ b/contrib/file/Magdir/linux
@@ -236,3 +236,13 @@
>20 lelong 1 MLS
>24 lelong x %d symbols
>28 lelong x %d ocons
+
+# LUKS: Linux Unified Key Setup, On-Disk Format, http://luks.endorphin.org/spec
+# Anthon van der Neut (anthon@mnt.org)
+0 string LUKS\xba\xbe LUKS encrypted file,
+>6 beshort x ver %d
+>8 string x [%s,
+>40 string x %s,
+>72 string x %s]
+>168 string x UUID: %s
+
diff --git a/contrib/file/Magdir/lisp b/contrib/file/Magdir/lisp
index c72b06c..e9c8ba8 100644
--- a/contrib/file/Magdir/lisp
+++ b/contrib/file/Magdir/lisp
@@ -10,12 +10,14 @@
# lisp files are mainly created on unix system with LF as line end
>2 search/2048 !\r Lisp/Scheme program text
>2 search/2048 \r Windows INF file
-0 string (
->1 string if\ Lisp/Scheme program text
->1 string setq\ Lisp/Scheme program text
->1 string defvar\ Lisp/Scheme program text
->1 string autoload\ Lisp/Scheme program text
->1 string custom-set-variables Lisp/Scheme program text
+
+0 search/256 (if\ Lisp/Scheme program text
+0 search/256 (setq\ Lisp/Scheme program text
+0 search/256 (defvar\ Lisp/Scheme program text
+0 search/256 (defparam\ Lisp/Scheme program text
+0 search/256 (defun\ Lisp/Scheme program text
+0 search/256 (autoload\ Lisp/Scheme program text
+0 search/256 (custom-set-variables\ Lisp/Scheme program text
# Emacs 18 - this is always correct, but not very magical.
0 string \012( Emacs v18 byte-compiled Lisp data
diff --git a/contrib/file/Magdir/mathematica b/contrib/file/Magdir/mathematica
index b9d3405..0eca5d4 100644
--- a/contrib/file/Magdir/mathematica
+++ b/contrib/file/Magdir/mathematica
@@ -24,7 +24,7 @@
# generic:
0 string (*^\r\r::[\011 Mathematica notebook version 2.x
-0 string \(\*\^\r\n\r\n\:\:\[\011 Mathematica notebook version 2.x
+0 string (*^\r\n\r\n::[\011 Mathematica notebook version 2.x
0 string (*^\015 Mathematica notebook version 2.x
0 string (*^\n\r\n\r::[\011 Mathematica notebook version 2.x
0 string (*^\r::[\011 Mathematica notebook version 2.x
diff --git a/contrib/file/Magdir/mime b/contrib/file/Magdir/mime
index 0102709..2219094 100644
--- a/contrib/file/Magdir/mime
+++ b/contrib/file/Magdir/mime
@@ -1,7 +1,7 @@
#------------------------------------------------------------------------------
# mime: file(1) magic for MIME encoded files
#
-0 string Content-Type:\
+0 string Content-Type:\
>14 string >\0 %s
0 string Content-Type:
>13 string >\0 %s
diff --git a/contrib/file/Magdir/mips b/contrib/file/Magdir/mips
index 9333bde..634eff4 100644
--- a/contrib/file/Magdir/mips
+++ b/contrib/file/Magdir/mips
@@ -165,8 +165,8 @@
0 string WNGZWZSS Wingz spreadsheet
0 string WNGZWZHP Wingz help file
#
-0 string \#Inventor V IRIS Inventor 1.0 file
-0 string \#Inventor V2 Open Inventor 2.0 file
+0 string #Inventor V IRIS Inventor 1.0 file
+0 string #Inventor V2 Open Inventor 2.0 file
# GLF is OpenGL stream encoding
0 string glfHeadMagic(); GLF_TEXT
4 belong 0x7d000000 GLF_BINARY_LSB_FIRST
diff --git a/contrib/file/Magdir/misctools b/contrib/file/Magdir/misctools
index 488779c..bb995ba 100644
--- a/contrib/file/Magdir/misctools
+++ b/contrib/file/Magdir/misctools
@@ -2,8 +2,8 @@
# misctools: file(1) magic for miscelanous UNIX tools.
#
0 string %%!! X-Post-It-Note text
-0 string BEGIN:VCALENDAR vCalendar calendar file
-0 string BEGIN:VCARD vCard visiting card
+0 string/c BEGIN:VCALENDAR vCalendar calendar file
+0 string/c BEGIN:VCARD vCard visiting card
# From: Alex Beregszaszi <alex@fsn.hu>
4 string gtktalog GNOME Catalogue (gtktalog)
diff --git a/contrib/file/Magdir/msdos b/contrib/file/Magdir/msdos
index 4f226dd..6143a26 100644
--- a/contrib/file/Magdir/msdos
+++ b/contrib/file/Magdir/msdos
@@ -14,7 +14,11 @@
# OS/2 batch files are REXX. the second regex is a bit generic, oh well
# the matched commands seem to be common in REXX and uncommon elsewhere
-100 regex/c =^\\s*call\s+rxfuncadd.*sysloadfu OS/2 REXX batch file text
+100 regex/c =^[\ \t]{0,10}call[\ \t]{1,10}rxfunc OS/2 REXX batch file text
+100 regex/c =^[\ \t]{0,10}say\ ['"] OS/2 REXX batch file text
+
+
+100 regex/c =^\\s*call\\s+rxfuncadd.*sysloadfu OS/2 REXX batch file text
100 regex/c =^\\s*say\ ['"] OS/2 REXX batch file text
0 leshort 0x14c MS Windows COFF Intel 80386 object file
@@ -558,6 +562,9 @@
# Outlook Personal Folders
0 lelong 0x4E444221 Microsoft Outlook binary email folder
+>10 leshort 0x0e (Outlook <=2002)
+>10 leshort 0x17 (Outlook >=2003)
+
# From: Dirk Jagdmann <doj@cubic.org>
0 lelong 0x00035f3f Windows 3.x help file
diff --git a/contrib/file/Magdir/os2 b/contrib/file/Magdir/os2
index e492031..99dd63a 100644
--- a/contrib/file/Magdir/os2
+++ b/contrib/file/Magdir/os2
@@ -6,7 +6,7 @@
# Provided 1998/08/22 by
# David Mediavilla <davidme.news@REMOVEIFNOTSPAMusa.net>
1 string InternetShortcut MS Windows 95 Internet shortcut text
->24 string >\ (URL=<%s>)
+>24 string >\ (URL=<%s>)
# OS/2 URL objects
# Provided 1998/08/22 by
diff --git a/contrib/file/Magdir/os400 b/contrib/file/Magdir/os400
index bee3660..3dc05bf 100644
--- a/contrib/file/Magdir/os400
+++ b/contrib/file/Magdir/os400
@@ -1,6 +1,6 @@
#------------------------------------------------------------------------------
# os400: file(1) magic for IBM OS/400 files
-
+#
# IBM OS/400 (i5/OS) Save file (SAVF) - gerardo.cacciari@gmail.com
# In spite of its quite variable format (due to internal memory page
# length differences between CISC and RISC versions of the OS) the
@@ -9,24 +9,29 @@
# so we must search in a somewhat large area for a particular string
# that represents the EBCDIC encoding of 'QSRDSSPC' (save/restore
# descriptor space) preceded by a two byte constant.
-40 string @@@@@@@@
->1089 search/7394 \x19\xDB\xD8\xE2\xD9\xC4\xE2\xE2\xD7\xC3 IBM OS/400 save file data
->>&212 byte 0x01 \b, created with SAVOBJ
->>&212 byte 0x02 \b, created with SAVLIB
->>&212 byte 0x07 \b, created with SAVCFG
->>&212 byte 0x0B \b, created with SAVDLO
->>&213 byte 0x43 \b, at least V5R3 to open
->>&213 byte 0x42 \b, at least V5R2 to open
->>&213 byte 0x41 \b, at least V5R1 to open
->>&213 byte 0x40 \b, at least V4R5 to open
->>&213 byte 0x3F \b, at least V4R4 to open
->>&213 byte 0x3E \b, at least V4R3 to open
->>&213 byte 0x3C \b, at least V4R2 to open
->>&213 byte 0x3D \b, at least V4R1M4 to open
->>&213 byte 0x3B \b, at least V4R1 to open
->>&213 byte 0x3A \b, at least V3R7 to open
->>&213 byte 0x35 \b, at least V3R6 to open
->>&213 byte 0x36 \b, at least V3R2 to open
->>&213 byte 0x34 \b, at least V3R1 to open
->>&213 byte 0x31 \b, at least V3R0M5 to open
->>&213 byte 0x30 \b, at least V2R3 to open
+#
+1090 search/7393 \x19\xDB\xD8\xE2\xD9\xC4\xE2\xE2\xD7\xC3 IBM OS/400 save file data
+>&212 byte 0x01 \b, created with SAVOBJ
+>&212 byte 0x02 \b, created with SAVLIB
+>&212 byte 0x07 \b, created with SAVCFG
+>&212 byte 0x08 \b, created with SAVSECDTA
+>&212 byte 0x0A \b, created with SAVSECDTA
+>&212 byte 0x0B \b, created with SAVDLO
+>&212 byte 0x0D \b, created with SAVLICPGM
+>&212 byte 0x11 \b, created with SAVCHGOBJ
+>&213 byte 0x44 \b, at least V5R4 to open
+>&213 byte 0x43 \b, at least V5R3 to open
+>&213 byte 0x42 \b, at least V5R2 to open
+>&213 byte 0x41 \b, at least V5R1 to open
+>&213 byte 0x40 \b, at least V4R5 to open
+>&213 byte 0x3F \b, at least V4R4 to open
+>&213 byte 0x3E \b, at least V4R3 to open
+>&213 byte 0x3C \b, at least V4R2 to open
+>&213 byte 0x3D \b, at least V4R1M4 to open
+>&213 byte 0x3B \b, at least V4R1 to open
+>&213 byte 0x3A \b, at least V3R7 to open
+>&213 byte 0x35 \b, at least V3R6 to open
+>&213 byte 0x36 \b, at least V3R2 to open
+>&213 byte 0x34 \b, at least V3R1 to open
+>&213 byte 0x31 \b, at least V3R0M5 to open
+>&213 byte 0x30 \b, at least V2R3 to open
diff --git a/contrib/file/Magdir/perl b/contrib/file/Magdir/perl
index a00c642..a8daee4 100644
--- a/contrib/file/Magdir/perl
+++ b/contrib/file/Magdir/perl
@@ -13,10 +13,18 @@
0 string eval\ "exec\ /usr/local/bin/perl perl script text executable
0 string eval\ '(exit\ $?0)'\ &&\ eval\ 'exec perl script text
-# a couple more, by me
-# XXX: christos matches
-#0 regex package Perl5 module source text (via regex)
-0 string package Perl5 module source text
+
+# by Dmitry V. Levin and Alexey Tourbin
+# check the first line
+0 string package
+>1 regex \^package[\ \t]+[A-Za-z_]
+>>1 regex \^package[\ \t]+[0-9A-Za-z_:]*\ *; Perl5 module source text
+# not 'p', check other lines
+0 byte !0x70
+>0 regex \^package[\ \t]+[0-9A-Za-z_:]+\ *;
+>>0 regex \^1\ *;|\^(use|sub|my)\ .*[(;{=] Perl5 module source text
+
+
# Perl POD documents
# From: Tom Hukins <tom@eborcom.com>
diff --git a/contrib/file/Magdir/revision b/contrib/file/Magdir/revision
index 36a829b..e47416a 100644
--- a/contrib/file/Magdir/revision
+++ b/contrib/file/Magdir/revision
@@ -2,4 +2,8 @@
#------------------------------------------------------------------------------
# file(1) magic for revision control files
# From Hendrik Scholz <hendrik@scholz.net>
-0 string /1\ :pserver: cvs password text file
+0 string /1\ :pserver: cvs password text file
+
+# Conary changesets
+# From: Jonathan Smith <smithj@rpath.com>
+0 belong 0xea3f81bb Conary changeset data
diff --git a/contrib/file/Magdir/sgml b/contrib/file/Magdir/sgml
index 9f33529..ba6c3ef 100644
--- a/contrib/file/Magdir/sgml
+++ b/contrib/file/Magdir/sgml
@@ -12,8 +12,9 @@
# Extensible markup language (XML), a subset of SGML
# from Marc Prud'hommeaux (marc@apocalypse.org)
0 string/cb \<?xml XML document text
-0 string \<?xml\ version " XML
+0 string \<?xml\ version\ " XML
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/contrib/file/Magdir/sql b/contrib/file/Magdir/sql
index 016e030..21c6e51 100644
--- a/contrib/file/Magdir/sql
+++ b/contrib/file/Magdir/sql
@@ -27,8 +27,19 @@
>39 string iHP-100 [H Series]
#------------------------------------------------------------------------------
-# SQLite database file
-# From Ken Guest <ken@linux.ie>
+# SQLite database files
+# Ken Guest <ken@linux.ie>, Ty Sarna, Zack Weinberg
+#
+# Version 1 used GDBM internally; its files cannot be distinguished
+# from other GDBM files.
#
-0 string SQLite SQLite database
->14 string >\0 (Version %s)
+# Version 2 used this format:
+0 string **\ This\ file\ contains\ an\ SQLite SQLite 2.x database
+
+# Version 3 of SQLite allows applications to embed their own "user version"
+# number in the database. Detect this and distinguish those files.
+
+0 string SQLite\ format\ 3
+>60 string _MTN Monotone source repository
+>60 belong !0 SQLite 3.x database, user version %u
+>60 belong 0 SQLite 3.x database
diff --git a/contrib/file/Magdir/tex b/contrib/file/Magdir/tex
index a6c734e..52adb87 100644
--- a/contrib/file/Magdir/tex
+++ b/contrib/file/Magdir/tex
@@ -29,25 +29,25 @@
0 string This\ is\ Info\ file GNU Info text
# TeX documents, from Daniel Quinlan (quinlan@yggdrasil.com)
-0 string \\input TeX document text
-0 string \\section LaTeX document text
-0 string \\setlength LaTeX document text
-0 string \\documentstyle LaTeX document text
-0 string \\chapter LaTeX document text
-0 string \\documentclass LaTeX 2e document text
-0 string \\relax LaTeX auxiliary file
-0 string \\contentsline LaTeX table of contents
-0 string %\ -*-latex-*- LaTeX document text
+0 search/400 \\input TeX document text
+0 search/400 \\section LaTeX document text
+0 search/400 \\setlength LaTeX document text
+0 search/400 \\documentstyle LaTeX document text
+0 search/400 \\chapter LaTeX document text
+0 search/400 \\documentclass LaTeX 2e document text
+0 search/400 \\relax LaTeX auxiliary file
+0 search/400 \\contentsline LaTeX table of contents
+0 search/400 %\ -*-latex-*- LaTeX document text
# Tex document, from Hendrik Scholz <hendrik@scholz.net>
0 string \\ifx TeX document text
# Index and glossary files
-0 string \\indexentry LaTeX raw index file
-0 string \\begin{theindex} LaTeX sorted index
-0 string \\glossaryentry LaTeX raw glossary
-0 string \\begin{theglossary} LaTeX sorted glossary
-0 string This\ is\ makeindex Makeindex log file
+0 search/400 \\indexentry LaTeX raw index file
+0 search/400 \\begin{theindex} LaTeX sorted index
+0 search/400 \\glossaryentry LaTeX raw glossary
+0 search/400 \\begin{theglossary} LaTeX sorted glossary
+0 search/400 This\ is\ makeindex Makeindex log file
# End of TeX
diff --git a/contrib/file/Magdir/tgif b/contrib/file/Magdir/tgif
index a6ffe36..779883a 100644
--- a/contrib/file/Magdir/tgif
+++ b/contrib/file/Magdir/tgif
@@ -2,5 +2,5 @@
# file(1) magic for tgif(1) files
# From Hendrik Scholz <hendrik@scholz.net>
-0 string %TGIF\ 4 tgif version 4 object file
+0 string %TGIF\ x Tgif file version %s
diff --git a/contrib/file/Magdir/varied.out b/contrib/file/Magdir/varied.out
index 6126f36..6df6fd9 100644
--- a/contrib/file/Magdir/varied.out
+++ b/contrib/file/Magdir/varied.out
@@ -34,3 +34,9 @@
# From: Alex Beregszaszi <alex@fsn.hu>
# 0 string exec BugOS executable
# 0 string pack BugOS archive
+
+# From: Jason Spence <jspence@lightconsulting.com>
+# Generated by the "examples" in STM's ST40 devkit, and derived code.
+0 lelong 0x13a9f17e ST40 component image format
+>4 string >\0 \b, name '%s'
+
diff --git a/contrib/file/Magdir/varied.script b/contrib/file/Magdir/varied.script
index a3e0972..ab5bece 100644
--- a/contrib/file/Magdir/varied.script
+++ b/contrib/file/Magdir/varied.script
@@ -3,7 +3,7 @@
0 string #!\ / a
>3 string >\0 %s script text executable
-0 string #!\ / a
+0 string #!\t/ a
>3 string >\0 %s script text executable
0 string #!/ a
>2 string >\0 %s script text executable
diff --git a/contrib/file/Magdir/wordprocessors b/contrib/file/Magdir/wordprocessors
index 9c06d8d..546d261 100644
--- a/contrib/file/Magdir/wordprocessors
+++ b/contrib/file/Magdir/wordprocessors
@@ -3,7 +3,7 @@
# wordprocessors: file(1) magic fo word processors.
#
####### PWP file format used on Smith Corona Personal Word Processors:
-2 string \040\040\040\040\040\040\040\040\040\040\040ML4D\040\'92 Smith Corona PWP
+2 string \040\040\040\040\040\040\040\040\040\040\040ML4D\040'92 Smith Corona PWP
>24 byte 2 \b, single spaced
>24 byte 3 \b, 1.5 spaced
>24 byte 4 \b, double spaced
OpenPOWER on IntegriCloud