diff options
Diffstat (limited to 'string/strncat.c')
-rw-r--r-- | string/strncat.c | 53 |
1 files changed, 5 insertions, 48 deletions
diff --git a/string/strncat.c b/string/strncat.c index 7ac44561bd..12572aebdb 100644 --- a/string/strncat.c +++ b/string/strncat.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991-2014 Free Software Foundation, Inc. +/* Copyright (C) 1991-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -17,10 +17,6 @@ #include <string.h> -#ifdef _LIBC -# include <memcopy.h> -#endif - #ifndef STRNCAT # undef strncat # define STRNCAT strncat @@ -29,54 +25,15 @@ char * STRNCAT (char *s1, const char *s2, size_t n) { - char c; char *s = s1; /* Find the end of S1. */ - do - c = *s1++; - while (c != '\0'); - - /* Make S1 point before next character, so we can increment - it while memory is read (wins on pipelined cpus). */ - s1 -= 2; - - if (n >= 4) - { - size_t n4 = n >> 2; - do - { - c = *s2++; - *++s1 = c; - if (c == '\0') - return s; - c = *s2++; - *++s1 = c; - if (c == '\0') - return s; - c = *s2++; - *++s1 = c; - if (c == '\0') - return s; - c = *s2++; - *++s1 = c; - if (c == '\0') - return s; - } while (--n4 > 0); - n &= 3; - } + s1 += strlen (s1); - while (n > 0) - { - c = *s2++; - *++s1 = c; - if (c == '\0') - return s; - n--; - } + size_t ss = __strnlen (s2, n); - if (c != '\0') - *++s1 = '\0'; + s1[ss] = '\0'; + memcpy (s1, s2, ss); return s; } |