* string/stpcpy.c (__stpcpy): Rewrite using strlen and memcpy.

diff --git a/ChangeLog b/ChangeLog
index 2b6f0adbb2ca4da0b0989175c415312c546c51b1..9ed06fd0ff4e8d286505fe4a626d77cad75921b7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-12-23  Richard Earnshaw  <rearnsha@arm.com>
+
+       * string/stpcpy.c (__stpcpy): Rewrite using strlen and memcpy.
+
 2014-12-23  Florian Weimer  <fweimer@redhat.com>
 
        * iconvdata/run-iconv-test.sh: Actually test iconv modules.

diff --git a/string/stpcpy.c b/string/stpcpy.c
index 9185acc0341fd077e6e0602d095b05fc2d1069e0..fd6eb1c3dee08ed7ef6afbd87628dfe93e69bafe 100644 (file)
--- a/string/stpcpy.c
+++ b/string/stpcpy.c
@@ -35,14 +35,8 @@ __stpcpy (dest, src)
      char *dest;
      const char *src;
 {
-  char *d = dest;
-  const char *s = src;
-
-  do
-    *d++ = *s;
-  while (*s++ != '\0');
-
-  return d - 1;
+  size_t len = strlen (src);
+  return memcpy (dest, src, len + 1) + len;
 }
 #ifdef libc_hidden_def
 libc_hidden_def (__stpcpy)