New magic.

diff --git a/magic/Magdir/plan9 b/magic/Magdir/plan9
index b564fc8463488a676683d9e580d103281fc750e0..58fb071c7bf229ac9086d96575df9af874d66f51 100644 (file)
--- a/magic/Magdir/plan9
+++ b/magic/Magdir/plan9
@@ -1,4 +1,17 @@
+
 #------------------------------------------------------------------------------
 # plan9:  file(1) magic for AT&T Bell Labs' Plan 9 executables
+# From: "Stefan A. Haubenthal" <polluks@web.de>
 #
-0      belong          0x000001EB      Plan 9 executable
+0      belong          0x00000107      Plan 9 executable, Motorola 68k
+0      belong          0x000001EB      Plan 9 executable, Intel 386
+0      belong          0x00000247      Plan 9 executable, Intel 960
+0      belong          0x000002AB      Plan 9 executable, SPARC
+0      belong          0x00000407      Plan 9 executable, MIPS R3000
+0      belong          0x0000048B      Plan 9 executable, AT&T DSP 3210
+0      belong          0x00000517      Plan 9 executable, MIPS R4000 BE
+0      belong          0x000005AB      Plan 9 executable, AMD 29000
+0      belong          0x00000647      Plan 9 executable, ARM 7-something
+0      belong          0x000006EB      Plan 9 executable, PowerPC
+0      belong          0x00000797      Plan 9 executable, MIPS R4000 LE
+0      belong          0x0000084B      Plan 9 executable, DEC Alpha

