X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fstpncpy.c;h=37018e8bf7cd4ad02e34b8f1ac5240aa34496e9c;hb=1276a2c5f24c0c932426aca9c899fa524d2443f2;hp=7a645746097fcbe0dd1663d59f85100917b687fb;hpb=57fdfd3f8ec62b105c53bcdf6f127c35c7fe7391;p=gnulib.git diff --git a/lib/stpncpy.c b/lib/stpncpy.c index 7a6457460..37018e8bf 100644 --- a/lib/stpncpy.c +++ b/lib/stpncpy.c @@ -1,4 +1,5 @@ -/* Copyright (C) 1993, 1995-1997, 2002-2003, 2005-2007 Free Software Foundation, Inc. +/* Copyright (C) 1993, 1995-1997, 2002-2003, 2005-2007, 2009-2014 Free Software + * Foundation, Inc. NOTE: The canonical source of this file is maintained with the GNU C Library. Bugs can be reported to bug-glibc@gnu.org. @@ -30,7 +31,7 @@ /* Copy no more than N bytes of SRC to DST, returning a pointer past the last non-NUL byte written into DST. */ char * -__stpncpy (char *dest, const char *src, size_t n) +(__stpncpy) (char *dest, const char *src, size_t n) { char c; char *s = dest; @@ -40,26 +41,26 @@ __stpncpy (char *dest, const char *src, size_t n) size_t n4 = n >> 2; for (;;) - { - c = *src++; - *dest++ = c; - if (c == '\0') - break; - c = *src++; - *dest++ = c; - if (c == '\0') - break; - c = *src++; - *dest++ = c; - if (c == '\0') - break; - c = *src++; - *dest++ = c; - if (c == '\0') - break; - if (--n4 == 0) - goto last_chars; - } + { + c = *src++; + *dest++ = c; + if (c == '\0') + break; + c = *src++; + *dest++ = c; + if (c == '\0') + break; + c = *src++; + *dest++ = c; + if (c == '\0') + break; + c = *src++; + *dest++ = c; + if (c == '\0') + break; + if (--n4 == 0) + goto last_chars; + } n -= dest - s; goto zero_fill; } @@ -75,9 +76,9 @@ __stpncpy (char *dest, const char *src, size_t n) --n; *dest++ = c; if (c == '\0') - break; + break; if (n == 0) - return dest; + return dest; } zero_fill: