d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

This commit was generated by cvs2svn to compensate for changes in r69216,

Browse Source 
which included commits to RCS files with non-trunk default branches.
This commit is contained in:
David E. O'Brien 2000-11-26 21:26:20 +00:00
commit 200f92ce8d
22 changed files with 242 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
contrib/file/Magdir/audio
View File

@ -102,8 +102,9 @@
1080 string 8CHN 8-channel Fasttracker module sound data 1080 string 8CHN 8-channel Fasttracker module sound data
1080 string CD81 8-channel Oktalyzer module sound data 1080 string CD81 8-channel Oktalyzer module sound data
1080 string OKTA 8-channel Oktalyzer module sound data 1080 string OKTA 8-channel Oktalyzer module sound data
1082 string CH # Not good enough.
>1080 string >/0 %.2s-channel Fasttracker "oktalyzer" module sound data #1082 string CH
#>1080 string >/0 %.2s-channel Fasttracker "oktalyzer" module sound data
1080 string 16CN 16-channel Taketracker module sound data 1080 string 16CN 16-channel Taketracker module sound data
1080 string 32CN 32-channel Taketracker module sound data 1080 string 32CN 32-channel Taketracker module sound data
@ -118,3 +119,22 @@
>14 beshort =1 single song, >14 beshort =1 single song,
>14 beshort >1 %d songs, >14 beshort >1 %d songs,
>16 beshort >0 default song: %d >16 beshort >0 default song: %d
# IRCAM <mpruett@sgi.com>
0 belong 0x64a30400 IRCAM file (NeXT)
0 belong 0x64a30200 IRCAM file (Sun)
0 belong 0x64a30300 IRCAM file (MIPS little-endian)
0 belong 0x0001a364 IRCAM file
# NIST SPHERE <mpruett@sgi.com>
0 string NIST_1A\n\ \ \ 1024\n NIST SPHERE file
# Sample Vision <mpruett@sgi.com>
0 string SOUND\ SAMPLE\ DATA\ Sample Vision file
# Audio Visual Research <mpruett@sgi.com>
0 string 2BIT Audio Visual Research file
# From Felix von Leitner <leitner@fefe.de>
0 string OggS Ogg-Vorbis compressed sound file

5
contrib/file/Magdir/ctags Normal file
View File

@ -0,0 +1,5 @@
# ----------------------------------------------------------------------------
# ctags: file (1) magic for Exuberant Ctags files
# From: Alexander Mai <mai@migdal.ikp.physik.tu-darmstadt.de>
0 string !_TAG Exuberant Ctags tag file

24
contrib/file/Magdir/elf
View File

