[coreboot] New patch to review: 8f68886 libpayload: Implement strlcpy

[Patrick Georgi (patrick@georgi-clan.de)]

Patrick Georgi (patrick at georgi-clan.de) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/85

-gerrit

commit 8f688867d3237a6aa78cb1afa4d9ab4747b49275
Author: Patrick Georgi <Patrick.Georgi at secunet.com>
Date:   Fri Mar 11 09:34:23 2011 +0100

    libpayload: Implement strlcpy
    
    Change-Id: Ibd339957690afe2cded46895c3088eba87f0ffd1
    Signed-off-by: Patrick Georgi <patrick.georgi at secunet.com>
---
 payloads/libpayload/include/string.h  |   10 ++++++-
 payloads/libpayload/libc/Makefile.inc |    1 +
 payloads/libpayload/libc/strlcpy.c    |   51 +++++++++++++++++++++++++++++++++
 3 files changed, 61 insertions(+), 1 deletions(-)

diff --git a/payloads/libpayload/include/string.h b/payloads/libpayload/include/string.h
index 88054e0..9e4f791 100644
--- a/payloads/libpayload/include/string.h
+++ b/payloads/libpayload/include/string.h
@@ -55,7 +55,6 @@ int strncasecmp(const char *s1, const char *s2, size_t maxlen);
 char *strncpy(char *d, const char *s, size_t n);
 char *strcpy(char *d, const char *s);
 char *strncat(char *d, const char *s, size_t n);
-size_t strlcat(char *d, const char *s, size_t n);
 char *strcat(char *d, const char *s);
 char *strchr(const char *s, int c);
 char *strrchr(const char *s, int c);
@@ -68,4 +67,13 @@ char* strtok(char *str, const char *delim);
 char* strtok_r(char *str, const char *delim, char **ptr);
 /** @} */
 
+/**
+ * @defgroup string OpenBSD based safe string functions
+ * @{
+ */
+size_t strlcpy(char *d, const char *s, size_t n);
+size_t strlcat(char *d, const char *s, size_t n);
+/** @} */
+
+
 #endif
diff --git a/payloads/libpayload/libc/Makefile.inc b/payloads/libpayload/libc/Makefile.inc
index 4ec2a02..e5c626f 100644
--- a/payloads/libpayload/libc/Makefile.inc
+++ b/payloads/libpayload/libc/Makefile.inc
@@ -33,6 +33,7 @@ libc-$(CONFIG_LIBC) += memory.c ctype.c ipchecksum.c lib.c
 libc-$(CONFIG_LIBC) += rand.c time.c exec.c
 libc-$(CONFIG_LIBC) += readline.c getopt_long.c sysinfo.c
 libc-$(CONFIG_LIBC) += args.c strings.c
+libc-$(CONFIG_LIBC) += strlcpy.c
 
 # should be moved to coreboot directory
 libc-$(CONFIG_LAR) += lar.c
diff --git a/payloads/libpayload/libc/strlcpy.c b/payloads/libpayload/libc/strlcpy.c
new file mode 100644
index 0000000..d32b659
--- /dev/null
+++ b/payloads/libpayload/libc/strlcpy.c
@@ -0,0 +1,51 @@
+/*	$OpenBSD: strlcpy.c,v 1.11 2006/05/05 15:27:38 millert Exp $	*/
+
+/*
+ * Copyright (c) 1998 Todd C. Miller <Todd.Miller at 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 <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.
+ */
+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 */
+}