Oscar Schirmer <schirmer@scara.com>: fix old motorola collisions.

diff --git a/magic/Magdir/animation b/magic/Magdir/animation
index ea69ecc08f517ce80430b83186217a8c0a483402..b2f966486a7dfda1f27b0e42b9750804c9355ea5 100644 (file)
--- a/magic/Magdir/animation
+++ b/magic/Magdir/animation
@@ -158,15 +158,3 @@
 # conti_count   4 bit  0
 0      belong&0xFF5FFF1F       0x47400010      MPEG transport stream data
 >188   byte                    !0x47           CORRUPTED
-
-# ATARI ST relocatable PRG
-#
-# from Oskar Schirmer <schirmer@scara.com> Feb 3, 2001
-# (according to Roland Waldi, Oct 21, 1987)
-# besides the magic 0x601a, the text segment size is checked to be
-# not larger than 1 MB (which is a lot on ST).
-0      belong&0xFFFFFFF0       0x601A0000      Atari ST M68K executable
->2     belong                  x               (txt=%ld,
->6     belong                  x               dat=%ld,
->10    belong                  x               bss=%ld,
->14    belong                  x               sym=%ld)

diff --git a/magic/Magdir/motorola b/magic/Magdir/motorola
index efed159746ed39c9fe4eaa457d81621671537c01..17f661656cdd1687a6d1e9e32ac9f5c098d27ba1 100644 (file)
--- a/magic/Magdir/motorola
+++ b/magic/Magdir/motorola
@@ -30,3 +30,21 @@
 #
 # Motorola S-Records, from Gerd Truschinski <gt@freebsd.first.gmd.de>
 0   string      S0          Motorola S-Record; binary data in text format
+ 
+# ATARI ST relocatable PRG
+#
+# from Oskar Schirmer <schirmer@scara.com> Feb 3, 2001
+# (according to Roland Waldi, Oct 21, 1987)
+# besides the magic 0x601a, the text segment size is checked to be
+# not larger than 1 MB (which is a lot on ST).
+# The additional 0x601b distinction I took from Doug Lee's magic.
+0      belong&0xFFFFFFF0       0x601A0000      Atari ST M68K contiguous executable
+>2     belong                  x               (txt=%ld,
+>6     belong                  x               dat=%ld,
+>10    belong                  x               bss=%ld,
+>14    belong                  x               sym=%ld)
+0      belong&0xFFFFFFF0       0x601B0000      Atari ST M68K non-contig executable
+>2     belong                  x               (txt=%ld,
+>6     belong                  x               dat=%ld,
+>10    belong                  x               bss=%ld,
+>14    belong                  x               sym=%ld)

diff --git a/magic/Magdir/msdos b/magic/Magdir/msdos
index 548f2158d179ae2934c31636284f7847e577942f..771a8fd07ae01514817320a4c2d9c313d7dfbd35 100644 (file)
--- a/magic/Magdir/msdos
+++ b/magic/Magdir/msdos
@@ -277,10 +277,6 @@
 0      string          !<spell>        MKS Spell hash list (old format)
 0      string          !<spell2>       MKS Spell hash list
 0      string          AH              Halo(TM) bitmapped font file
-0      leshort         0x601A          Atari ST contiguous executable
->14    lelong          &gt;0           - not stripped
-0      leshort         0x601B          Atari ST non-contig executable
->14    lelong          &gt;0           - not stripped
 0      lelong          0x08086b70      TurboC BGI file
 0      lelong          0x08084b50      TurboC Font file