Welcome to 4.21

diff --git a/config.h.in b/config.h.in
index f72087bb8053e2f3c9a937f160af5c651a48a296..808835526aeba65d7423cae14b97a910ba1edfc3 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -27,6 +27,9 @@
 /* Define to 1 if you have the `z' library (-lz). */
 #undef HAVE_LIBZ
 
+/* Define to 1 if you have the <limits.h> header file. */
+#undef HAVE_LIMITS_H
+
 /* Define to 1 if you have the <locale.h> header file. */
 #undef HAVE_LOCALE_H
 

diff --git a/configure b/configure
index 2aa3d05e970f07efd8850e20c9c39d022ddfae21..914cb125b8cb3c4d0a8273307bf199002ac739e1 100755 (executable)
--- a/configure
+++ b/configure
@@ -1808,7 +1808,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE=file
- VERSION=4.20
+ VERSION=4.21
 
 
 cat >>confdefs.h <<_ACEOF
@@ -20670,7 +20670,8 @@ done
 
 
 
-for ac_header in utime.h wchar.h wctype.h
+
+for ac_header in utime.h wchar.h wctype.h limits.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if eval "test \"\${$as_ac_Header+set}\" = set"; then

diff --git a/configure.in b/configure.in
index df4ca29882f730b2bf4d0174ccd6c1d4c1224f2a..189edbd742a6cbdc7eec2923b91aabdbed732b3a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT
 AC_CONFIG_SRCDIR([src/file.c])
-AM_INIT_AUTOMAKE(file, 4.20)
+AM_INIT_AUTOMAKE(file, 4.21)
 AM_CONFIG_HEADER([config.h])
 AM_MAINTAINER_MODE
 
@@ -80,7 +80,7 @@ AC_HEADER_MAJOR
 AC_HEADER_SYS_WAIT
 AC_HEADER_STDINT
 AC_CHECK_HEADERS(fcntl.h locale.h stdint.h inttypes.h unistd.h getopt.h)
-AC_CHECK_HEADERS(utime.h wchar.h wctype.h)
+AC_CHECK_HEADERS(utime.h wchar.h wctype.h limits.h)
 AC_CHECK_HEADERS(sys/mman.h sys/stat.h sys/types.h sys/utime.h sys/time.h)
 
 dnl Checks for typedefs, structures, and compiler characteristics.

diff --git a/src/funcs.c b/src/funcs.c
index 93f7876dc2dc09d40e1735f8c782de467e4a6251..55ac6b215d70ad6a91385e0e047d003ab426c152 100644 (file)
--- a/src/funcs.c
+++ b/src/funcs.c
@@ -36,9 +36,19 @@
 #if defined(HAVE_WCTYPE_H)
 #include <wctype.h>
 #endif
+#if defined(HAVE_LIMITS_H)
+#include <limits.h>
+#endif
+#ifndef SIZE_T_MAX
+#ifdef __LP64__
+#define SIZE_T_MAX (size_t)0xfffffffffffffffffU
+#else
+#define SIZE_T_MAX (size_t)0xffffffffU
+#endif
+#endif
 
 #ifndef        lint
-FILE_RCSID("@(#)$File: funcs.c,v 1.30 2007/03/25 21:46:52 christos Exp $")
+FILE_RCSID("@(#)$File: funcs.c,v 1.31 2007/05/24 12:29:54 christos Exp $")
 #endif /* lint */
 
 #ifndef HAVE_VSNPRINTF
@@ -247,7 +257,7 @@ file_getbuffer(struct magic_set *ms)
        len = ms->o.size - ms->o.left;
        /* * 4 is for octal representation, + 1 is for NUL */
        if (len > (SIZE_T_MAX - 1) / 4) {
-               file_oomem(ms);
+               file_oomem(ms, len);
                return NULL;
        }
        psize = len * 4 + 1;

diff --git a/src/patchlevel.h b/src/patchlevel.h
index c05b9393de9042a7b3477ffb2b60c0bee7cdba49..1cf84aabafb9eb1372d59eebf2003c3c182234a0 100644 (file)
--- a/src/patchlevel.h
+++ b/src/patchlevel.h
@@ -1,11 +1,14 @@
 #define        FILE_VERSION_MAJOR      4
-#define        patchlevel              20
+#define        patchlevel              21
 
 /*
  * Patchlevel file for Ian Darwin's MAGIC command.
- * $File: patchlevel.h,v 1.63 2007/01/12 17:38:28 christos Exp $
+ * $File: patchlevel.h,v 1.64 2007/03/01 22:14:55 christos Exp $
  *
  * $Log: patchlevel.h,v $
+ * Revision 1.65  2007/05/24 17:22:27  christos
+ * Welcome to 4.21
+ *
  * Revision 1.64  2007/03/01 22:14:55  christos
  * welcome to 4.20
  *