From 74dcaddc5561b811c8d9f9c826f3d765c4131275 Mon Sep 17 00:00:00 2001
From: Joachim Nilsson <troglobit@gmail.com>
Date: Thu, 7 Jan 2016 02:08:07 +0100
Subject: [PATCH] strlcat.c: Update to OpenBSD v1.14, readability fixes

Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
---
 ChangeLog.md |  1 +
 strlcat.c    | 57 ++++++++++++++++++++++------------------------------
 2 files changed, 25 insertions(+), 33 deletions(-)

diff --git a/ChangeLog.md b/ChangeLog.md
index 365be87..193a115 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -15,6 +15,7 @@ All notable changes to the project are documented in this file.
 - Note, this release update `queue.h` to OpenBSD v1.43, which removes
   support for circular queues (CIRCLEQ).
 - Update `strlcpy.c` to OpenBSD v1.12, readability fixes.
+- Update `strlcat.c` to OpenBSD v1.14, readability fixes.
 
 
 [v1.2.0][] - 2015-11-23
diff --git a/strlcat.c b/strlcat.c
index 18406f3..d38e322 100644
--- a/strlcat.c
+++ b/strlcat.c
@@ -1,7 +1,7 @@
-/*	$OpenBSD: strlcat.c,v 1.13 2005/08/08 08:05:37 espie Exp $	*/
+/*	$OpenBSD: strlcat.c,v 1.15 2015/03/02 21:41:08 millert Exp $	*/
 
 /*
- * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
+ * Copyright (c) 1998, 2015 Todd C. Miller <Todd.Miller@courtesan.com>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -21,46 +21,37 @@
 
 #ifndef strlcat
 /*
- * 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)).
- * If retval >= siz, truncation occurred.
+ * 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 >= dsize, truncation occurred.
  */
 size_t
-strlcat(char *dst, const char *src, size_t siz)
+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;
+	/* 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(s));
-	while (*s != '\0') {
-		if (n != 1) {
-			*d++ = *s;
+	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
-
-/**
- * Local Variables:
- *  version-control: t
- *  c-file-style: "bsd"
- * End:
- */
-
-