diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | string/stpcpy.c | 10 |
2 files changed, 6 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog index 2b6f0adbb2..9ed06fd0ff 100644 --- 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 9185acc034..fd6eb1c3de 100644 --- 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) |