@ -12,12 +12,31 @@
0 string \177ELF ELF 0 string \177ELF ELF
>4 byte 0 invalid class >4 byte 0 invalid class
>4 byte 1 32-bit >4 byte 1 32-bit
# only for MIPS R3000_BE # only for MIPS
>>18 beshort 8 >>18 beshort 8
>>18 beshort 10
>>>36 belong &0x20 N32 >>>36 belong &0x20 N32
>4 byte 2 64-bit >4 byte 2 64-bit
>5 byte 0 invalid byte order >5 byte 0 invalid byte order
>5 byte 1 LSB >5 byte 1 LSB
# only for MIPS R3000_BE
>>18 leshort 8
# only for 32-bit
>>>4 byte 1
>>>>36 lelong&0xf0000000 0x00000000 mips-1
>>>>36 lelong&0xf0000000 0x10000000 mips-2
>>>>36 lelong&0xf0000000 0x20000000 mips-3
>>>>36 lelong&0xf0000000 0x30000000 mips-4
>>>>36 lelong&0xf0000000 0x40000000 mips-5
>>>>36 lelong&0xf0000000 0x50000000 mips-6
# only for 64-bit
>>>4 byte 2
>>>>48 lelong&0xf0000000 0x00000000 mips-1
>>>>48 lelong&0xf0000000 0x10000000 mips-2
>>>>48 lelong&0xf0000000 0x20000000 mips-3
>>>>48 lelong&0xf0000000 0x30000000 mips-4
>>>>48 lelong&0xf0000000 0x40000000 mips-5
>>>>48 lelong&0xf0000000 0x50000000 mips-6
>>16 leshort 0 no file type, >>16 leshort 0 no file type,
>>16 leshort 1 relocatable, >>16 leshort 1 relocatable,
>>16 leshort 2 executable, >>16 leshort 2 executable,
@ -36,7 +55,8 @@
>>18 leshort 5 Motorola 88000 - invalid byte order, >>18 leshort 5 Motorola 88000 - invalid byte order,
>>18 leshort 6 Intel 80486, >>18 leshort 6 Intel 80486,
>>18 leshort 7 Intel 80860, >>18 leshort 7 Intel 80860,
>>18 leshort 8 MIPS R3000_BE - invalid byte order, # "officially" big endian, but binutils bfd only emits magic #8 for MIPS.
>>18 leshort 8 MIPS R3000_LE [bfd bug],
>>18 leshort 9 Amdahl - invalid byte order, >>18 leshort 9 Amdahl - invalid byte order,
>>18 leshort 10 MIPS R3000_LE, >>18 leshort 10 MIPS R3000_LE,
>>18 leshort 11 RS6000 - invalid byte order, >>18 leshort 11 RS6000 - invalid byte order,

24
contrib/file/Magdir/images
View File

@ -24,12 +24,24 @@
# PBMPLUS images # PBMPLUS images
# The next byte following the magic is always whitespace. # The next byte following the magic is always whitespace.
0 string P1 PBM image text 0 string P1 Netpbm PBM image text
0 string P2 PGM image text 0 string P2 Netpbm PGM image text
0 string P3 PPM image text 0 string P3 Netpbm PPM image text
0 string P4 PBM "rawbits" image data 0 string P4 Netpbm PBM "rawbits" image data
0 string P5 PGM "rawbits" image data 0 string P5 Netpbm PGM "rawbits" image data
0 string P6 PPM "rawbits" image data 0 string P6 Netpbm PPM "rawbits" image data
0 string P7 Netpbm PAM image file
# From: bryanh@giraffe-data.com (Bryan Henderson)
0 string \117\072 Solitaire Image Recorder format
>4 string \013 MGI Type 11
>4 string \021 MGI Type 17
0 string .MDA MicroDesign data
>21 byte 48 version 2
>21 byte 51 version 3
0 string .MDP MicroDesign page data
>21 byte 48 version 2
>21 byte 51 version 3
# NIFF (Navy Interchange File Format, a modification of TIFF) images # NIFF (Navy Interchange File Format, a modification of TIFF) images
0 string IIN1 NIFF image data 0 string IIN1 NIFF image data

18
contrib/file/Magdir/macintosh
View File

@ -222,3 +222,21 @@
# Just in case... # Just in case...
102 string mBIN MacBinary III data with surprising version number 102 string mBIN MacBinary III data with surprising version number
# sas magic from Bruce Foster (bef@nwu.edu)
#
#0 string SAS SAS
#>8 string x %s
0 string SAS SAS
>24 string DATA data file
>24 string CATALOG catalog
>24 string INDEX data file index
>24 string VIEW data view
# spss magic for SPSS system and portable files,
# from Bruce Foster (bef@nwu.edu).
0 long 0xc1e2c3c9 SPSS Portable File
>40 string x %s
0 string $FL2 SPSS System File
>24 string x %s

49
contrib/file/Magdir/msdos
View File