diff --git a/magic/Magdir/sinclair b/magic/Magdir/sinclair
index 702875ea53556139fc50d4bc18c32cf466f21eae..fbad852c50fab916be3b55e2ecf7352df761e7ad 100644 (file)
--- a/magic/Magdir/sinclair
+++ b/magic/Magdir/sinclair
@@ -30,97 +30,15 @@
 # Sinclair QL firmware executables (ThMO)
 0      string  NqNqNq`\004     QL firmware executable (BCPL)
 
-# Sinclair QL libraries (ThMO)
-0      beshort =0xFB01         QL library archive data
+# Sinclair QL libraries (was ThMO)
+0      beshort 0xFB01          QDOS object
+>2     pstring x               '%s'
 
-# Sinclair QL executbables (ThMO)
-6      beshort =0x4AFB         QL executable,
->10    string  =\0             un-named
->8     beshort =1
->>10   string  >\0             named: %.1s
->8     beshort =2
->>10   string  >\0             named: %.2s
->8     beshort =3
->>10   string  >\0             named: %.3s
->8     beshort =4
->>10   string  >\0             named: %.4s
->8     beshort =5
->>10   string  >\0             named: %.5s
->8     beshort =6
->>10   string  >\0             named: %.6s
->8     beshort =7
->>10   string  >\0             named: %.7s
->8     beshort =8
->>10   string  >\0             named: %.8s
->8     beshort =9
->>10   string  >\0             named: %.9s
->8     beshort =10
->>10   string  >\0             named: %.10s
->8     beshort =11
->>10   string  >\0             named: %.11s
->8     beshort =12
->>10   string  >\0             named: %.12s
->8     beshort =13
->>10   string  >\0             named: %.13s
->8     beshort =14
->>10   string  >\0             named: %.14s
->8     beshort =15
->>10   string  >\0             named: %.15s
->8     beshort =16
->>10   string  >\0             named: %.16s
->8     beshort =17
->>10   string  >\0             named: %.17s
->8     beshort =18
->>10   string  >\0             named: %.18s
->8     beshort =19
->>10   string  >\0             named: %.19s
->8     beshort =20
->>10   string  >\0             named: %.20s
->8     beshort >20
->>10   string  >\0             (truncated) named: %.20s
+# Sinclair QL executables (was ThMO)
+4      belong  0x4AFB          QDOS executable
+>9     pstring x               '%s'
 
-# Sinclair QL rom (ThMO)
+# Sinclair QL ROM (ThMO)
 0      belong  =0x4AFB0001     QL plugin-ROM data,
->10    string  =\0             un-named
->8     beshort =1
->>10   string  >\0             named: %.1s
->8     beshort =2
->>10   string  >\0             named: %.2s
->8     beshort =3
->>10   string  >\0             named: %.3s
->8     beshort =4
->>10   string  >\0             named: %.4s
->8     beshort =5
->>10   string  >\0             named: %.5s
->8     beshort =6
->>10   string  >\0             named: %.6s
->8     beshort =7
->>10   string  >\0             named: %.7s
->8     beshort =8
->>10   string  >\0             named: %.8s
->8     beshort =9
->>10   string  >\0             named: %.9s
->8     beshort =10
->>10   string  >\0             named: %.10s
->8     beshort =11
->>10   string  >\0             named: %.11s
->8     beshort =12
->>10   string  >\0             named: %.12s
->8     beshort =13
->>10   string  >\0             named: %.13s
->8     beshort =14
->>10   string  >\0             named: %.14s
->8     beshort =15
->>10   string  >\0             named: %.15s
->8     beshort =16
->>10   string  >\0             named: %.16s
->8     beshort =17
->>10   string  >\0             named: %.17s
->8     beshort =18
->>10   string  >\0             named: %.18s
->8     beshort =19
->>10   string  >\0             named: %.19s
->8     beshort =20
->>10   string  >\0             named: %.20s
->8     beshort >20
->>10   string  >\0             (truncated) named: %.20s
+>9     pstring =\0             un-named
+>9     pstring >\0             named: %s

diff --git a/magic/Magdir/tex b/magic/Magdir/tex
index be84ecc4ca0061c56c667f1287be661761237bc3..a6c734e32c8c69aeb6c9051b6788935ef37d779f 100644 (file)
--- a/magic/Magdir/tex
+++ b/magic/Magdir/tex
@@ -55,41 +55,17 @@
 # file(1) magic for BibTex text files
 # From Hendrik Scholz <hendrik@scholz.net>
 
-0   string @article{          BibTex text file
-0   string @book{             BibTex text file
-0   string @inbook{           BibTex text file
-0   string @incollection{     BibTex text file
-0   string @inproceedings{    BibTex text file
-0   string @manual{           BibTex text file
-0   string @misc{             BibTex text file
-0   string @preamble{         BibTex text file
-0   string @phdthesis{        BibTex text file
-0   string @techreport{       BibTex text file
-0   string @unpublished{      BibTex text file
-
-0   string @Article{          BibTex text file
-0   string @Book{             BibTex text file
-0   string @Inbook{           BibTex text file
-0   string @Incollection{     BibTex text file
-0   string @Inproceedings{    BibTex text file
-0   string @Manual{           BibTex text file
-0   string @Misc{             BibTex text file
-0   string @Preamble{         BibTex text file
-0   string @Phdthesis{        BibTex text file
-0   string @Techreport{       BibTex text file
-0   string @Unpublished{      BibTex text file
-
-0   string @ARTICLE{          BibTex text file
-0   string @BOOK{             BibTex text file
-0   string @INBOOK{           BibTex text file
-0   string @INCOLLECTION{     BibTex text file
-0   string @INPROCEEDINGS{    BibTex text file
-0   string @MANUAL{           BibTex text file
-0   string @MISC{             BibTex text file
-0   string @PREAMBLE{         BibTex text file
-0   string @PHDTHESIS{        BibTex text file
-0   string @TECHREPORT{       BibTex text file
-0   string @UNPUBLISHED{      BibTex text file
+0   string/c @article{        BibTeX text file
+0   string/c @book{           BibTeX text file
+0   string/c @inbook{         BibTeX text file
+0   string/c @incollection{   BibTeX text file
+0   string/c @inproceedings{  BibTeX text file
+0   string/c @manual{         BibTeX text file
+0   string/c @misc{           BibTeX text file
+0   string/c @preamble{       BibTeX text file
+0   string/c @phdthesis{      BibTeX text file
+0   string/c @techreport{     BibTeX text file
+0   string/c @unpublished{    BibTeX text file
 
 73  string %%%\ \ BibTeX-file{ BibTex text file (with full header)
 

diff --git a/magic/Magdir/xo65 b/magic/Magdir/xo65
new file mode 100644 (file)
index 0000000..1020cee
--- /dev/null
+++ b/magic/Magdir/xo65
@@ -0,0 +1,29 @@
+
+#------------------------------------------------------------------------------
+# xo65 object files
+# From: "Ullrich von Bassewitz" <uz@cc65.org>
+#
+0      string          \x55\x7A\x6E\x61        xo65 object,
+>4     leshort         x                       version %d,
+>6     leshort&0x0001 =0x0001                  with debug info
+>6     leshort&0x0001 =0x0000                  no debug info
+
+# xo65 library files
+0      string          \x6E\x61\x55\x7A        xo65 library,
+>4     leshort         x                       version %d
+
+# o65 object files
+0      string          \x01\x00\x6F\x36\x35    o65
+>6     leshort&0x1000  =0x0000                 executable,
+>6     leshort&0x1000  =0x1000                 object,
+>5     byte            x                       version %d,
+>6     leshort&0x8000  =0x8000                 65816,
+>6     leshort&0x8000  =0x0000                 6502,
+>6     leshort&0x2000  =0x2000                 32 bit,
+>6     leshort&0x2000  =0x0000                 16 bit,
+>6     leshort&0x4000  =0x4000                 page reloc,
+>6     leshort&0x4000  =0x0000                 byte reloc,
+>6     leshort&0x0003  =0x0000                 alignment 1
+>6     leshort&0x0003  =0x0001                 alignment 2
+>6     leshort&0x0003  =0x0002                 alignment 4
+>6     leshort&0x0003  =0x0003                 alignment 256

diff --git a/magic/Makefile.am b/magic/Makefile.am
index 8c46869f96626b3a14de03dd1a90142bb9af06a1..126671c2e725f4f1708c8d5c09c85247c87ef4f4 100644 (file)
--- a/magic/Makefile.am
+++ b/magic/Makefile.am
@@ -199,6 +199,7 @@ Magdir/vxl \
 Magdir/wordprocessors \
 Magdir/xdelta \
 Magdir/xenix \
+Magdir/xo65 \
 Magdir/xwindows \
 Magdir/zilog \
 Magdir/zyxel

diff --git a/magic/magic.mime b/magic/magic.mime
index 0f9dcd71498cff3fbb1c37525778e5c20cccdf1a..5c484bf1bb59629c6708fe68efa5edb20e0b521e 100644 (file)
--- a/magic/magic.mime
+++ b/magic/magic.mime
@@ -647,17 +647,17 @@
 #
 # Executables
 #
-0       string          \177ELF 
->4      byte            0
->4      byte            1
->4      byte            2
->5      byte            0
->5      byte            1
->>16    leshort         0
->>16    leshort         1               application/x-object
->>16    leshort         2               application/x-executable
->>16    leshort         3               application/x-sharedlib
->>16    leshort         4               application/x-coredump
+0      string          \177ELF 
+>16    leshort         0               application/octet-stream
+>16    leshort         1               application/x-object
+>16    leshort         2               application/x-executable
+>16    leshort         3               application/x-sharedlib
+>16    leshort         4               application/x-coredump
+>16    beshort         0               application/octet-stream
+>16    beshort         1               application/x-object
+>16    beshort         2               application/x-executable
+>16    beshort         3               application/x-sharedlib
+>16    beshort         4               application/x-coredump
 #
 # DOS
 0              string                  MZ                              application/x-dosexec