aboutsummaryrefslogtreecommitdiff
path: root/Magdir
diff options
context:
space:
mode:
Diffstat (limited to 'Magdir')
-rw-r--r--Magdir/cafebabe9
-rw-r--r--Magdir/compress9
-rw-r--r--Magdir/database25
-rw-r--r--Magdir/erlang6
-rw-r--r--Magdir/filesystems2
-rw-r--r--Magdir/fonts6
-rw-r--r--Magdir/fortran2
-rw-r--r--Magdir/kml32
-rw-r--r--Magdir/linux2
-rw-r--r--Magdir/lisp18
-rw-r--r--Magdir/python2
-rw-r--r--Magdir/troff4
-rw-r--r--Magdir/windows6
13 files changed, 106 insertions, 17 deletions
diff --git a/Magdir/cafebabe b/Magdir/cafebabe
index 2168d95139d8..e25c974dd55b 100644
--- a/Magdir/cafebabe
+++ b/Magdir/cafebabe
@@ -17,6 +17,15 @@
>4 belong >30 compiled Java class data,
>>6 beshort x version %d.
>>4 beshort x \b%d
+# Which is which?
+#>>4 belong 0x032d (Java 1.0)
+#>>4 belong 0x032d (Java 1.1)
+>>4 belong 0x002e (Java 1.2)
+>>4 belong 0x002f (Java 1.3)
+>>4 belong 0x0030 (Java 1.4)
+>>4 belong 0x0031 (Java 1.5)
+>>4 belong 0x0032 (Java 1.6)
+
0 belong 0xcafebabe
>4 belong 1 Mach-O fat file with 1 architecture
diff --git a/Magdir/compress b/Magdir/compress
index 5cbb1c87a911..5e18de0b8b71 100644
--- a/Magdir/compress
+++ b/Magdir/compress
@@ -195,6 +195,10 @@
# bug #364260)
#0 string ]\000\000\200\000 LZMA compressed data
+# http://tukaani.org/xz/xz-file-format.txt
+0 ustring \xFD7zXZ\x00 xz compressed data
+!:mime application/x-xz
+
# AFX compressed files (Wolfram Kleff)
2 string -afx- AFX compressed file data
@@ -208,3 +212,8 @@
>4 byte x - version %d
>5 byte x \b.%d
>6 belong x (%d bytes)
+
+# Type: XZ
+# URL: http://tukaani.org/xz/
+0 string \xfd\x37\x7a\x58\x5a\x00 XZ compressed data
+!:mime application/x-xz
diff --git a/Magdir/database b/Magdir/database
index 2e6ad2fdd2c8..0134355f3816 100644
--- a/Magdir/database
+++ b/Magdir/database
@@ -242,3 +242,28 @@
# URL: http://www.grc.nasa.gov/WWW/cgns/adf/
# From: Nicolas Chauvat <nicolas.chauvat@logilab.fr>
0 string @(#)ADF\ Database CGNS Advanced Data Format
+
+# Tokyo Cabinet magic data
+# http://tokyocabinet.sourceforge.net/index.html
+0 string ToKyO\ CaBiNeT\n Tokyo Cabinet
+>14 string x \b (%s)
+>32 byte 0 \b, Hash
+!:mime application/x-tokyocabinet-hash
+>32 byte 1 \b, B+ tree
+!:mime application/x-tokyocabinet-btree
+>32 byte 2 \b, Fixed-length
+!:mime application/x-tokyocabinet-fixed
+>32 byte 3 \b, Table
+!:mime application/x-tokyocabinet-table
+>33 byte &1 \b, [open]
+>33 byte &2 \b, [fatal]
+>34 byte x \b, apow=%d
+>35 byte x \b, fpow=%d
+>36 byte &0x01 \b, [large]
+>36 byte &0x02 \b, [deflate]
+>36 byte &0x04 \b, [bzip]
+>36 byte &0x08 \b, [tcbs]
+>36 byte &0x10 \b, [excodec]
+>40 lequad x \b, bnum=%lld
+>48 lequad x \b, rnum=%lld
+>56 lequad x \b, fsiz=%lld
diff --git a/Magdir/erlang b/Magdir/erlang
index 59f55ecb31b6..6b2c4dcc3c66 100644
--- a/Magdir/erlang
+++ b/Magdir/erlang
@@ -12,7 +12,7 @@
>8 string BEAM Erlang BEAM file
# 4.2 version may have a copyright notice!
-4 string Tue Jan 22 14:32:44 MET 1991 Erlang JAM file - version 4.2
-79 string Tue Jan 22 14:32:44 MET 1991 Erlang JAM file - version 4.2
+4 string Tue\ Jan\ 22\ 14:32:44\ MET\ 1991 Erlang JAM file - version 4.2
+79 string Tue\ Jan\ 22\ 14:32:44\ MET\ 1991 Erlang JAM file - version 4.2
-4 string 1.0 Fri Feb 3 09:55:56 MET 1995 Erlang JAM file - version 4.3
+4 string 1.0\ Fri\ Feb\ 3\ 09:55:56\ MET\ 1995 Erlang JAM file - version 4.3
diff --git a/Magdir/filesystems b/Magdir/filesystems
index b682df1d931e..93da429432aa 100644
--- a/Magdir/filesystems
+++ b/Magdir/filesystems
@@ -891,7 +891,7 @@
0x410 leshort 0x2478 Minix filesystem, version 2, 30 char names
# romfs filesystems - Juan Cespedes <cespedes@debian.org>
-0 string -rom1fs-\0 romfs filesystem, version 1
+0 string -rom1fs- romfs filesystem, version 1
>8 belong x %d bytes,
>16 string x named %s.
diff --git a/Magdir/fonts b/Magdir/fonts
index a6f43e74b4bf..31ff8a2c8b1e 100644
--- a/Magdir/fonts
+++ b/Magdir/fonts
@@ -6,8 +6,8 @@
0 short 017001 byte-swapped Berkeley vfont data
# PostScript fonts (must precede "printer" entries), quinlan@yggdrasil.com
-0 search/1 %!PS-AdobeFont-1. PostScript Type 1 font text
->20 search/1 >\0 (%s)
+0 string %!PS-AdobeFont-1. PostScript Type 1 font text
+>20 string >\0 (%s)
6 string %!PS-AdobeFont-1. PostScript Type 1 font program data
# X11 font files in SNF (Server Natural Format) format
@@ -55,6 +55,8 @@
0 string \007\001\001\000Copyright\ (c)\ 199 Adobe Multiple Master font
0 string \012\001\001\000Copyright\ (c)\ 199 Adobe Multiple Master font
+0 string ttcf TrueType font collection data
+
# Opentype font data from Avi Bercovich
0 string OTTO OpenType font data
diff --git a/Magdir/fortran b/Magdir/fortran
index 3e490333e180..f42c7c8a8d52 100644
--- a/Magdir/fortran
+++ b/Magdir/fortran
@@ -1,3 +1,3 @@
# FORTRAN source
-0 string/c c\ FORTRAN program
+0 regex/100 \^[Cc][\ \t] FORTRAN program
!:mime text/x-fortran
diff --git a/Magdir/kml b/Magdir/kml
new file mode 100644
index 000000000000..5b59b9e55501
--- /dev/null
+++ b/Magdir/kml
@@ -0,0 +1,32 @@
+#------------------------------------------------------------------------------
+# Type: Google KML, formerly Keyhole Markup Language
+# Future development of this format has been handed
+# over to the Open Geospatial Consortium.
+# http://www.opengeospatial.org/standards/kml/
+# From: Asbjoern Sloth Toennesen <asbjorn@lila.io>
+0 string \<?xml
+>20 search/400 \ xmlns=
+>>&0 regex ['"]http://earth.google.com/kml Google KML document
+!:mime application/vnd.google-earth.kml+xml
+>>>&1 string 2.0' \b, version 2.0
+>>>&1 string 2.1' \b, version 2.1
+>>>&1 string 2.2' \b, version 2.2
+
+#------------------------------------------------------------------------------
+# Type: OpenGIS KML, formerly Keyhole Markup Language
+# This standard is maintained by the
+# Open Geospatial Consortium.
+# http://www.opengeospatial.org/standards/kml/
+# From: Asbjoern Sloth Toennesen <asbjorn@lila.io>
+>>&0 regex ['"]http://www.opengis.net/kml OpenGIS KML document
+!:mime application/vnd.google-earth.kml+xml
+>>>&1 string 2.2 \b, version 2.2
+
+#------------------------------------------------------------------------------
+# Type: Google KML Archive (ZIP based)
+# http://code.google.com/apis/kml/documentation/kml_tut.html
+# From: Asbjoern Sloth Toennesen <asbjorn@lila.io>
+0 string PK\003\004
+>4 byte 0x14
+>>30 string doc.kml Compressed Google KML Document, including resources.
+!:mime application/vnd.google-earth.kmz
diff --git a/Magdir/linux b/Magdir/linux
index aaedff42d86f..83d4305d0a1f 100644
--- a/Magdir/linux
+++ b/Magdir/linux
@@ -84,7 +84,7 @@
514 string HdrS Linux kernel
>510 leshort 0xAA55 x86 boot executable
>>518 leshort >0x1ff
->>529 byte 0 zImage,
+>>>529 byte 0 zImage,
>>>529 byte 1 bzImage,
>>>(526.s+0x200) string >\0 version %s,
>>498 leshort 1 RO-rootFS,
diff --git a/Magdir/lisp b/Magdir/lisp
index 60b740a86a7a..c6f31dae4238 100644
--- a/Magdir/lisp
+++ b/Magdir/lisp
@@ -8,22 +8,22 @@
#0 string ;;
# windows INF files often begin with semicolon and use CRLF as line end
# 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
+#>2 search/4096 !\r Lisp/Scheme program text
+#>2 search/4096 \r Windows INF file
-0 search/256 (if\ Lisp/Scheme program text
+0 search/4096 (if\ Lisp/Scheme program text
!:mime text/x-lisp
-0 search/256 (setq\ Lisp/Scheme program text
+0 search/4096 (setq\ Lisp/Scheme program text
!:mime text/x-lisp
-0 search/256 (defvar\ Lisp/Scheme program text
+0 search/4096 (defvar\ Lisp/Scheme program text
!:mime text/x-lisp
-0 search/256 (defparam\ Lisp/Scheme program text
+0 search/4096 (defparam\ Lisp/Scheme program text
!:mime text/x-lisp
-0 search/256 (defun\ Lisp/Scheme program text
+0 search/4096 (defun\ Lisp/Scheme program text
!:mime text/x-lisp
-0 search/256 (autoload\ Lisp/Scheme program text
+0 search/4096 (autoload\ Lisp/Scheme program text
!:mime text/x-lisp
-0 search/256 (custom-set-variables\ Lisp/Scheme program text
+0 search/4096 (custom-set-variables\ Lisp/Scheme program text
!:mime text/x-lisp
# Emacs 18 - this is always correct, but not very magical.
diff --git a/Magdir/python b/Magdir/python
index 9fac2b9ae707..4803203dcfa8 100644
--- a/Magdir/python
+++ b/Magdir/python
@@ -14,6 +14,8 @@
0 belong 0x3bf20d0a python 2.3 byte-compiled
0 belong 0x6df20d0a python 2.4 byte-compiled
0 belong 0xb3f20d0a python 2.5 byte-compiled
+0 belong 0xd1f20d0a python 2.6 byte-compiled
+
0 string/b #!\ /usr/bin/python python script text executable
diff --git a/Magdir/troff b/Magdir/troff
index 337ca6837714..73731a89b3fc 100644
--- a/Magdir/troff
+++ b/Magdir/troff
@@ -14,6 +14,10 @@
!:mime text/troff
0 search/1 ''' troff or preprocessor input text
!:mime text/troff
+0 regex/20 \^\\.[A-Za-z0-9][A-Za-z0-9][\ \t] troff or preprocessor input text
+!:mime text/troff
+0 regex/20 \^\\.[A-Za-z0-9][A-Za-z0-9]$ troff or preprocessor input text
+!:mime text/troff
# ditroff intermediate output text
0 search/1 x\ T ditroff output text
diff --git a/Magdir/windows b/Magdir/windows
index 5cde739f633d..8d7680732160 100644
--- a/Magdir/windows
+++ b/Magdir/windows
@@ -113,3 +113,9 @@
0 string REGEDIT4\r\n\r\n Windows Registry text (Win95 or above)
0 string Windows\ Registry\ Editor\
>&0 string Version\ 5.00\r\n\r\n Windows Registry text (Win2K or above)
+
+
+# From: Pal Tamas <folti@balabit.hu>
+# Autorun File
+0 string/c [autorun]\r\n Microsoft Windows Autorun file.
+!:mime application/x-setupscript.