From ff0858c675300f0c7fa622b36587a274981d74f5 Mon Sep 17 00:00:00 2001 From: Christos Zoulas Date: Tue, 18 Oct 1994 17:49:04 +0000 Subject: [PATCH] *** empty log message *** --- magic/Magdir/archive | 2 -- magic/Magdir/audio | 24 +++++++++++++++++++----- magic/Magdir/commands | 5 +++++ magic/Magdir/compress | 4 ++++ magic/Magdir/fonts | 4 ++++ magic/Magdir/images | 21 +++++++++++++++++++-- magic/Magdir/linux | 29 ++++++++++++++++++++++++----- magic/Magdir/old/ar | 31 ++++++++++++++++++++++++++++++- magic/Magdir/old/rle | 10 +++++----- magic/Magdir/old/x11 | 3 +++ magic/Magdir/tex | 13 +++++++++++++ magic/Magdir/troff | 25 +++++++++++++++++++++---- magic/Magdir/typeset | 1 - 13 files changed, 147 insertions(+), 25 deletions(-) diff --git a/magic/Magdir/archive b/magic/Magdir/archive index 8999c2f4..0e2f7b63 100644 --- a/magic/Magdir/archive +++ b/magic/Magdir/archive @@ -11,5 +11,3 @@ 0 string ! archive >8 string __.SYMDEF random library 0 string -h- Software Tools format archive text -# Rahul Dhesi's zoo archive format, from keith@cerberus.uchicago.edu. -20 long 0xdca7c4fd Rahul Dhesi's "zoo" archive diff --git a/magic/Magdir/audio b/magic/Magdir/audio index 6b4cb364..6208d8d4 100644 --- a/magic/Magdir/audio +++ b/magic/Magdir/audio @@ -36,8 +36,22 @@ 8 string AIFF AIFF audio data 8 string AIFC AIFF-C audio data 8 string 8SVX IFF/8SVX audio data -# Bytes 0-3 of Waveform (*.wav) audio files are "RIFF" -8 string WAVE Waveform audio data -0 string Creative\ Voice\ File Soundblaster audio data -0 long 0x4e54524b MultiTrack sound data file ->4 long x - version %ld +# Creative Labs AUDIO stuff +0 string MThd Standard MIDI data +>9 byte >0 (format %d) +>11 byte >1 using %d channels +0 string CTMF Creative Music (CMF) data +0 string SBI SoundBlaster instrument data +0 string Creative\ Voice\ File Creative Labs voice data +# is this next line right? it came this way... +>19 byte 0x1A +>23 byte >0 - version %d +>22 byte >0 \b.%d +# Microsoft WAVE format +0 string RIFF Microsoft RIFF +>8 string WAVE - WAVE format +>34 short >0 %d bit +>22 short =1 Mono +>22 short =2 Stereo +>22 short >2 %d Channels +>24 long >0 %d Hz diff --git a/magic/Magdir/commands b/magic/Magdir/commands index d7c04c1a..acc5911c 100644 --- a/magic/Magdir/commands +++ b/magic/Magdir/commands @@ -38,3 +38,8 @@ 0 string eval\ "exec\ /usr/local/bin/perl perl commands text 0 string #!/bin/rc Plan 9 rc Shell script text 0 string #!\ /bin/rc Plan 9 rc Shell script text +# bash shell magic, from Peter Tobias (tobias@server.et-inf.fho-emden.de) +0 string #!/bin/bash Bourne-Again Shell script text +0 string #!\ /bin/bash Bourne-Again Shell script text +0 string #!/usr/local/bin/bash Bourne-Again Shell script text +0 string #!\ /usr/local/bin/bash Bourne-Again Shell script text diff --git a/magic/Magdir/compress b/magic/Magdir/compress index 6309c180..059e926e 100644 --- a/magic/Magdir/compress +++ b/magic/Magdir/compress @@ -38,3 +38,7 @@ >2 byte&0x1f x %d bits 0 string \037\240 LZH compressed data + +# >>>>> HPACK <<<<< [from Peter Gutmann, pgut1@cs.aukuni.ac.nz] +# +0 string HPAK HPACK archive diff --git a/magic/Magdir/fonts b/magic/Magdir/fonts index 594db76d..f03dd61d 100644 --- a/magic/Magdir/fonts +++ b/magic/Magdir/fonts @@ -1,3 +1,7 @@ 0 string FONT ASCII vfont text 0 short 0436 Berkeley vfont data 0 short 017001 byte-swapped Berkeley vfont data +# PostScript fonts (must precede PostScript entry), quinlan@yggdrasil.com +0 string %!PS-AdobeFont-1.0 PostScript Type 1 font text +>20 string >\0 (%s) +6 string %!PS-AdobeFont-1.0 PostScript Type 1 font program data diff --git a/magic/Magdir/images b/magic/Magdir/images index c4d259f7..89adb5b3 100644 --- a/magic/Magdir/images +++ b/magic/Magdir/images @@ -51,7 +51,6 @@ >6 string 2.0 Version 2.0 0 string GKSM GKS Metafile 8 string ILBM IFF ILBM file -6 string JFIF JPEG picture 0 string ARF_BEGARF PHIGS clear text archive # From: (Michael Haardt) @@ -64,4 +63,22 @@ >30 long 0x31 (mono) >30 long 0x33 (color) -4 string Research, Digifax-G3-Fi +4 string Research, Digifax-G3-File +>29 byte 1 , fine resolution +>29 byte 0 , normal resolution + + +0 beshort 0xffd8 JPEG picture +>6 string JFIF JFIF standard + +# +# animation formats, originally from vax@ccwf.cc.utexas.edu (VaX#n8) +# +0 belong 0x000001b3 MPEG file + +4 leshort 0xAF11 FLI file +>6 leshort x , %d frames +>8 leshort x , width=%d pixels +>10 leshort x , height=%d pixels +>12 leshort x , depth=%d +>16 leshort x , ticks/frame=%d diff --git a/magic/Magdir/linux b/magic/Magdir/linux index 7c2855ee..559ceeaa 100644 --- a/magic/Magdir/linux +++ b/magic/Magdir/linux @@ -1,11 +1,30 @@ -# Values for Linux/i386 binaries, From: Rik Faith +# +# magic.linux +# +# Values for Linux/i386 binaries, from Rik Faith , +# Peter Tobias , and Daniel Quinlan +# 2 leshort 100 Linux/i386 ->0 leshort 0407 executable or impure executable (OMAGIC) >0 leshort 0410 pure executable (NMAGIC) >0 leshort 0413 demand-paged executable (ZMAGIC) >0 leshort 0314 demand-paged executable (QMAGIC) >16 lelong >0 not stripped ->0 string Jump jump -# core dump file +>0 string Jump jump +0 leshort 0407 object file or impure executable (OMAGIC) +>20 long >0x1020 DLL library +# message catalogs, from Mitchum DSouza +0 string *nazgul* compiled message catalog +>8 long >0 - version %ld +# core dump file, from Bill Reynolds 216 lelong 0421 core file (Linux) ->220 string >\0 core file (Linux) of %s +>220 string >\0 - core dump of '%s' +# +# LILO boot/chain loaders, from Daniel Quinlan +# this can be overrided by the DOS executable (COM) entry +2 string LILO LILO boot/chain loader +# +# Debian Packages, from Peter Tobias +0 string 0.9 +>8 byte 0x0a Debian Binary Package - +>>3 byte >0 created by dpkg 0.9%c +>>4 byte >0 pl%c diff --git a/magic/Magdir/old/ar b/magic/Magdir/old/ar index 583ec30c..8d3a32d5 100644 --- a/magic/Magdir/old/ar +++ b/magic/Magdir/old/ar @@ -58,8 +58,31 @@ 0 byte 26 'arc' archive >1 byte 0 (empty) >1 byte 1 (old format) +# >>>>> ZOO <<<<< +# # Rahul Dhesi's zoo archive format, from keith@cerberus.uchicago.edu. -20 long 0xdca7c4fd Rahul Dhesi's "zoo" archive +#20 belong 0xdca7c4fd Rahul Dhesi's "zoo" archive +# [GRR: don't know if all of these versions exist, or if some are missing...] +0 string ZOO Zoo archive +>4 string 1.00 (v%4s) +>4 string 1.10 (v%4s) +>4 string 1.20 (v%4s) +>4 string 1.30 (v%4s) +>4 string 1.40 (v%4s) +>4 string 1.50 (v%4s) +>4 string 1.60 (v%4s) +>4 string 1.70 (v%4s) +>4 string 1.71 (v%4s) +>4 string 2.00 (v%4s) +>4 string 2.01 (v%4s) +>4 string 2.10 (v%4s) +# [newer, smarter "file" programs] +>32 string \001\000 (modify: v1.0+) +>32 string \001\004 (modify: v1.4+) +>32 string \002\000 (modify: v2.0+) +>70 string \001\000 (extract: v1.0+) +>70 string \002\001 (extract: v2.1+) + # ZIP archiver 0 string PK zip archive file >4 byte x - version @@ -102,3 +125,9 @@ >7 byte 8 os: NeXT >7 byte 9 os: VAX/VMS >3 byte >0 %d] +# >>>>> SQUISH <<<<< +# +0 string SQSH squished archive (Acorn RISCOS) + +0 byte 0x1a RISC OS archive + diff --git a/magic/Magdir/old/rle b/magic/Magdir/old/rle index f45605ba..a435a1f5 100644 --- a/magic/Magdir/old/rle +++ b/magic/Magdir/old/rle @@ -5,11 +5,11 @@ # # rle # -0 short 0xcc52 Utah Raster Toolkit RLE ->2 short >0 lower left corner: %d ->4 short >0 lower right corner: %d ->6 short >0 %d x ->8 short >0 %d +0 beshort 0xcc52 Utah Raster Toolkit RLE +>2 beshort >0 lower left corner: %d +>4 beshort >0 lower right corner: %d +>6 beshort >0 %d x +>8 beshort >0 %d >10 byte&0x1 =0x1 CLEARFIRST >10 byte&0x2 =0x2 NO_BACKGROUND >10 byte&0x4 =0x4 ALPHA diff --git a/magic/Magdir/old/x11 b/magic/Magdir/old/x11 index ed0ff440..c4e38a74 100644 --- a/magic/Magdir/old/x11 +++ b/magic/Magdir/old/x11 @@ -7,3 +7,6 @@ # 0 lelong 00000004 X11 little-endian snf font # 0 long 00000004 X11 snf font +# some X11 fonts, from Daniel Quinlan (quinlan@yggdrasil.com) +0 string \001fcp X11 font data +0 string D1.0\015\012\000\000 X11 Speedo font data diff --git a/magic/Magdir/tex b/magic/Magdir/tex index 734bedd5..357c8def 100644 --- a/magic/Magdir/tex +++ b/magic/Magdir/tex @@ -23,3 +23,16 @@ 2 string \000\021 TeX font metric data 2 string \000\022 TeX font metric data >34 string >\0 (%s) +# Texinfo and GNU Info, from Daniel Quinlan (quinlan@yggdrasil.com) +0 string \\input\ texinfo Texinfo source text +0 string This\ is\ Info\ file GNU Info text +# +# correct TeX magic for Linux (and maybe more) +# from Peter Tobias (tobias@server.et-inf.fho-emden.de) +# +0 leshort 0x02f7 TeX DVI File +>16 string >\0 (%s) +0 leshort 0x59f7 TeX packed font data +>3 string >\0 (%s) +2 string \000\022 TeX font metric data +>33 string >\0 (%s) diff --git a/magic/Magdir/troff b/magic/Magdir/troff index d414c164..1658b4ac 100644 --- a/magic/Magdir/troff +++ b/magic/Magdir/troff @@ -1,6 +1,23 @@ # -# magic.troff: -# -0 string \100\357 very old (C/A/T) troff output data -0 string ' [nt]roff, tbl, or eqn input text +# magic.troff +# updated by Daniel Quinlan (quinlan@yggdrasil.com) +# troff input +0 string .\\" troff or preprocessor input text +0 string '\\" troff or preprocessor input text +0 string '.\\" troff or preprocessor input text +0 string \\" troff or preprocessor input text +# ditroff intermediate output text +0 string x\ T ditroff text +>4 string cat for the C/A/T phototypesetter +>4 string ps for PostScript +>4 string dvi for DVI +>4 string ascii for ASCII +>4 string lj4 for LaserJet 4 +>4 string latin1 for ISO 8859-1 (Latin 1) +>4 string X75 for xditview at 75dpi +>>7 string -12 (12pt) +>4 string X100 for xditview at 100dpi +>>8 string -12 (12pt) +# output data formats +0 string \100\357 very old (C/A/T) troff output data diff --git a/magic/Magdir/typeset b/magic/Magdir/typeset index 50645635..30bcbbc8 100644 --- a/magic/Magdir/typeset +++ b/magic/Magdir/typeset @@ -1,5 +1,4 @@ # other typesetting magic -0 string \100\357 very old (C/A/T) troff output data 0 string Interpress/Xerox Xerox InterPress data >16 string / (version >>17 string >\0 %s) -- 2.40.0