Browse Source

Make strdup() use memcpy() rather than strcpy() to duplicate the string.
The rationale is that we already have the length of the string to
duplicate (from doing the malloc()), and memcpy() should then always be
faster than strcpy() (or at least as fast).

Peter Kjellerstedt 17 years ago
parent
commit
c2c7d1a645
1 changed files with 4 additions and 6 deletions
  1. 4 6
      libc/string/strdup.c

+ 4 - 6
libc/string/strdup.c

@@ -10,25 +10,23 @@
 
 #ifdef WANT_WIDE
 libc_hidden_proto(wcslen)
-libc_hidden_proto(wcscpy)
 # define Wstrdup wcsdup
 # define Wstrlen wcslen
-# define Wstrcpy wcscpy
 #else
 libc_hidden_proto(strdup)
 libc_hidden_proto(strlen)
-libc_hidden_proto(strcpy)
 # define Wstrdup strdup
 # define Wstrlen strlen
-# define Wstrcpy strcpy
 #endif
+libc_hidden_proto(memcpy)
 
 Wchar *Wstrdup(register const Wchar *s1)
 {
 	register Wchar *s;
+	register size_t l = (Wstrlen(s1) + 1) * sizeof(Wchar);
 
-    if ((s = malloc((Wstrlen(s1) + 1) * sizeof(Wchar))) != NULL) {
-		Wstrcpy(s, s1);
+	if ((s = malloc(l)) != NULL) {
+		memcpy(s, s1, l);
 	}
 
 	return s;