file 4.09:

* (almost) fix toolbuild on platforms with a lacking wchar
* more magic

dist/file/ChangeLog

@@ -1,3 +1,9 @@
+2004-04-06 20:36  Christos Zoulas  <christos@zoulas.com>
+
+	* detect present of mbstate_t Petter Reinholdtsen <pere@hungry.com>
+
+	* magic fixes
+
 2004-03-22 15:25  Christos Zoulas  <christos@zoulas.com>
 
 	* Lots of mime fixes

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

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 <wchar.h> 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 <stdlib.h>
+#endif
+#include <wchar.h>],
+      [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 <wchar.h> does not define.])
+   fi])
+
+

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 <vebjorn@ljosa.com>
-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 <kas@fi.muni.cz>
+# 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 <bacon@smithers.neuro.mcw.edu>
+0	beshort	0x3020			character Computer Graphics Metafile
+

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 <mommsen@slac.stanford.edu>
+0		string		BOMStore	Mac OS X bill of materials (BOM) fil

dist/file/magic/magdir/msdos

@@ -358,3 +358,7 @@
 
 # Outlook Personal Folders
 0	lelong	0x4E444221	Microsoft Outlook binary email folder
+
+# From: Dirk Jagdmann <doj@cubic.org>
+0	lelong	0x00035f3f	Windows 3.x help file
+

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

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.
  *