sad

commit 3e8f69d7ba7b317abde1c60f8986f0b91554bea0
parent 8634053d7f410a56a1e9c9fdc5f0f49832403007
Author: sin <sin@2f30.org>
Date:   Sat, 27 Dec 2014 18:22:12 +0000

Add strlcat

Diffstat:
M
Makefile
 | 
1
+
M
compat.h
 | 
2
++
A
compat/strlcat.c
 | 
52
++++++++++++++++++++++++++++++++++++++++++++++++++++

3 files changed, 55 insertions(+), 0 deletions(-)
diff --git a/Makefile b/Makefile
@@ -23,6 +23,7 @@ BIN = sad
 
 # non-OpenBSD
 OBJ += compat/reallocarray.o
+OBJ += compat/strlcat.o
 OBJ += compat/strlcpy.o
 CFLAGS += -DCOMPAT
 
diff --git a/compat.h b/compat.h
@@ -1,4 +1,6 @@
 #undef reallocarray
 void *reallocarray(void *, size_t, size_t);
+#undef strlcat
+size_t strlcat(char *, const char *, size_t);
 #undef strlcpy
 size_t strlcpy(char *, const char *, size_t);
diff --git a/compat/strlcat.c b/compat/strlcat.c
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 1998 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
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <string.h>
+#include <sys/types.h>
+
+#include "../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)).
+ * If retval >= siz, truncation occurred.
+ */
+size_t
+strlcat(char *dst, const char *src, size_t siz)
+{
+	char *d = dst;
+	const char *s = src;
+	size_t n = siz;
+	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;
+			n--;
+		}
+		s++;
+	}
+	*d = '\0';
+	return(dlen + (s - src)); /* count does not include NUL */
+}