# HG changeset patch # User Karl Berry # Date 1032967298 0 # Node ID 3e25885877b3e359f51511a10ea8a161949bc2a6 # Parent 24e02e73265b3c8294debd832cccf88324472253 copy from libc/string (via ../config/srclist*). diff --git a/lib/strdup.c b/lib/strdup.c --- a/lib/strdup.c +++ b/lib/strdup.c @@ -1,42 +1,55 @@ -/* strdup.c -- return a newly allocated copy of a string - Copyright (C) 1990, 1998 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1996, 1997, 1998, 2002 Free Software Foundation, Inc. + This file is part of the GNU C Library. - 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 GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + The GNU C Library 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. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser 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. */ + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ -#if HAVE_CONFIG_H -# include +#ifdef HAVE_CONFIG_H +#include #endif -#ifdef STDC_HEADERS +#if defined _LIBC || defined STDC_HEADERS +# include # include -# include #else char *malloc (); -char *strcpy (); +char *memcpy (); +#endif + +#undef __strdup +#undef strdup + +#ifndef weak_alias +# define __strdup strdup #endif -/* Return a newly allocated copy of STR, - or 0 if out of memory. */ - +/* Duplicate S, returning an identical malloc'd string. */ char * -strdup (const char *str) +__strdup (const char *s) { - char *newstr; + size_t len = strlen (s) + 1; + void *new = malloc (len); + + if (new == NULL) + return NULL; - newstr = (char *) malloc (strlen (str) + 1); - if (newstr) - strcpy (newstr, str); - return newstr; + return (char *) memcpy (new, s, len); } +#ifdef libc_hidden_def +libc_hidden_def (__strdup) +#endif +#ifdef weak_alias +weak_alias (__strdup, strdup) +#endif