X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fstrdup.c;h=8c88e310a5bf8722480ad2eb66e9d7ed6efbcb5a;hb=bae84310eb40472530384f6d5c7738f5dc03a62d;hp=c0b05e2d15032270e54c0ccc05ec73f856b16691;hpb=cf42d3e5e80be6bf7093a3ca9be0d04033eaf527;p=gnulib.git

diff --git a/lib/strdup.c b/lib/strdup.c
index c0b05e2d1..8c88e310a 100644
--- a/lib/strdup.c
+++ b/lib/strdup.c
@@ -1,5 +1,7 @@
-/* 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, 2003, 2004 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
@@ -11,32 +13,44 @@
    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,
+   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.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 
-#ifdef STDC_HEADERS
-# include <string.h>
-# include <stdlib.h>
-#else
-char *malloc ();
-char *strcpy ();
+#ifndef _LIBC
+/* Get specification.  */
+# include "strdup.h"
 #endif
 
-/* Return a newly allocated copy of STR,
-   or 0 if out of memory. */
+#include <stdlib.h>
+#include <string.h>
+
+#undef __strdup
+#undef strdup
+
+#ifndef weak_alias
+# define __strdup strdup
+#endif
 
+/* 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);
 
-  newstr = (char *) malloc (strlen (str) + 1);
-  if (newstr)
-    strcpy (newstr, str);
-  return newstr;
+  if (new == NULL)
+    return NULL;
+
+  return (char *) memcpy (new, s, len);
 }
+#ifdef libc_hidden_def
+libc_hidden_def (__strdup)
+#endif
+#ifdef weak_alias
+weak_alias (__strdup, strdup)
+#endif