X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fcalloc.c;h=475d0aeab92a75d0dfbd6c4f27aac894c5972a8f;hb=43593319b31e6b0175b8eec4433bac744959822d;hp=c8b1e1ebabd0d29c791b333b6f16234b45ebc254;hpb=0632e115747ff96e93330c88f536d7354a7ce507;p=gnulib.git

diff --git a/lib/calloc.c b/lib/calloc.c
index c8b1e1eba..475d0aeab 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, 2005, 2006 Free Software Foundation, Inc.
+   This wrapper function is required at least on Tru64 UNIX 5.1 and mingw.
+   Copyright (C) 2004-2007, 2009-2013 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,32 +13,61 @@
    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 <http://www.gnu.org/licenses/>.  */
 
-/* written by Jim Meyering */
+/* written by Jim Meyering and Bruno Haible */
 
 #include <config.h>
-#undef calloc
+/* Only the AC_FUNC_CALLOC macro defines 'calloc' already in config.h.  */
+#ifdef calloc
+# define NEED_CALLOC_GNU 1
+# undef calloc
+/* Whereas the gnulib module 'calloc-gnu' defines HAVE_CALLOC_GNU.  */
+#elif GNULIB_CALLOC_GNU && !HAVE_CALLOC_GNU
+# define NEED_CALLOC_GNU 1
+#endif
 
+/* Specification.  */
 #include <stdlib.h>
 
+#include <errno.h>
+
+/* 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;
+  void *result;
 
+#if NEED_CALLOC_GNU
   if (n == 0 || s == 0)
-    return calloc (1, 1);
+    {
+      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);
 
-  /* Defend against buggy calloc implementations that mishandle
-     size_t overflow.  */
-  bytes = n * s;
-  if (bytes / s != n)
-    return NULL;
+#if !HAVE_CALLOC_POSIX
+  if (result == NULL)
+    errno = ENOMEM;
+#endif
 
-  return calloc (n, s);
+  return result;
 }