@ -175,10 +175,6 @@
>4 belong 0x06040600 wk1 document data >4 belong 0x06040600 wk1 document data
>4 belong 0x06800200 fmt document data >4 belong 0x06800200 fmt document data
# WordPerfect documents - Trevor Johnson <trevor@jpj.net>
#
1 string WPC WordPerfect document
# Help files # Help files
0 string ?_\3\0 MS Windows Help Data 0 string ?_\3\0 MS Windows Help Data
@ -266,3 +262,48 @@
>3 string \002\000\000Copyright\ yes >3 string \002\000\000Copyright\ yes
#>3 string >\0 oops, not a font file. Cancel that. #>3 string >\0 oops, not a font file. Cancel that.
#it clashes with ttf files so put it lower down. #it clashes with ttf files so put it lower down.
# From Doug Lee via a FreeBSD pr
9 string GERBILDOC First Choice document
9 string GERBILDB First Choice database
9 string GERBILCLIP First Choice database
0 string GERBIL First Choice device file
9 string RABBITGRAPH RabbitGraph file
0 string DCU1 Borland Delphi .DCU file
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
# WARNING: below line conflicts with Infocom game data Z-machine 3
0 byte 0x03 DBase 3 data file
>0x04 lelong 0 (no records)
>0x04 lelong >0 (%ld records)
0 byte 0x83 DBase 3 data file with memo(s)
>0x04 lelong 0 (no records)
>0x04 lelong >0 (%ld records)
0 leshort 0x0006 DBase 3 index file
0 string PMCC Windows 3.x .GRP file
1 string RDC-meg MegaDots
>8 byte >0x2F version %c
>9 byte >0x2F \b.%c file
0 lelong 0x4C
>4 lelong 0x00021401 Windows shortcut file
# DOS EPS Binary File Header
# From: Ed Sznyter <ews@Black.Market.NET>
0 belong 0xC5D0D3C6 DOS EPS Binary File
>4 long >0 Postscript starts at byte %d
>>8 long >0 length %d
>>>12 long >0 Metafile starts at byte %d
>>>>16 long >0 length %d
>>>20 long >0 TIFF starts at byte %d
>>>>24 long >0 length %d
# TNEF magic From "Joomy" <joomy@se-ed.net>
0 leshort 0x223e9f78 TNEF

3
contrib/file/Magdir/netbsd
View File

@ -98,6 +98,9 @@
>12 string >\0 from '%s' >12 string >\0 from '%s'
>32 lelong !0 (signal %d) >32 lelong !0 (signal %d)
0 belong&0377777777 045200507 NetBSD/powerpc core
>12 string >\0 from '%s'
0 belong&0377777777 042400413 NetBSD/sparc demand paged 0 belong&0377777777 042400413 NetBSD/sparc demand paged
>0 byte &0x80 >0 byte &0x80
>>20 belong <8192 shared library >>20 belong <8192 shared library

2
contrib/file/Magdir/riff
View File

@ -91,3 +91,5 @@
# Notation Interchange File Format (big-endian only) # Notation Interchange File Format (big-endian only)
>8 string NIFF \b, Notation Interchange File Format >8 string NIFF \b, Notation Interchange File Format
# SoundFont 2 <mpruett@sgi.com>
>8 string sfbk SoundFont 2

11
contrib/file/Magdir/sgi
View File

