Sync with OpenBSD version

diff --git a/lib/util/strlcat.c b/lib/util/strlcat.c
index ef4fdf762796cc40d9bf2d9fffe22f272a15add5..d3542a6b865ab353b2629a2bfdf4acd4883646b4 100644 (file)
--- a/lib/util/strlcat.c
+++ b/lib/util/strlcat.c
@@ -1,7 +1,7 @@
 /*     $OpenBSD: strlcat.c,v 1.8 2001/05/13 15:40:15 deraadt Exp $     */
 
 /*
- * Copyright (c) 1998, 2003-2005, 2010-2011, 2013, 2014
+ * Copyright (c) 1998, 2003-2005, 2010-2011, 2013-2015
  *     Todd C. Miller <Todd.Miller@courtesan.com>
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -27,37 +27,37 @@
 #include "sudo_compat.h"
 
 /*
- * Appends src to string dst of size siz (unlike strncat, siz is the
- * full size of dst, not space left).  At most siz-1 characters
- * will be copied.  Always NUL terminates (unless siz <= strlen(dst)).
- * Returns strlen(src) + MIN(siz, strlen(initial dst)).
+ * Appends src to string dst of size dsize (unlike strncat, dsize is the
+ * full size of dst, not space left).  At most dsize-1 characters
+ * will be copied.  Always NUL terminates (unless dsize <= strlen(dst)).
+ * Returns strlen(src) + MIN(dsize, strlen(initial dst)).
  * If retval >= siz, truncation occurred.
  */
 size_t
-sudo_strlcat(char *dst, const char *src, size_t siz)
+sudo_strlcat(char *dst, const char *src, size_t dsize)
 {
-       char *d = dst;
-       const char *s = src;
-       size_t n = siz;
+       const char *odst = dst;
+       const char *osrc = src;
+       size_t n = dsize;
        size_t dlen;
 
-       /* Find the end of dst and adjust bytes left but don't go past end */
-       while (n-- != 0 && *d != '\0')
-               d++;
-       dlen = d - dst;
-       n = siz - dlen;
-
-       if (n == 0)
-               return dlen + strlen(s);
-       while (*s != '\0') {
-               if (n != 1) {
-                       *d++ = *s;
+       /* Find the end of dst and adjust bytes left but don't go past end. */
+       while (n-- != 0 && *dst != '\0')
+               dst++;
+       dlen = dst - odst;
+       n = dsize - dlen;
+
+       if (n-- == 0)
+               return(dlen + strlen(src));
+       while (*src != '\0') {
+               if (n != 0) {
+                       *dst++ = *src;
                        n--;
                }
-               s++;
+               src++;
        }
-       *d = '\0';
+       *dst = '\0';
 
-       return dlen + (s - src);        /* count does not include NUL */
+       return(dlen + (src - osrc));    /* count does not include NUL */
 }
 #endif /* HAVE_STRLCAT */

diff --git a/lib/util/strlcpy.c b/lib/util/strlcpy.c
index 60ff0dc60001b55ea239fccbbee8ebbf730304fd..ec60c82c3936996bfac694ca2f9f42beb290075d 100644 (file)
--- a/lib/util/strlcpy.c
+++ b/lib/util/strlcpy.c
@@ -1,7 +1,7 @@
 /*     $OpenBSD: strlcpy.c,v 1.5 2001/05/13 15:40:16 deraadt Exp $     */
 
 /*
- * Copyright (c) 1998, 2003-2005, 2010-2011, 2013, 2014
+ * Copyright (c) 1998, 2003-2005, 2010-2011, 2013-2015
  *     Todd C. Miller <Todd.Miller@courtesan.com>
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -26,33 +26,32 @@
 #include "sudo_compat.h"
 
 /*
- * Copy src to string dst of size siz.  At most siz-1 characters
- * will be copied.  Always NUL terminates (unless siz == 0).
- * Returns strlen(src); if retval >= siz, truncation occurred.
+ * Copy string src to buffer dst of size dsize.  At most dsize-1
+ * chars will be copied.  Always NUL terminates (unless dsize == 0).
+ * Returns strlen(src); if retval >= dsize, truncation occurred.
  */
 size_t
-sudo_strlcpy(char *dst, const char *src, size_t siz)
+sudo_strlcpy(char *dst, const char *src, size_t dsize)
 {
-       char *d = dst;
-       const char *s = src;
-       size_t n = siz;
-
-       /* Copy as many bytes as will fit */
-       if (n != 0 && --n != 0) {
-               do {
-                       if ((*d++ = *s++) == 0)
+       const char *osrc = src;
+       size_t nleft = dsize;
+
+       /* Copy as many bytes as will fit. */
+       if (nleft != 0) {
+               while (--nleft != 0) {
+                       if ((*dst++ = *src++) == '\0')
                                break;
-               } while (--n != 0);
+               }
        }
 
-       /* 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++)
+       /* Not enough room in dst, add NUL and traverse rest of src. */
+       if (nleft == 0) {
+               if (dsize != 0)
+                       *dst = '\0';            /* NUL-terminate dst */
+               while (*src++)
                        ;
        }
 
-       return s - src - 1;     /* count does not include NUL */
+       return(src - osrc - 1); /* count does not include NUL */
 }
 #endif /* HAVE_STRLCPY */