From: Christos Zoulas Date: Mon, 12 Mar 2001 05:05:57 +0000 (+0000) Subject: - new compiled magic format X-Git-Tag: FILE3_34~1 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=703928c8ee2909b3981d6d538ceb22a2d7c0b5eb;p=file - new compiled magic format - lots of magic additions --- diff --git a/Makefile.in b/Makefile.in index 47c15915..aaec91cf 100644 --- a/Makefile.in +++ b/Makefile.in @@ -119,7 +119,7 @@ missing mkinstalldirs DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = tar +TAR = gtar GZIP_ENV = --best SOURCES = $(file_SOURCES) OBJECTS = $(file_OBJECTS) diff --git a/README b/README index 5ca8ef08..475e1b4b 100644 --- a/README +++ b/README @@ -1,5 +1,5 @@ ** README for file(1) Command ** -@(#) $Id: README,v 1.23 2000/08/05 18:25:29 christos Exp $ +@(#) $Id: README,v 1.24 2001/03/12 05:05:57 christos Exp $ This is Release 3.x of Ian Darwin's (copyright but distributable) file(1) command. This version is the standard "file" command for Linux, @@ -89,3 +89,12 @@ Cres, # 810, Toronto, Ontario CANADA M8X 2W4. Phone: 416-239-4801 or 800-387-2777. Email: mail@sq.com. Call for information on SGML editing and browsing, Unix text processing, and customised products on Unix, DOS and Mac. + +From Kees Zeelenberg + +File 3.33 is available from Simtelnet and its mirrors: +ftp://ftp.simtel.net/pub/simtelnet/gnu/djgpp/v2apps/file333b.zip +Documentation and sources are available from the same folder. +File determines the file type of a given file. It is an implementation +of the Unix file(1) command. It knows the 'magic number' of some 4000 +files. diff --git a/aclocal.m4 b/aclocal.m4 index c62b0c88..b00f3cb6 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,4 +1,4 @@ -dnl aclocal.m4 generated automatically by aclocal 1.4a +dnl aclocal.m4 generated automatically by aclocal 1.4 dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation @@ -101,8 +101,6 @@ dnl AM_INIT_AUTOMAKE(package,version, [no-define]) AC_DEFUN(AM_INIT_AUTOMAKE, [AC_REQUIRE([AC_PROG_INSTALL]) -dnl We require 2.13 because we rely on SHELL being computed by configure. -AC_PREREQ([2.13]) PACKAGE=[$1] AC_SUBST(PACKAGE) VERSION=[$2] diff --git a/magic/magic.mime b/magic/magic.mime index c01840f0..687e4fbc 100644 --- a/magic/magic.mime +++ b/magic/magic.mime @@ -89,6 +89,7 @@ 0 string RIFF audio/unknown # - WAVE format >8 string WAVE audio/x-wav +>8 string AVI video/x-msvideo # 0 belong 0x2e7261fd application/x-realaudio @@ -104,6 +105,9 @@ # ideally should go into "images", but entries below would tag XPM as C source 0 string /*\ XPM image/x-xpm 7bit +# 3DS (3d Studio files) +16 beshort 0x3d3d image/x-3ds + # this first will upset you if you're a PL/1 shop... (are there any left?) # in which case rm it; ascmagic will catch real C programs # C or REXX program text @@ -463,7 +467,8 @@ # # animation formats, originally from vax@ccwf.cc.utexas.edu (VaX#n8) # MPEG file -0 string \000\000\001\263 video/mpeg +0 belong 0x000001b3 video/mpeg +0 belong 0x000001ba video/mpeg # FLI animation format 0 leshort 0xAF11 video/fli # FLC animation format diff --git a/src/patchlevel.h b/src/patchlevel.h index 0b075452..6e4b0b04 100644 --- a/src/patchlevel.h +++ b/src/patchlevel.h @@ -1,11 +1,15 @@ #define FILE_VERSION_MAJOR 3 -#define patchlevel 33 +#define patchlevel 34 /* * Patchlevel file for Ian Darwin's MAGIC command. - * $Id: patchlevel.h,v 1.33 2000/11/13 00:30:50 christos Exp $ + * $Id: patchlevel.h,v 1.34 2001/03/12 05:05:57 christos Exp $ * * $Log: patchlevel.h,v $ + * Revision 1.34 2001/03/12 05:05:57 christos + * - new compiled magic format + * - lots of magic additions + * * 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