aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDJ Delorie <dj@redhat.com>2003-04-15 03:02:18 +0000
committerDJ Delorie <dj@redhat.com>2003-04-15 03:02:18 +0000
commiteec539c7798006fabf0ceeeac3e64593daed85a7 (patch)
treea600d308f4ec2317d57459c61fe98715395beb7f
parent5dd55bddfedf047fb635b6ea9655e5a6f324e62e (diff)
downloadfsf-binutils-gdb-eec539c7798006fabf0ceeeac3e64593daed85a7.zip
fsf-binutils-gdb-eec539c7798006fabf0ceeeac3e64593daed85a7.tar.gz
fsf-binutils-gdb-eec539c7798006fabf0ceeeac3e64593daed85a7.tar.bz2
merge from gcc
-rw-r--r--libiberty/ChangeLog4
-rw-r--r--libiberty/strdup.c21
2 files changed, 20 insertions, 5 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 28cb255..6e9f693 100644
--- 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 49233ba..071a4a4 100644
--- 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);
}