From: Christos Zoulas <christos@zoulas.com>
Date: Mon, 24 Mar 2003 14:48:32 +0000 (+0000)
Subject: more files.
X-Git-Tag: FILE4_00~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=875bf716ddfc1a80590e0d532917067401ca707f;p=file

more files.
---

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 1568e395..4f72d6b9 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,5 +1,5 @@
+include ../Makefile.inc
 
-MAGIC	 = $(datadir)/magic
 if FSECT5
 man_MAGIC = magic.5
 else
diff --git a/magic/Magdir/bFLT b/magic/Magdir/bFLT
new file mode 100644
index 00000000..5e288d13
--- /dev/null
+++ b/magic/Magdir/bFLT
@@ -0,0 +1,12 @@
+#------------------------------------------------------------------------------
+# bFLT: file(1) magic for BFLT uclinux binary files
+#
+# From Philippe De Muyter <phdm@macqel.be>
+#
+0	string		bFLT		BFLT executable
+>4	belong		x		- version %ld
+>4	belong		4
+>>36	belong&0x1	0x1		ram
+>>36	belong&0x2	0x2		gotpic
+>>36	belong&0x4	0x4		gzip
+>>36	belong&0x8	0x8		gzdata
diff --git a/magic/Magdir/bout b/magic/Magdir/bout
new file mode 100644
index 00000000..ab771fed
--- /dev/null
+++ b/magic/Magdir/bout
@@ -0,0 +1,9 @@
+#
+# i80960 b.out objects and archives
+#
+0	long		0x10d		i960 b.out relocatable object
+>16	long		>0		not stripped
+#
+# b.out archive (hp-rt on i960)
+0	string		!<bout>		b.out archive
+>8	string		__.SYMDEF	random library
diff --git a/magic/Magdir/chord b/magic/Magdir/chord
new file mode 100644
index 00000000..3639f3c4
--- /dev/null
+++ b/magic/Magdir/chord
@@ -0,0 +1,9 @@
+
+#------------------------------------------------------------------------------
+# chord: file(1) magic for Chord music sheet typesetting utility input files
+#
+# From Philippe De Muyter <phdm@macqel.be>
+# File format is actually free, but many distributed files begin with `{title'
+#
+0	string		{title		Chord text file
+
diff --git a/magic/Magdir/mail.news b/magic/Magdir/mail.news
index ab8b293c..2288ad41 100644
--- a/magic/Magdir/mail.news
+++ b/magic/Magdir/mail.news
@@ -26,3 +26,5 @@
 # From: Kevin Sullivan <ksulliva@psc.edu>
 0	string		*mbx*		MBX mail folder
 
+# From: Simon Matter <simon.matter@invoca.ch>
+0	string		\241\002\213\015skiplist\ file\0\0\0	Cyrus skiplist DB
diff --git a/magic/Magdir/unknown b/magic/Magdir/unknown
index 843dc293..910cea48 100644
--- a/magic/Magdir/unknown
+++ b/magic/Magdir/unknown
@@ -15,7 +15,7 @@
 # 0x10B is 0413; that's VAX demand-paged, but this is a short, not a
 # long, as it would be on a VAX.
 #
-# 0x10C is 0414, 0x10D is 0415, and 0x10E is 416; those *are* unknown.
+# 0x10C is 0414 and 0x10E is 416; those *are* unknown.
 #
 0	short		0x107		unknown machine executable
 >8	short		>0		not stripped
@@ -31,6 +31,4 @@
 >15	byte		>0		- version %ld
 0	long		0x10c		unknown demand paged pure executable
 >16	long		>0		not stripped
-0	long		0x10d		unknown demand paged pure executable
->16	long		>0		not stripped
 0	long		0x10e		unknown readable demand paged pure executable
diff --git a/magic/Makefile.am b/magic/Makefile.am
index f211e4c7..a1a1a06c 100644
--- a/magic/Makefile.am
+++ b/magic/Makefile.am
@@ -1,6 +1,6 @@
 data_DATA = magic magic.mime magic.mgc magic.mime.mgc
 
-EXTRA_DIST = magic2mime Localstuff Header $(magic_FRAGMENTS)
+EXTRA_DIST = magic2mime Localstuff Header magic.mime $(magic_FRAGMENTS)
 
 CLEANFILES =  magic magic.mgc magic.mime.mgc
 
@@ -38,11 +38,15 @@ Magdir/archive \
 Magdir/asterix \
 Magdir/att3b \
 Magdir/audio \
+Magdir/bFLT \
 Magdir/blender \
 Magdir/blit \
+Magdir/bout \
 Magdir/bsdi \
 Magdir/c-lang \
+Magdir/cddb \
 Magdir/chi \
+Magdir/chord \
 Magdir/cisco \
 Magdir/citrus \
 Magdir/claris \
@@ -74,8 +78,10 @@ Magdir/gimp \
 Magdir/gnu \
 Magdir/grace \
 Magdir/gringotts \
+Magdir/hdf \
 Magdir/hitachi-sh \
 Magdir/hp \
+Magdir/human68k \
 Magdir/ibm370 \
 Magdir/ibm6000 \
 Magdir/iff \
@@ -103,6 +109,7 @@ Magdir/mime \
 Magdir/mips \
 Magdir/mirage \
 Magdir/mkid \
+Magdir/mlssa \
 Magdir/mmdf \
 Magdir/modem \
 Magdir/motorola \
@@ -148,6 +155,7 @@ Magdir/smalltalk \
 Magdir/sniffer \
 Magdir/softquad \
 Magdir/spectrum \
+Magdir/sql \
 Magdir/sun \
 Magdir/sysex \
 Magdir/teapot \
diff --git a/src/Makefile.am b/src/Makefile.am
index afc7805d..be077a84 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,9 +1,9 @@
+include "../Makefile.inc"
 lib_LTLIBRARIES = libmagic.la
 include_HEADERS = magic.h
 
 bin_PROGRAMS = file
 
-MAGIC	 = $(datadir)/magic
 AM_CPPFLAGS = -DMAGIC='"$(MAGIC)"'
 
 libmagic_la_SOURCES = magic.c apprentice.c softmagic.c ascmagic.c \