diff options
| -rw-r--r-- | lib/libc/string/strlcat.c | 10 | ||||
| -rw-r--r-- | lib/libc/string/strlcpy.3 | 8 | ||||
| -rw-r--r-- | lib/libc/string/strlcpy.c | 29 | ||||
| -rw-r--r-- | sys/libkern/strlcat.c | 10 | ||||
| -rw-r--r-- | sys/libkern/strlcpy.c | 29 |
5 files changed, 48 insertions, 38 deletions
diff --git a/lib/libc/string/strlcat.c b/lib/libc/string/strlcat.c index 2e8c569..599994e 100644 --- a/lib/libc/string/strlcat.c +++ b/lib/libc/string/strlcat.c @@ -1,4 +1,4 @@ -/* $OpenBSD: strlcat.c,v 1.1 1998/07/01 01:29:45 millert Exp $ */ +/* $OpenBSD: strlcat.c,v 1.2 1999/06/17 16:28:58 millert Exp $ */ /* * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com> @@ -28,7 +28,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char *rcsid = "$OpenBSD: strlcat.c,v 1.1 1998/07/01 01:29:45 millert Exp $"; +static char *rcsid = "$OpenBSD: strlcat.c,v 1.2 1999/06/17 16:28:58 millert Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/types.h> @@ -50,11 +50,11 @@ size_t strlcat(dst, src, siz) register size_t n = siz; size_t dlen; - /* Find the end of dst and adjust bytes left */ - while (*d != '\0' && n != 0) + /* Find the end of dst and adjust bytes left but don't go past end */ + while (*d != '\0' && n-- != 0) d++; dlen = d - dst; - n -= dlen; + n = siz - dlen; if (n == 0) return(dlen + strlen(s)); diff --git a/lib/libc/string/strlcpy.3 b/lib/libc/string/strlcpy.3 index 1e46ef2..5202666 100644 --- a/lib/libc/string/strlcpy.3 +++ b/lib/libc/string/strlcpy.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: strlcpy.3,v 1.3 1998/11/11 17:12:02 espie Exp $ +.\" $OpenBSD: strlcpy.3,v 1.5 1999/06/06 15:17:32 aaron Exp $ .\" .\" Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com> .\" All rights reserved. @@ -29,7 +29,7 @@ .Dt STRLCPY 3 .Os .Sh NAME -.Nm strlcpy, +.Nm strlcpy , .Nm strlcat .Nd size-bounded string copying and concatenation .Sh SYNOPSIS @@ -143,5 +143,5 @@ and As a matter of fact, the first version of this manual page got it wrong. .Sh SEE ALSO .Xr snprintf 3 , -.Xr strncpy 3 , -.Xr strncat 3 +.Xr strncat 3 , +.Xr strncpy 3 diff --git a/lib/libc/string/strlcpy.c b/lib/libc/string/strlcpy.c index 2b6a166..300a28b 100644 --- a/lib/libc/string/strlcpy.c +++ b/lib/libc/string/strlcpy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: strlcpy.c,v 1.2 1998/11/06 04:33:16 wvdputte Exp $ */ +/* $OpenBSD: strlcpy.c,v 1.4 1999/05/01 18:56:41 millert Exp $ */ /* * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com> @@ -28,7 +28,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char *rcsid = "$OpenBSD: strlcpy.c,v 1.2 1998/11/06 04:33:16 wvdputte Exp $"; +static char *rcsid = "$OpenBSD: strlcpy.c,v 1.4 1999/05/01 18:56:41 millert Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/types.h> @@ -48,16 +48,21 @@ size_t strlcpy(dst, src, siz) register const char *s = src; register size_t n = siz; - if (n == 0) - return(strlen(s)); - while (*s != '\0') { - if (n != 1) { - *d++ = *s; - n--; - } - s++; + /* Copy as many bytes as will fit */ + if (n != 0 && --n != 0) { + do { + if ((*d++ = *s++) == 0) + break; + } while (--n != 0); } - *d = '\0'; - return(s - src); /* count does not include NUL */ + /* Not enough room in dst, add NUL and traverse rest of src */ + if (n == 0) { + if (siz != 0) + *d = '\0'; /* NUL-terminate dst */ + while (*s++) + ; + } + + return(s - src - 1); /* count does not include NUL */ } diff --git a/sys/libkern/strlcat.c b/sys/libkern/strlcat.c index 2e8c569..599994e 100644 --- a/sys/libkern/strlcat.c +++ b/sys/libkern/strlcat.c @@ -1,4 +1,4 @@ -/* $OpenBSD: strlcat.c,v 1.1 1998/07/01 01:29:45 millert Exp $ */ +/* $OpenBSD: strlcat.c,v 1.2 1999/06/17 16:28:58 millert Exp $ */ /* * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com> @@ -28,7 +28,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char *rcsid = "$OpenBSD: strlcat.c,v 1.1 1998/07/01 01:29:45 millert Exp $"; +static char *rcsid = "$OpenBSD: strlcat.c,v 1.2 1999/06/17 16:28:58 millert Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/types.h> @@ -50,11 +50,11 @@ size_t strlcat(dst, src, siz) register size_t n = siz; size_t dlen; - /* Find the end of dst and adjust bytes left */ - while (*d != '\0' && n != 0) + /* Find the end of dst and adjust bytes left but don't go past end */ + while (*d != '\0' && n-- != 0) d++; dlen = d - dst; - n -= dlen; + n = siz - dlen; if (n == 0) return(dlen + strlen(s)); diff --git a/sys/libkern/strlcpy.c b/sys/libkern/strlcpy.c index 2b6a166..300a28b 100644 --- a/sys/libkern/strlcpy.c +++ b/sys/libkern/strlcpy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: strlcpy.c,v 1.2 1998/11/06 04:33:16 wvdputte Exp $ */ +/* $OpenBSD: strlcpy.c,v 1.4 1999/05/01 18:56:41 millert Exp $ */ /* * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com> @@ -28,7 +28,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char *rcsid = "$OpenBSD: strlcpy.c,v 1.2 1998/11/06 04:33:16 wvdputte Exp $"; +static char *rcsid = "$OpenBSD: strlcpy.c,v 1.4 1999/05/01 18:56:41 millert Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/types.h> @@ -48,16 +48,21 @@ size_t strlcpy(dst, src, siz) register const char *s = src; register size_t n = siz; - if (n == 0) - return(strlen(s)); - while (*s != '\0') { - if (n != 1) { - *d++ = *s; - n--; - } - s++; + /* Copy as many bytes as will fit */ + if (n != 0 && --n != 0) { + do { + if ((*d++ = *s++) == 0) + break; + } while (--n != 0); } - *d = '\0'; - return(s - src); /* count does not include NUL */ + /* Not enough room in dst, add NUL and traverse rest of src */ + if (n == 0) { + if (siz != 0) + *d = '\0'; /* NUL-terminate dst */ + while (*s++) + ; + } + + return(s - src - 1); /* count does not include NUL */ } |
