do not crash when a manpath directory contains a symbolic link

[mandoc.git] / compat_strlcpy.c

diff --git a/compat_strlcpy.c b/compat_strlcpy.c
index ccdf9319b56758ed5be267b42fd7705d84cd7249..2e7201a64953a8c8f51da1482852d65da8434d6f 100644 (file)
--- a/compat_strlcpy.c
+++ b/compat_strlcpy.c
@@ -1,15 +1,8 @@
-#include "config.h"
-
-#ifdef HAVE_STRLCPY
-
-int dummy;
-
-#else
-
-/*     $OpenBSD: strlcpy.c,v 1.11 2006/05/05 15:27:38 millert Exp $    */
+/*     $Id: compat_strlcpy.c,v 1.6 2020/06/15 20:49:57 schwarze Exp $  */
+/*     $OpenBSD: strlcpy.c,v 1.16 2019/01/25 00:19:25 millert Exp $    */
 
 /*
- * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
+ * Copyright (c) 1998, 2015 Todd C. Miller <millert@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -23,39 +16,37 @@ int dummy;
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
+#include "config.h"
 
 #include <sys/types.h>
 #include <string.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
-strlcpy(char *dst, const char *src, size_t siz)
+strlcpy(char *dst, const char *src, size_t dsize)
 {
-       char *d = dst;
-       const char *s = src;
-       size_t n = siz;
+       const char *osrc = src;
+       size_t nleft = dsize;
 
-       /* Copy as many bytes as will fit */
-       if (n != 0) {
-               while (--n != 0) {
-                       if ((*d++ = *s++) == '\0')
+       /* Copy as many bytes as will fit. */
+       if (nleft != 0) {
+               while (--nleft != 0) {
+                       if ((*dst++ = *src++) == '\0')
                                break;
                }
        }
 
-       /* 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