@ -167,8 +167,11 @@
# #
0 string \#Inventor V IRIS Inventor 1.0 file 0 string \#Inventor V IRIS Inventor 1.0 file
0 string \#Inventor V2 Open Inventor 2.0 file 0 string \#Inventor V2 Open Inventor 2.0 file
# XXX - I don't know what next thing is! It is likely to be an image # GLF is OpenGL stream encoding
# (or movie) format
0 string glfHeadMagic(); GLF_TEXT 0 string glfHeadMagic(); GLF_TEXT
4 belong 0x41010000 GLF_BINARY_LSB_FIRST 4 belong 0x7d000000 GLF_BINARY_LSB_FIRST
4 belong 0x00000141 GLF_BINARY_MSB_FIRST 4 belong 0x0000007d GLF_BINARY_MSB_FIRST
# GLS is OpenGL stream encoding; GLS is the successor of GLF
0 string glsBeginGLS( GLS_TEXT
4 belong 0x10000000 GLS_BINARY_LSB_FIRST
4 belong 0x00000010 GLS_BINARY_MSB_FIRST

3
contrib/file/Magdir/varied.out
View File

@ -23,3 +23,6 @@
# ava assembler/linker Uros Platise <uros.platise@ijs.si> # ava assembler/linker Uros Platise <uros.platise@ijs.si>
0 string avaobj AVR assembler object code 0 string avaobj AVR assembler object code
>7 string >\0 version '%s' >7 string >\0 version '%s'
# gnu gmon magic From: Eugen Dedu <dedu@ese-metz.fr>
0 string gmon GNU prof performance data
>4 long x - version %ld

15
contrib/file/Makefile.in
View File

@ -1,4 +1,4 @@
# Makefile.in generated automatically by automake 1.4a from Makefile.am # Makefile.in generated automatically by automake 1.4 from Makefile.am
# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation # This Makefile.in is free software; the Free Software Foundation
@ -48,10 +48,9 @@ AUTOMAKE = @AUTOMAKE@
AUTOHEADER = @AUTOHEADER@ AUTOHEADER = @AUTOHEADER@
INSTALL = @INSTALL@ INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
INSTALL_DATA = @INSTALL_DATA@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_FLAG =
transform = @program_transform_name@ transform = @program_transform_name@
NORMAL_INSTALL = : NORMAL_INSTALL = :
@ -120,7 +119,7 @@ missing mkinstalldirs
DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
TAR = gtar TAR = tar
GZIP_ENV = --best GZIP_ENV = --best
SOURCES = $(file_SOURCES) SOURCES = $(file_SOURCES)
OBJECTS = $(file_OBJECTS) OBJECTS = $(file_OBJECTS)
@ -185,8 +184,8 @@ install-binPROGRAMS: $(bin_PROGRAMS)
$(mkinstalldirs) $(DESTDIR)$(bindir) $(mkinstalldirs) $(DESTDIR)$(bindir)
@list='$(bin_PROGRAMS)'; for p in $$list; do \ @list='$(bin_PROGRAMS)'; for p in $$list; do \
if test -f $$p; then \ if test -f $$p; then \
echo " $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
$(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
else :; fi; \ else :; fi; \
done done
@ -381,7 +380,7 @@ distdir: $(DISTFILES)
@for file in $(DISTFILES); do \ @for file in $(DISTFILES); do \
d=$(srcdir); \ d=$(srcdir); \
if test -d $$d/$$file; then \ if test -d $$d/$$file; then \
cp -pr $$d/$$file $(distdir)/$$file; \ cp -pr $$/$$file $(distdir)/$$file; \
else \ else \
test -f $(distdir)/$$file \ test -f $(distdir)/$$file \
|| ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
@ -413,7 +412,7 @@ uninstall: uninstall-am
all-am: Makefile $(PROGRAMS) $(MANS) $(DATA) config.h all-am: Makefile $(PROGRAMS) $(MANS) $(DATA) config.h
all-redirect: all-am all-redirect: all-am
install-strip: install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
installdirs: installdirs:
$(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1 \ $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1 \
$(DESTDIR)$(mandir)/man4 $(DESTDIR)$(datadir) $(DESTDIR)$(mandir)/man4 $(DESTDIR)$(datadir)

4
contrib/file/Makefile.std
View File

@ -1,6 +1,6 @@
# Makefile for file(1) cmd. # Makefile for file(1) cmd.
# Copyright (c) Ian F. Darwin 86/09/01 - see LEGAL.NOTICE. # Copyright (c) Ian F. Darwin 86/09/01 - see LEGAL.NOTICE.
# @(#)$Id: Makefile.std,v 1.9 2000/08/05 17:36:47 christos Exp $ # @(#)$Id: Makefile.std,v 1.10 2000/11/13 00:30:49 christos Exp $
# #
# This software is not subject to any license of the American Telephone # This software is not subject to any license of the American Telephone
# and Telegraph Company or of the Regents of the University of California. # and Telegraph Company or of the Regents of the University of California.
@ -22,7 +22,7 @@
# #
# 4. This notice may not be removed or altered. # 4. This notice may not be removed or altered.
# #
VERSION = 3.32 VERSION = 3.33
SHELL = /bin/sh SHELL = /bin/sh
#MAGIC = /etc/magic #MAGIC = /etc/magic
MAGIC = /usr/local/etc/magic MAGIC = /usr/local/etc/magic

2
contrib/file/acconfig.h
View File

@ -2,7 +2,7 @@
#define PACKAGE "file" #define PACKAGE "file"
/* Autoheader needs me */ /* Autoheader needs me */
#define VERSION "3.32" #define VERSION "3.33"
/* Define if builtin ELF support is enabled. */ /* Define if builtin ELF support is enabled. */
#undef BUILTIN_ELF #undef BUILTIN_ELF

4
contrib/file/ascmagic.c
View File

@ -46,7 +46,7 @@
#include "names.h" #include "names.h"
#ifndef lint #ifndef lint
FILE_RCSID("@(#)$Id: ascmagic.c,v 1.28 2000/08/05 17:36:47 christos Exp $") FILE_RCSID("@(#)$Id: ascmagic.c,v 1.29 2000/08/05 19:00:11 christos Exp $")
#endif /* lint */ #endif /* lint */
typedef unsigned long unichar; typedef unsigned long unichar;
@ -69,11 +69,9 @@ ascmagic(buf, nbytes)
int nbytes; /* size actually read */ int nbytes; /* size actually read */
{ {
int i; int i;
unsigned char *s;
char nbuf[HOWMANY+1]; /* one extra for terminating '\0' */ char nbuf[HOWMANY+1]; /* one extra for terminating '\0' */
unichar ubuf[HOWMANY+1]; /* one extra for terminating '\0' */ unichar ubuf[HOWMANY+1]; /* one extra for terminating '\0' */
int ulen; int ulen;
char *token;
struct names *p; struct names *p;
char *code = NULL; char *code = NULL;

2
contrib/file/configure vendored
View File

@ -696,7 +696,7 @@ fi
PACKAGE=file PACKAGE=file
VERSION=3.32 VERSION=3.33
if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
{ echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; } { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }

2
contrib/file/configure.in
View File

@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script. dnl Process this file with autoconf to produce a configure script.
AC_INIT(file.c) AC_INIT(file.c)
AM_INIT_AUTOMAKE(file, 3.32) AM_INIT_AUTOMAKE(file, 3.33)
AM_CONFIG_HEADER(config.h) AM_CONFIG_HEADER(config.h)
AC_MSG_CHECKING(for builtin ELF support) AC_MSG_CHECKING(for builtin ELF support)

3
contrib/file/file.c
View File

@ -26,6 +26,7 @@
*/ */
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h>
#include <string.h> #include <string.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/param.h> /* for MAXPATHLEN */ #include <sys/param.h> /* for MAXPATHLEN */
@ -55,7 +56,7 @@
#include "patchlevel.h" #include "patchlevel.h"
#ifndef lint #ifndef lint
FILE_RCSID("@(#)$Id: file.c,v 1.54 2000/08/05 18:30:26 christos Exp $") FILE_RCSID("@(#)$Id: file.c,v 1.55 2000/08/05 19:00:12 christos Exp $")
#endif /* lint */ #endif /* lint */

5
contrib/file/file.h
View File

@ -1,6 +1,6 @@
/* /*
* file.h - definitions for file(1) program * file.h - definitions for file(1) program
* @(#)$Id: file.h,v 1.32 2000/05/14 22:58:53 christos Exp $ * @(#)$Id: file.h,v 1.34 2000/11/13 00:30:49 christos Exp $
* *
* Copyright (c) Ian F. Darwin, 1987. * Copyright (c) Ian F. Darwin, 1987.
* Written by Ian F. Darwin. * Written by Ian F. Darwin.
@ -119,7 +119,6 @@ extern int tryit __P((unsigned char *, int, int));
extern int zmagic __P((unsigned char *, int)); extern int zmagic __P((unsigned char *, int));
extern void ckfprintf __P((FILE *, const char *, ...)); extern void ckfprintf __P((FILE *, const char *, ...));
extern uint32 signextend __P((struct magic *, unsigned int32)); extern uint32 signextend __P((struct magic *, unsigned int32));
extern int internatmagic __P((unsigned char *, int));
extern void tryelf __P((int, unsigned char *, int)); extern void tryelf __P((int, unsigned char *, int));
extern char *progname; /* the program name */ extern char *progname; /* the program name */
@ -156,7 +155,7 @@ static const char *rcsid(const char *p) { \
return rcsid(p = id); \ return rcsid(p = id); \
} }
#else #else
#define FILE_RCSID(id) static char *rcsid[] = id; #define FILE_RCSID(id) static char rcsid[] = id;
#endif #endif
#endif /* __file_h__ */ #endif /* __file_h__ */

96
contrib/file/file.man
View File

@ -1,5 +1,5 @@
.TH FILE __CSECTION__ "Copyright but distributable" .TH FILE __CSECTION__ "Copyright but distributable"
.\" $Id: file.man,v 1.36 2000/08/05 17:36:48 christos Exp $ .\" $Id: file.man,v 1.37 2000/08/07 20:08:55 christos Exp $
.SH NAME .SH NAME
file file
\- determine file type \- determine file type
@ -51,6 +51,12 @@ People depend on knowing that all the readable files in a directory
have the word ``text'' printed. have the word ``text'' printed.
Don't do as Berkeley did and change ``shell commands text'' Don't do as Berkeley did and change ``shell commands text''
to ``shell script''. to ``shell script''.
Note that the file
.I __MAGIC__
is built mechanically from a large number of small files in
the subdirectory
.I Magdir
in the source distribution of this program.
.PP .PP
The filesystem tests are based on examining the return from a The filesystem tests are based on examining the return from a
.BR stat (2) .BR stat (2)
@ -155,7 +161,7 @@ traditional human readable ones. Thus it may say
``text/plain; charset=us-ascii'' ``text/plain; charset=us-ascii''
rather rather
than ``ASCII text''. In order for this option to work, file changes the way than ``ASCII text''. In order for this option to work, file changes the way
it handles files recognised by the command it's self (such as many of the it handles files recognised by the command itself (such as many of the
text file types, directories etc), and makes use of an alternative text file types, directories etc), and makes use of an alternative
``magic'' file. ``magic'' file.
(See ``FILES'' section, below). (See ``FILES'' section, below).
@ -168,8 +174,8 @@ Specify an alternate list of files containing magic numbers.
This can be a single file, or a colon-separated list of files. This can be a single file, or a colon-separated list of files.
.TP 8 .TP 8
.B \-n .B \-n
Force stdout to be flushed after check a file. This is only useful if Force stdout to be flushed after checking each file. This is only useful if
checking a list of files. It is intended to be used by programs want checking a list of files. It is intended to be used by programs that want
filetype output from a pipe. filetype output from a pipe.
.TP 8 .TP 8
.B \-v .B \-v
@ -313,42 +319,19 @@ the external list of magic number types.
This slowed the program down slightly but made it a lot more flexible. This slowed the program down slightly but made it a lot more flexible.
.PP .PP
This program, based on the System V version, This program, based on the System V version,
was written by Ian Darwin without looking at anybody else's source code. was written by Ian Darwin <ian@darwinsys.com>
without looking at anybody else's source code.
.PP .PP
John Gilmore revised the code extensively, making it better than John Gilmore revised the code extensively, making it better than
the first version. the first version.
Geoff Collyer found several inadequacies Geoff Collyer found several inadequacies
and provided some magic file entries. and provided some magic file entries.
The program has undergone continued evolution since. Contributions by the `&' operator by Rob McMahon, cudcv@warwick.ac.uk, 1989.
.SH AUTHOR
Written by Ian F. Darwin, UUCP address {utzoo | ihnp4}!darwin!ian,
Internet address ian@sq.com,
postal address: P.O. Box 603, Station F, Toronto, Ontario, CANADA M4Y 2L8.
.PP .PP
Altered by Rob McMahon, cudcv@warwick.ac.uk, 1989, to extend the `&' operator Guy Harris, guy@netapp.com, made many changes from 1993 to the present.
from simple `x&y != 0' to `x&y op z'.
.PP .PP
Altered by Guy Harris, guy@netapp.com, 1993, to: Primary development and maintenance from 1990 to the present by
.RS Christos Zoulas (christos@astron.com).
.PP
put the ``old-style'' `&'
operator back the way it was, because 1) Rob McMahon's change broke the
previous style of usage, 2) the SunOS ``new-style'' `&' operator,
which this version of
.B file
supports, also handles `x&y op z', and 3) Rob's change wasn't documented
in any case;
.PP
put in multiple levels of `>';
.PP
put in ``beshort'', ``leshort'', etc. keywords to look at numbers in the
file in a specific byte order, rather than in the native byte order of
the process running
.BR file .
.RE
.PP
Changes by Ian Darwin and various authors including
Christos Zoulas (christos@astron.com), 1990-1999.
.PP .PP
Altered by Chris Lowth, chris@lowth.com, 2000: Altered by Chris Lowth, chris@lowth.com, 2000:
Handle the ``-i'' option to output mime type strings and using an alternative Handle the ``-i'' option to output mime type strings and using an alternative
@ -357,45 +340,14 @@ magic file and internal logic.
Altered by Eric Fischer (enf@pobox.com), July, 2000, Altered by Eric Fischer (enf@pobox.com), July, 2000,
to identify character codes and attempt to identify the languages to identify character codes and attempt to identify the languages
of non-ASCII files. of non-ASCII files.
.PP
The list of contributors to the "Magdir" directory (source for the
/etc/magic
file) is too long to include here. You know who you are; thank you.
.SH LEGAL NOTICE .SH LEGAL NOTICE
Copyright (c) Ian F. Darwin, Toronto, Canada, Copyright (c) Ian F. Darwin, Toronto, Canada, 1986-1999.
1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993. Covered by the standard Berkeley Software Distribution copyright; see the file
.PP LEGAL.NOTICE in the source distribution.
This software is not subject to and may not be made subject to any
license of the American Telephone and Telegraph Company, Sun
Microsystems Inc., Digital Equipment Inc., Lotus Development Inc., the
Regents of the University of California, The X Consortium or MIT, or
The Free Software Foundation.
.PP
This software is not subject to any export provision of the United States
Department of Commerce, and may be exported to any country or planet.
.PP
Permission is granted to anyone to use this software for any purpose on
any computer system, and to alter it and redistribute it freely, subject
to the following restrictions:
.PP
1. The author is not responsible for the consequences of use of this
software, no matter how awful, even if they arise from flaws in it.
.PP
2. The origin of this software must not be misrepresented, either by
explicit claim or by omission. Since few users ever read sources,
credits must appear in the documentation.
.PP
3. Altered versions must be plainly marked as such, and must not be
misrepresented as being the original software. Since few users
ever read sources, credits must appear in the documentation.
.PP
4. This notice may not be removed or altered.
.\" .PP
.\" A few support files (\fIgetopt\fP, \fIstrtok\fP)
.\" distributed with this package
.\" are by Henry Spencer and are subject to the same terms as above.
.\" .PP
.\" A few simple support files (\fIstrtol\fP, \fIstrchr\fP)
.\" distributed with this package
.\" are in the public domain; they are so marked.
.\"
.\" enf: commented out because these support files don't seem to be included
.PP .PP
The files The files
.I tar.h .I tar.h
@ -403,7 +355,7 @@ and
.I is_tar.c .I is_tar.c
were written by John Gilmore from his public-domain were written by John Gilmore from his public-domain
.B tar .B tar
program, and are not covered by the above restrictions. program, and are not covered by the above license.
.SH BUGS .SH BUGS
There must be a better way to automate the construction of the Magic There must be a better way to automate the construction of the Magic
file from all the glop in Magdir. What is it? file from all the glop in Magdir. What is it?

39
contrib/file/mkinstalldirs
View File

@ -0,0 +1,39 @@
#! /bin/sh
# mkinstalldirs --- make directory hierarchy
# Author: Noah Friedman <friedman@prep.ai.mit.edu>
# Created: 1993-05-16
# Public domain
# $Id: mkinstalldirs,v 1.2 2000/11/13 00:30:49 christos Exp $
errstatus=0
for file
do
set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
shift
pathcomp=
for d
do
pathcomp="$pathcomp$d"
case "$pathcomp" in
-* ) pathcomp=./$pathcomp ;;
esac
if test ! -d "$pathcomp"; then
echo "mkdir $pathcomp"
mkdir "$pathcomp" || lasterr=$?
if test ! -d "$pathcomp"; then
errstatus=$lasterr
fi
fi
pathcomp="$pathcomp/"
done
done
exit $errstatus

18
contrib/file/patchlevel.h
View File

@ -1,11 +1,25 @@
#define FILE_VERSION_MAJOR 3 #define FILE_VERSION_MAJOR 3
#define patchlevel 32 #define patchlevel 33
/* /*
* Patchlevel file for Ian Darwin's MAGIC command. * Patchlevel file for Ian Darwin's MAGIC command.
* $Id: patchlevel.h,v 1.32 2000/08/05 18:24:18 christos Exp $ * $Id: patchlevel.h,v 1.33 2000/11/13 00:30:50 christos Exp $
* *
* $Log: patchlevel.h,v $ * $Log: patchlevel.h,v $
* Revision 1.33 2000/11/13 00:30:50 christos
* - wordperfect magic fix: freebsd pr 9388
* - more msdos fixes from freebsd pr's 20131 and 20812
* - sas and spss magic [Bruce Foster]
* - mkinstalldirs [John Fremlin]
* - sgi opengl fixes [Michael Pruett]
* - netbsd magic fixes [Ignatios Souvatzis]
* - audio additions [Michael Pruett]
* - fix problem with non ansi RCSID [Andreas Ley]
* - oggs magic [Felix von Leitner]
* - gmon magic [Eugen Dedu]
* - TNEF magic [Joomy]
* - netpbm magic and misc other image stuff [Bryan Henderson]
*
* Revision 1.32 2000/08/05 18:24:18 christos * Revision 1.32 2000/08/05 18:24:18 christos
* Correct indianness detection in elf (Charles Hannum) * Correct indianness detection in elf (Charles Hannum)
* FreeBSD elf core support (Guy Harris) * FreeBSD elf core support (Guy Harris)

4
contrib/file/readelf.c
View File

@ -14,7 +14,7 @@
#include "readelf.h" #include "readelf.h"
#ifndef lint #ifndef lint
FILE_RCSID("@(#)$Id: readelf.c,v 1.16 2000/08/05 18:18:50 christos Exp $") FILE_RCSID("@(#)$Id: readelf.c,v 1.17 2000/08/05 19:00:12 christos Exp $")
#endif #endif
#ifdef ELFCORE #ifdef ELFCORE
@ -394,8 +394,6 @@ dophn_core(class, swap, fd, off, num, size)
offset += nh_descsz; offset += nh_descsz;
offset = ((offset + 3)/4)*4; offset = ((offset + 3)/4)*4;
} }
out:
;
} }
} }
#endif #endif