Mercurial > hg > octave-kai > gnulib-hg
changeset 4039:7c15210f0e35
copy strdup.c from libc again.
author | Karl Berry <karl@freefriends.org> |
---|---|
date | Tue, 26 Nov 2002 22:58:57 +0000 |
parents | 69fb0d1be42e |
children | 0546d7f367db |
files | config/srclist-update config/srclist.txt lib/.cppi-disable lib/ChangeLog lib/strdup.c |
diffstat | 5 files changed, 15 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/config/srclist-update +++ b/config/srclist-update @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: srclist-update,v 1.4 2002-11-25 13:17:17 meyering Exp $ +# $Id: srclist-update,v 1.5 2002-11-26 22:58:57 karl Exp $ # # Check for files in directory $1 being up to date, according to the # list on stdin. Don't actually make any changes, just show the diffs. @@ -13,8 +13,9 @@ verbose=false #chicken="echo (would)" -srctmp=${TMPDIR-/tmp}/srclist.src -dsttmp=${TMPDIR-/tmp}/srclist.dst +: ${TMPDIR=/tmp} +srctmp=$TMPDIR/srclist.src +dsttmp=$TMPDIR/srclist.dst mydir=`dirname $0` test -r $mydir/srclistvars.sh && . $mydir/srclistvars.sh
--- a/config/srclist.txt +++ b/config/srclist.txt @@ -1,4 +1,4 @@ -# $Id: srclist.txt,v 1.10 2002-11-25 22:24:53 karl Exp $ +# $Id: srclist.txt,v 1.11 2002-11-26 22:58:57 karl Exp $ # Files for which we are not the source. See ./srclistvars.sh for the # variable definitions. @@ -26,7 +26,7 @@ $LIBCSRC/posix/getopt.h lib gpl $LIBCSRC/posix/getopt1.c lib gpl $LIBCSRC/posix/regex.h lib gpl -#$LIBCSRC/string/strdup.c lib gpl +$LIBCSRC/string/strdup.c lib gpl $LIBCSRC/time/mktime.c lib gpl # # - libc/sysdeps/generic has memcpy.c, memmove.c, strcasecmp.c, but they
--- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,8 @@ +2002-11-26 <karl@gnu.org> + + * strdup.c: copy from libc again, with jim's ok. + * .cppi-disable: re-add strdup.c + 2002-11-25 <karl@gnu.org> * strtoll.c: copy from libc, meaning we now #include <strtol.c>
--- a/lib/strdup.c +++ b/lib/strdup.c @@ -15,8 +15,8 @@ with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#if HAVE_CONFIG_H -# include <config.h> +#ifdef HAVE_CONFIG_H +#include <config.h> #endif #if defined _LIBC || defined STDC_HEADERS @@ -34,9 +34,7 @@ # define __strdup strdup #endif -/* Duplicate S, returning an identical malloc'd string. - Return NULL if out of memory. */ - +/* Duplicate S, returning an identical malloc'd string. */ char * __strdup (const char *s) {