sad

commit 8634053d7f410a56a1e9c9fdc5f0f49832403007
parent b9e22d58aa5bf28af8d3c39e77bd274446e05323
Author: sin <sin@2f30.org>
Date:   Sat, 27 Dec 2014 18:20:36 +0000

Add strlcpy

Diffstat:
M
Makefile
 | 
1
+
M
compat.h
 | 
4
+++-
M
compat/reallocarray.c
 | 
2
++
A
compat/strlcpy.c
 | 
48
++++++++++++++++++++++++++++++++++++++++++++++++

4 files changed, 54 insertions(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
@@ -23,6 +23,7 @@ BIN = sad
 
 # non-OpenBSD
 OBJ += compat/reallocarray.o
+OBJ += compat/strlcpy.o
 CFLAGS += -DCOMPAT
 
 all: $(BIN)
diff --git a/compat.h b/compat.h
@@ -1,2 +1,4 @@
 #undef reallocarray
-void * reallocarray(void *, size_t, size_t);
+void *reallocarray(void *, size_t, size_t);
+#undef strlcpy
+size_t strlcpy(char *, const char *, size_t);
diff --git a/compat/reallocarray.c b/compat/reallocarray.c
@@ -20,6 +20,8 @@
 #include <stdint.h>
 #include <stdlib.h>
 
+#include "../compat.h"
+
 /*
  * This is sqrt(SIZE_MAX+1), as s1*s2 <= SIZE_MAX
  * if both s1 < MUL_NO_OVERFLOW and s2 < MUL_NO_OVERFLOW
diff --git a/compat/strlcpy.c b/compat/strlcpy.c
@@ -0,0 +1,48 @@
+/*
+ * 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"
+
+/*
+ * 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.
+ */
+size_t
+strlcpy(char *dst, const char *src, size_t siz)
+{
+	char *d = dst;
+	const char *s = src;
+	size_t n = siz;
+	/* Copy as many bytes as will fit */
+	if (n != 0) {
+		while (--n != 0) {
+			if ((*d++ = *s++) == '\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++)
+			;
+	}
+	return(s - src - 1); /* count does not include NUL */
+}