From: Christos Zoulas Date: Tue, 24 Apr 2001 14:40:24 +0000 (+0000) Subject: - rename magic file sgi to mips and fix it X-Git-Tag: FILE3_35 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=50b4503f56ae96a032a8173b84c847a417315659;p=file - rename magic file sgi to mips and fix it - add support for building magic.mgc - portability fixes for mmap() - try gzip before uncompress, because uncompress sometimes hangs - be more conservative about pipe reads and writes - many magic fixes --- diff --git a/Makefile.am b/Makefile.am index 5201d8a1..5e03a74c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -62,14 +62,14 @@ magic_FRAGMENTS = Magdir/adventure Magdir/allegro Magdir/alliant \ Magdir/jpeg Magdir/karma Magdir/lecter Magdir/lex Magdir/lif \ Magdir/linux Magdir/lisp Magdir/mach Magdir/macintosh Magdir/magic \ Magdir/mail.news Magdir/maple Magdir/mathematica Magdir/mcrypt \ - Magdir/mime Magdir/mirage Magdir/mkid Magdir/mmdf Magdir/modem \ + Magdir/mime Magdir/mips Magdir/mirage Magdir/mkid Magdir/mmdf Magdir/modem \ Magdir/motorola Magdir/msdos Magdir/msvc Magdir/ncr Magdir/netbsd \ Magdir/netscape Magdir/news Magdir/octave Magdir/olf Magdir/os2 \ Magdir/os9 Magdir/osf1 Magdir/palm Magdir/pbm Magdir/pdf Magdir/pdp \ Magdir/pgp Magdir/pkgadd Magdir/plus5 Magdir/printer Magdir/project \ Magdir/psdbms Magdir/pyramid Magdir/python Magdir/riff Magdir/rpm \ Magdir/rtf Magdir/sc Magdir/sccs Magdir/sendmail Magdir/sequent \ - Magdir/sgi Magdir/sgml Magdir/sniffer Magdir/softquad Magdir/spectrum \ + Magdir/sgml Magdir/sniffer Magdir/softquad Magdir/spectrum \ Magdir/sun Magdir/teapot Magdir/terminfo Magdir/tex Magdir/ti-8x \ Magdir/timezone Magdir/troff Magdir/typeset Magdir/unknown \ Magdir/uuencode Magdir/varied.out Magdir/vax Magdir/vicar Magdir/visx \ diff --git a/Makefile.in b/Makefile.in index a2324756..851b0d95 100644 --- a/Makefile.in +++ b/Makefile.in @@ -84,7 +84,7 @@ EXTRA_DIST = LEGAL.NOTICE MAINT PORTING Makefile.std magic2mime Localstuff Head CLEANFILES = $(man_MANS) magic magic.mgc -magic_FRAGMENTS = Magdir/adventure Magdir/allegro Magdir/alliant Magdir/alpha Magdir/amanda Magdir/amigaos Magdir/animation Magdir/apl Magdir/apple Magdir/applix Magdir/archive Magdir/asterix Magdir/att3b Magdir/audio Magdir/blender Magdir/blit Magdir/bsdi Magdir/c-lang Magdir/chi Magdir/cisco Magdir/claris Magdir/clipper Magdir/commands Magdir/compress Magdir/console Magdir/convex Magdir/database Magdir/diamond Magdir/diff Magdir/digital Magdir/dump Magdir/elf Magdir/encore Magdir/epoc Magdir/filesystems Magdir/flash Magdir/fonts Magdir/frame Magdir/freebsd Magdir/fsav Magdir/gimp Magdir/gnu Magdir/grace Magdir/hp Magdir/ibm370 Magdir/ibm6000 Magdir/iff Magdir/images Magdir/intel Magdir/interleaf Magdir/island Magdir/ispell Magdir/java Magdir/jpeg Magdir/karma Magdir/lecter Magdir/lex Magdir/lif Magdir/linux Magdir/lisp Magdir/mach Magdir/macintosh Magdir/magic Magdir/mail.news Magdir/maple Magdir/mathematica Magdir/mcrypt Magdir/mime Magdir/mirage Magdir/mkid Magdir/mmdf Magdir/modem Magdir/motorola Magdir/msdos Magdir/msvc Magdir/ncr Magdir/netbsd Magdir/netscape Magdir/news Magdir/octave Magdir/olf Magdir/os2 Magdir/os9 Magdir/osf1 Magdir/palm Magdir/pbm Magdir/pdf Magdir/pdp Magdir/pgp Magdir/pkgadd Magdir/plus5 Magdir/printer Magdir/project Magdir/psdbms Magdir/pyramid Magdir/python Magdir/riff Magdir/rpm Magdir/rtf Magdir/sc Magdir/sccs Magdir/sendmail Magdir/sequent Magdir/sgi Magdir/sgml Magdir/sniffer Magdir/softquad Magdir/spectrum Magdir/sun Magdir/teapot Magdir/terminfo Magdir/tex Magdir/ti-8x Magdir/timezone Magdir/troff Magdir/typeset Magdir/unknown Magdir/uuencode Magdir/varied.out Magdir/vax Magdir/vicar Magdir/visx Magdir/vms Magdir/vmware Magdir/wordperfect Magdir/xdelta Magdir/xenix Magdir/zilog Magdir/zyxel +magic_FRAGMENTS = Magdir/adventure Magdir/allegro Magdir/alliant Magdir/alpha Magdir/amanda Magdir/amigaos Magdir/animation Magdir/apl Magdir/apple Magdir/applix Magdir/archive Magdir/asterix Magdir/att3b Magdir/audio Magdir/blender Magdir/blit Magdir/bsdi Magdir/c-lang Magdir/chi Magdir/cisco Magdir/claris Magdir/clipper Magdir/commands Magdir/compress Magdir/console Magdir/convex Magdir/database Magdir/diamond Magdir/diff Magdir/digital Magdir/dump Magdir/elf Magdir/encore Magdir/epoc Magdir/filesystems Magdir/flash Magdir/fonts Magdir/frame Magdir/freebsd Magdir/fsav Magdir/gimp Magdir/gnu Magdir/grace Magdir/hp Magdir/ibm370 Magdir/ibm6000 Magdir/iff Magdir/images Magdir/intel Magdir/interleaf Magdir/island Magdir/ispell Magdir/java Magdir/jpeg Magdir/karma Magdir/lecter Magdir/lex Magdir/lif Magdir/linux Magdir/lisp Magdir/mach Magdir/macintosh Magdir/magic Magdir/mail.news Magdir/maple Magdir/mathematica Magdir/mcrypt Magdir/mime Magdir/mips Magdir/mirage Magdir/mkid Magdir/mmdf Magdir/modem Magdir/motorola Magdir/msdos Magdir/msvc Magdir/ncr Magdir/netbsd Magdir/netscape Magdir/news Magdir/octave Magdir/olf Magdir/os2 Magdir/os9 Magdir/osf1 Magdir/palm Magdir/pbm Magdir/pdf Magdir/pdp Magdir/pgp Magdir/pkgadd Magdir/plus5 Magdir/printer Magdir/project Magdir/psdbms Magdir/pyramid Magdir/python Magdir/riff Magdir/rpm Magdir/rtf Magdir/sc Magdir/sccs Magdir/sendmail Magdir/sequent Magdir/sgml Magdir/sniffer Magdir/softquad Magdir/spectrum Magdir/sun Magdir/teapot Magdir/terminfo Magdir/tex Magdir/ti-8x Magdir/timezone Magdir/troff Magdir/typeset Magdir/unknown Magdir/uuencode Magdir/varied.out Magdir/vax Magdir/vicar Magdir/visx Magdir/vms Magdir/vmware Magdir/wordperfect Magdir/xdelta Magdir/xenix Magdir/zilog Magdir/zyxel ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -380,7 +380,7 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ + cp -pr $$/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ diff --git a/configure b/configure index a4fb8c00..fae71eff 100755 --- a/configure +++ b/configure @@ -695,7 +695,7 @@ fi PACKAGE=file -VERSION=3.34 +VERSION=3.35 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; } diff --git a/configure.in b/configure.in index 0b929de3..ca437c4b 100644 --- a/configure.in +++ b/configure.in @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(file.c) -AM_INIT_AUTOMAKE(file, 3.34) +AM_INIT_AUTOMAKE(file, 3.35) AM_CONFIG_HEADER(config.h) AC_MSG_CHECKING(for builtin ELF support) diff --git a/src/acconfig.h b/src/acconfig.h index 044f0dc5..32a9e7e2 100644 --- a/src/acconfig.h +++ b/src/acconfig.h @@ -2,7 +2,7 @@ #define PACKAGE "file" /* Autoheader needs me */ -#define VERSION "3.34" +#define VERSION "3.35" /* Define if builtin ELF support is enabled. */ #undef BUILTIN_ELF diff --git a/src/apprentice.c b/src/apprentice.c index b84d373d..4cc703d7 100644 --- a/src/apprentice.c +++ b/src/apprentice.c @@ -38,7 +38,7 @@ #include "file.h" #ifndef lint -FILE_RCSID("@(#)$Id: apprentice.c,v 1.38 2001/03/27 01:12:28 christos Exp $") +FILE_RCSID("@(#)$Id: apprentice.c,v 1.39 2001/04/24 14:40:24 christos Exp $") #endif /* lint */ #define EATAB {while (isascii((unsigned char) *l) && \ @@ -59,6 +59,10 @@ FILE_RCSID("@(#)$Id: apprentice.c,v 1.38 2001/03/27 01:12:28 christos Exp $") #define MAP_FAILED (void *) -1 #endif +#ifndef MAP_FILE +#define MAP_FILE 0 +#endif + #ifdef __EMX__ char PATHSEP=';'; #else diff --git a/src/patchlevel.h b/src/patchlevel.h index 6e4b0b04..ef561261 100644 --- a/src/patchlevel.h +++ b/src/patchlevel.h @@ -1,11 +1,19 @@ #define FILE_VERSION_MAJOR 3 -#define patchlevel 34 +#define patchlevel 35 /* * Patchlevel file for Ian Darwin's MAGIC command. - * $Id: patchlevel.h,v 1.34 2001/03/12 05:05:57 christos Exp $ + * $Id: patchlevel.h,v 1.35 2001/04/24 14:40:25 christos Exp $ * * $Log: patchlevel.h,v $ + * Revision 1.35 2001/04/24 14:40:25 christos + * - rename magic file sgi to mips and fix it + * - add support for building magic.mgc + * - portability fixes for mmap() + * - try gzip before uncompress, because uncompress sometimes hangs + * - be more conservative about pipe reads and writes + * - many magic fixes + * * Revision 1.34 2001/03/12 05:05:57 christos * - new compiled magic format * - lots of magic additions