X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=inline;f=lib%2Fcalloc.c;h=554a58da93d461e4b592e2914e35e11e2367bb53;hb=fa3486514bd8f15f8eb4c49821d0356b52e5a335;hp=59c65f0ac9c2a69b73b9139f3e2770ca2e145286;hpb=267a39bafd249d7eb9c37df06dc6defcf41cb343;p=gnulib.git
diff --git a/lib/calloc.c b/lib/calloc.c
index 59c65f0ac..554a58da9 100644
--- a/lib/calloc.c
+++ b/lib/calloc.c
@@ -1,11 +1,11 @@
/* calloc() function that is glibc compatible.
- This wrapper function is required at least on Tru64 UNIX 5.1.
- Copyright (C) 2004 Free Software Foundation, Inc.
+ This wrapper function is required at least on Tru64 UNIX 5.1 and mingw.
+ Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
- This program is free software; you can redistribute it and/or modify
+ This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -13,35 +13,58 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+ along with this program. If not, see . */
-/* written by Jim Meyering */
+/* written by Jim Meyering and Bruno Haible */
-#if HAVE_CONFIG_H
-# include
+#include
+/* Only the AC_FUNC_CALLOC macro defines 'calloc' already in config.h. */
+#ifdef calloc
+# define NEED_CALLOC_GNU
+# undef calloc
#endif
-#undef calloc
+/* Specification. */
#include
+#include
+
+/* Call the system's calloc below. */
+#undef calloc
+
/* Allocate and zero-fill an NxS-byte block of memory from the heap.
If N or S is zero, allocate and zero-fill a 1-byte block. */
void *
rpl_calloc (size_t n, size_t s)
{
- size_t bytes;
- if (n == 0)
- n = 1;
- if (s == 0)
- s = 1;
-
- /* Defend against buggy calloc implementations that mishandle
- size_t overflow. */
- bytes = n * s;
- if (bytes / s != n)
- return NULL;
-
- return calloc (n, s);
+ void *result;
+
+#ifdef NEED_CALLOC_GNU
+ if (n == 0 || s == 0)
+ {
+ n = 1;
+ s = 1;
+ }
+ else
+ {
+ /* Defend against buggy calloc implementations that mishandle
+ size_t overflow. */
+ size_t bytes = n * s;
+ if (bytes / s != n)
+ {
+ errno = ENOMEM;
+ return NULL;
+ }
+ }
+#endif
+
+ result = calloc (n, s);
+
+#if !HAVE_CALLOC_POSIX
+ if (result == NULL)
+ errno = ENOMEM;
+#endif
+
+ return result;
}