2 files changed, 10 insertions, 10 deletions

diff --git a/src/lib/libc/string/strlcpy.c b/src/lib/libc/string/strlcpy.c
index 110155f76f..d32b6590f1 100644
--- a/src/lib/libc/string/strlcpy.c
+++ b/src/lib/libc/string/strlcpy.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: strlcpy.c,v 1.10 2005/08/08 08:05:37 espie Exp $      */
+/*      $OpenBSD: strlcpy.c,v 1.11 2006/05/05 15:27:38 millert Exp $    */
 
 /*
  * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -32,11 +32,11 @@ strlcpy(char *dst, const char *src, size_t siz)
         size_t n = siz;
 
         /* Copy as many bytes as will fit */
-        if (n != 0 && --n != 0) {
-                do {
-                        if ((*d++ = *s++) == 0)
+        if (n != 0) {
+                while (--n != 0) {
+                        if ((*d++ = *s++) == '\0')
                                 break;
-                } while (--n != 0);
+                }
         }
 
         /* Not enough room in dst, add NUL and traverse rest of src */
diff --git a/src/lib/libc/string/wcslcpy.c b/src/lib/libc/string/wcslcpy.c
index 4a9afffd98..85f51df35f 100644
--- a/src/lib/libc/string/wcslcpy.c
+++ b/src/lib/libc/string/wcslcpy.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: wcslcpy.c,v 1.3 2005/08/08 08:05:37 espie Exp $       */
+/*      $OpenBSD: wcslcpy.c,v 1.4 2006/05/05 15:27:38 millert Exp $     */
 /*      $NetBSD: wcslcpy.c,v 1.2 2001/01/03 14:33:02 lukem Exp $        */
 /*      from OpenBSD: strlcpy.c,v 1.4 1999/05/01 18:56:41 millert Exp   */
 
@@ -45,11 +45,11 @@ wcslcpy(wchar_t *dst, const wchar_t *src, size_t siz)
         size_t n = siz;
 
         /* Copy as many bytes as will fit */
-        if (n != 0 && --n != 0) {
-                do {
-                        if ((*d++ = *s++) == 0)
+        if (n != 0) {
+                while (--n != 0) {
+                        if ((*d++ = *s++) == '\0')
                                 break;
-                } while (--n != 0);
+                }
         }
 
         /* Not enough room in dst, add NUL and traverse rest of src */