From 5b7d7b4cbcec29a3a3c3767a0e574d5b1162323a Mon Sep 17 00:00:00 2001 From: pooka Date: Thu, 8 Apr 2004 12:21:54 +0000 Subject: [PATCH] file 4.09: * (almost) fix toolbuild on platforms with a lacking wchar * more magic --- dist/file/ChangeLog | 6 ++++++ dist/file/Makefile.am | 3 +-- dist/file/acinclude.m4 | 30 ++++++++++++++++++++++++++++++ dist/file/magic/magdir/images | 23 ++++++++++++++++++----- dist/file/magic/magdir/macintosh | 3 +++ dist/file/magic/magdir/msdos | 4 ++++ dist/file/magic/magic.mime | 3 +++ dist/file/src/patchlevel.h | 9 ++++++--- 8 files changed, 71 insertions(+), 10 deletions(-) diff --git a/dist/file/ChangeLog b/dist/file/ChangeLog index c27b43f120be..c9e63fe286d9 100644 --- a/dist/file/ChangeLog +++ b/dist/file/ChangeLog @@ -1,3 +1,9 @@ +2004-04-06 20:36 Christos Zoulas + + * detect present of mbstate_t Petter Reinholdtsen + + * magic fixes + 2004-03-22 15:25 Christos Zoulas * Lots of mime fixes diff --git a/dist/file/Makefile.am b/dist/file/Makefile.am index 7f8e6a10afde..3e02ac807177 100644 --- a/dist/file/Makefile.am +++ b/dist/file/Makefile.am @@ -3,5 +3,4 @@ AUTOMAKE_OPTIONS = foreign no-dependencies EXTRA_DIST = LEGAL.NOTICE MAINT PORTING -SUBDIRS = src -#SUBDIRS = src magic doc +SUBDIRS = src magic doc diff --git a/dist/file/acinclude.m4 b/dist/file/acinclude.m4 index 79ecb0e11db8..4c27a4bd5bb0 100644 --- a/dist/file/acinclude.m4 +++ b/dist/file/acinclude.m4 @@ -252,3 +252,33 @@ AC_DEFUN([AC_FUNC_FSEEKO], [Define if fseeko (and presumably ftello) exists and is declared.]) fi]) +# serial 9 + +# From Paul Eggert. + +# BeOS 5 has but does not define mbstate_t, +# so you can't declare an object of that type. +# Check for this incompatibility with Standard C. + +# Include stdlib.h first, because otherwise this test would fail on Linux +# (at least glibc-2.1.3) because the "_XOPEN_SOURCE 500" definition elicits +# a syntax error in wchar.h due to the use of undefined __int32_t. +AC_DEFUN([AC_MBSTATE_T], + [ + AC_CHECK_HEADERS(stdlib.h) + + AC_CACHE_CHECK([for mbstate_t], ac_cv_type_mbstate_t, + [AC_TRY_COMPILE([ +#if HAVE_STDLIB_H +# include +#endif +#include ], + [mbstate_t x; return sizeof x;], + ac_cv_type_mbstate_t=yes, + ac_cv_type_mbstate_t=no)]) + if test $ac_cv_type_mbstate_t = no; then + AC_DEFINE(mbstate_t, int, + [Define to a type if does not define.]) + fi]) + + diff --git a/dist/file/magic/magdir/images b/dist/file/magic/magdir/images index 037bb7e9c312..0ed435d3ecb2 100644 --- a/dist/file/magic/magdir/images +++ b/dist/file/magic/magdir/images @@ -496,8 +496,21 @@ # Bio-Rad .PIC is an image format used by microscope control systems # and related image processing software used by biologists. # From: Vebjorn Ljosa -54 leshort 12345 Bio-Rad .PIC Image File ->0 leshort >0 %hd x ->2 leshort >0 %hd, ->4 leshort =1 1 image in file ->4 leshort >1 %hd images in file +54 leshort 12345 Bio-Rad .PIC Image File +>0 leshort >0 %hd x +>2 leshort >0 %hd, +>4 leshort =1 1 image in file +>4 leshort >1 %hd images in file + +# From Jan "Yenya" Kasprzak +# The description of *.mrw format can be found at +# http://www.dalibor.cz/minolta/raw_file_format.htm +0 string \000MRM Minolta Dimage camera raw image data + +# From: stephane.loeuillet@tiscali.f +# http://www.djvuzone.org/ +0 string AT&TFORM DjVu Image file + +# From: Jason Bacon +0 beshort 0x3020 character Computer Graphics Metafile + diff --git a/dist/file/magic/magdir/macintosh b/dist/file/magic/magdir/macintosh index b4a32d0e70b2..91364a0c67dd 100644 --- a/dist/file/magic/magdir/macintosh +++ b/dist/file/magic/magdir/macintosh @@ -355,3 +355,6 @@ >>>>0xa30 string x fourth type: %s, >>>>0xa10 string x name: %s, >>>>0xa54 belong x number of blocks: %d + +# From: Remi Mommsen +0 string BOMStore Mac OS X bill of materials (BOM) fil diff --git a/dist/file/magic/magdir/msdos b/dist/file/magic/magdir/msdos index f2c1e6f39bb2..987dcf1f9bdf 100644 --- a/dist/file/magic/magdir/msdos +++ b/dist/file/magic/magdir/msdos @@ -358,3 +358,7 @@ # Outlook Personal Folders 0 lelong 0x4E444221 Microsoft Outlook binary email folder + +# From: Dirk Jagdmann +0 lelong 0x00035f3f Windows 3.x help file + diff --git a/dist/file/magic/magic.mime b/dist/file/magic/magic.mime index 6bdf09602fdb..3aa33cf7d5e6 100644 --- a/dist/file/magic/magic.mime +++ b/dist/file/magic/magic.mime @@ -785,3 +785,6 @@ >>0xbc string DIVX video/x-DivX >8 string WAVE audio/x-wav +# From: stephane.loeuillet@tiscali.f +# http://www.djvuzone.org/ +0 string AT&TFORM image/x.djvu diff --git a/dist/file/src/patchlevel.h b/dist/file/src/patchlevel.h index aaac6a908feb..29341c21c7d8 100644 --- a/dist/file/src/patchlevel.h +++ b/dist/file/src/patchlevel.h @@ -1,13 +1,16 @@ -/* $NetBSD: patchlevel.h,v 1.1.1.5 2004/03/23 08:31:43 pooka Exp $ */ +/* $NetBSD: patchlevel.h,v 1.1.1.6 2004/04/08 12:22:18 pooka Exp $ */ #define FILE_VERSION_MAJOR 4 -#define patchlevel 8 +#define patchlevel 9 /* * Patchlevel file for Ian Darwin's MAGIC command. - * Id: patchlevel.h,v 1.51 2004/03/22 21:17:11 christos Exp + * Id: patchlevel.h,v 1.52 2004/04/07 00:32:25 christos Exp * * Log: patchlevel.h,v + * Revision 1.52 2004/04/07 00:32:25 christos + * welcome to 4.09 + * * Revision 1.51 2004/03/22 21:17:11 christos * welcome to 4.08. *