From c7fd2f4783d87f29f89709e11dc613b0cb04f0dc Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Tue, 23 Jul 1996 22:18:45 +0000 Subject: Tue Jul 23 18:13:37 1996 Roland McGrath * sysdeps/mach/hurd/Makefile (rpcuserlibs): New variable. ($(common-objpfx)libc.so): Move deps into that, use it. [$(subdir) = elf] ($(objpfx)librtld.so): Depend on $(rpcuserlibs:.so=_pic.a). * elf/Makefile ($(objpfx)librtld.so): Just depend on libc_pic.a; don't use $(LDLIBS-c.so). Thu Jul 18 21:41:25 1996 Andreas Schwab * sysdeps/generic/stpncpy.c: Fix semantics to make `stpncpy (d, s, n)' equivalent to `strncpy (d, s, n), d += strnlen (d, n)'. --- sysdeps/generic/stpncpy.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'sysdeps/generic') diff --git a/sysdeps/generic/stpncpy.c b/sysdeps/generic/stpncpy.c index 5cdd93d19e..427ed4b228 100644 --- a/sysdeps/generic/stpncpy.c +++ b/sysdeps/generic/stpncpy.c @@ -24,15 +24,13 @@ Cambridge, MA 02139, USA. */ /* Copy no more than N characters of SRC to DEST, returning the address of - the last character written into DEST. */ + the terminating '\0' in DEST, if any, or else DEST + N. */ char * DEFUN(__stpncpy, (dest, src, n), char *dest AND CONST char *src AND size_t n) { reg_char c; char *s = dest; - --dest; - if (n >= 4) { size_t n4 = n >> 2; @@ -40,27 +38,27 @@ DEFUN(__stpncpy, (dest, src, n), char *dest AND CONST char *src AND size_t n) for (;;) { c = *src++; - *++dest = c; + *dest++ = c; if (c == '\0') break; c = *src++; - *++dest = c; + *dest++ = c; if (c == '\0') break; c = *src++; - *++dest = c; + *dest++ = c; if (c == '\0') break; c = *src++; - *++dest = c; + *dest++ = c; if (c == '\0') break; if (--n4 == 0) goto last_chars; } - n = n - (dest - s) - 1; + n -= dest - s; if (n == 0) - return dest; + return dest - 1; goto zero_fill; } @@ -69,20 +67,22 @@ DEFUN(__stpncpy, (dest, src, n), char *dest AND CONST char *src AND size_t n) if (n == 0) return dest; - do + for (;;) { c = *src++; - *++dest = c; + *dest++ = c; + if (c == '\0') + break; if (--n == 0) return dest; } - while (c != '\0'); + --n; zero_fill: - while (n-- > 0) + while (--n > 0) dest[n] = '\0'; - return dest; + return dest - 1; } weak_alias (__stpncpy, stpncpy) -- cgit 1.4.1