Mercurial > hg > octave-kai > gnulib-hg
changeset 5081:af4fd5060a09
* modules/calloc: New file.
* lib/calloc.c: New file.
* m4/calloc.m4: New file.
author | Jim Meyering <jim@meyering.net> |
---|---|
date | Thu, 10 Jun 2004 08:29:25 +0000 |
parents | 033d299cab29 |
children | c18a7b3eb9b1 |
files | ChangeLog lib/ChangeLog lib/calloc.c m4/ChangeLog m4/calloc.m4 modules/calloc |
diffstat | 6 files changed, 117 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2004-06-01 Jim Meyering <jim@meyering.net> + + * modules/calloc: New file. + 2004-06-01 Paul Eggert <eggert@cs.ucla.edu> * modules/file-type: Add lib/stat-macros.h.
--- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,7 @@ +2004-06-01 Jim Meyering <jim@meyering.net> + + * calloc.c: New file. + 2004-06-06 Paul Eggert <eggert@cs.ucla.edu> * getdate.y (yylex): Allow space between sign and number.
new file mode 100644 --- /dev/null +++ b/lib/calloc.c @@ -0,0 +1,39 @@ +/* Work around the condition whereby calloc (n, s) fails when n*s is 0. + This wrapper function is required at least on Tru64 UNIX 5.1. + Copyright (C) 2004 Free Software Foundation, Inc. + + 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. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + +/* written by Jim Meyering */ + +#if HAVE_CONFIG_H +# include <config.h> +#endif +#undef calloc + +#include <stdlib.h> + +/* 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) +{ + if (n == 0) + n = 1; + if (s == 0) + s = 1; + return calloc (n, s); +}
--- a/m4/ChangeLog +++ b/m4/ChangeLog @@ -1,3 +1,7 @@ +2004-06-01 Jim Meyering <jim@meyering.net> + + * calloc.m4: New file. + 2004-06-01 Paul Eggert <eggert@cs.ucla.edu> Merge from coreutils CVS.
new file mode 100644 --- /dev/null +++ b/m4/calloc.m4 @@ -0,0 +1,47 @@ +#serial 1 + +# FIXME: remove this whole file once we can depend +# on having the definition from autoconf. +undefine([AC_FUNC_CALLOC]) + +# Determine whether calloc (N, S) returns non-NULL when N*S is zero. +# If so, define HAVE_CALLOC. Otherwise, define calloc to rpl_calloc +# and arrange to use a calloc wrapper function that does work in that case. + +# _AC_FUNC_CALLOC_IF(IF-WORKS, IF-NOT) +# ------------------------------------- +# If `calloc (0, 0)' is properly handled, run IF-WORKS, otherwise, IF-NOT. +AC_DEFUN([_AC_FUNC_CALLOC_IF], +[AC_REQUIRE([AC_HEADER_STDC])dnl +AC_CHECK_HEADERS(stdlib.h) +AC_CACHE_CHECK([for GNU libc compatible calloc], ac_cv_func_calloc_0_nonnull, +[AC_RUN_IFELSE( +[AC_LANG_PROGRAM( +[[#if STDC_HEADERS || HAVE_STDLIB_H +# include <stdlib.h> +#else +char *calloc (); +#endif +]], + [exit (calloc (0, 0) ? 0 : 1);])], + [ac_cv_func_calloc_0_nonnull=yes], + [ac_cv_func_calloc_0_nonnull=no], + [ac_cv_func_calloc_0_nonnull=no])]) +AS_IF([test $ac_cv_func_calloc_0_nonnull = yes], [$1], [$2]) +])# AC_FUNC_CALLOC + + +# AC_FUNC_CALLOC +# --------------- +# Report whether `calloc (0, 0)' is properly handled, and replace calloc if +# needed. +AC_DEFUN([AC_FUNC_CALLOC], +[_AC_FUNC_CALLOC_IF( + [AC_DEFINE([HAVE_CALLOC], 1, + [Define to 1 if your system has a GNU libc compatible `calloc' + function, and to 0 otherwise.])], + [AC_DEFINE([HAVE_CALLOC], 0) + AC_LIBOBJ([calloc]) + AC_DEFINE([calloc], [rpl_calloc], + [Define to rpl_calloc if the replacement function should be used.])]) +])# AC_FUNC_CALLOC