merge from gcc

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 28cb255551b7fd6b9fd50945bb5a06f9454ae27c..6e9f6937dd72e1c6c4ea96e79aacce5384d5e530 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,7 @@
+2003-04-14  Roger Sayle  <roger@eyesopen.com>
+
+       * strdup.c (strdup): Tweak implementation to use memcpy.
+
 2003-04-14  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
        * configure.in (HAVE_UINTPTR_T): Always define.

diff --git a/libiberty/strdup.c b/libiberty/strdup.c
index 49233ba7aac99603030a43264b5e7ea8b08149d3..071a4a401af754fb847734f54bc7fc60e3204744 100644 (file)
--- a/libiberty/strdup.c
+++ b/libiberty/strdup.c
@@ -9,13 +9,24 @@ Returns a pointer to a copy of @var{s} in memory obtained from
 
 */
 
+#include <ansidecl.h>
+#ifdef ANSI_PROTOTYPES
+#include <stddef.h>
+#else
+#define size_t unsigned long
+#endif
+
+extern size_t  strlen PARAMS ((const char*));
+extern PTR     malloc PARAMS ((size_t));
+extern PTR     memcpy PARAMS ((PTR, const PTR, size_t));
+
 char *
 strdup(s)
      char *s;
 {
-    char *result = (char*)malloc(strlen(s) + 1);
-    if (result == (char*)0)
-       return (char*)0;
-    strcpy(result, s);
-    return result;
+  size_t len = strlen (s) + 1;
+  char *result = (char*) malloc (len);
+  if (result == (char*) 0)
+    return (char*) 0;
+  return (char*) memcpy (result, s, len);
 }