Module Name: src
Committed By: jym
Date: Thu Sep 1 22:35:18 UTC 2011
Modified Files:
src/sys/lib/libkern: libkern.h
Added Files:
src/common/lib/libc/string: strnlen.c
Removed Files:
src/lib/libc/string: strnlen.c
Log Message:
Make strnlen(3) accessible in kernel. ok christos@.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/common/lib/libc/string/strnlen.c
cvs rdiff -u -r1.1 -r0 src/lib/libc/string/strnlen.c
cvs rdiff -u -r1.98 -r1.99 src/sys/lib/libkern/libkern.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/lib/libkern/libkern.h
diff -u src/sys/lib/libkern/libkern.h:1.98 src/sys/lib/libkern/libkern.h:1.99
--- src/sys/lib/libkern/libkern.h:1.98 Tue Jul 5 01:56:45 2011
+++ src/sys/lib/libkern/libkern.h Thu Sep 1 22:35:17 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: libkern.h,v 1.98 2011/07/05 01:56:45 matt Exp $ */
+/* $NetBSD: libkern.h,v 1.99 2011/09/01 22:35:17 jym Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -277,6 +277,7 @@
char *strcpy(char *, const char *);
int strcmp(const char *, const char *);
size_t strlen(const char *);
+size_t strnlen(const char *, size_t);
char *strsep(char **, const char *);
#if __GNUC_PREREQ__(2, 95) && !defined(_STANDALONE)
#define strcpy(d, s) __builtin_strcpy(d, s)
Added files:
Index: src/common/lib/libc/string/strnlen.c
diff -u /dev/null src/common/lib/libc/string/strnlen.c:1.1
--- /dev/null Thu Sep 1 22:35:18 2011
+++ src/common/lib/libc/string/strnlen.c Thu Sep 1 22:35:18 2011
@@ -0,0 +1,51 @@
+/* $NetBSD: strnlen.c,v 1.1 2011/09/01 22:35:18 jym Exp $ */
+
+/*-
+ * Copyright (c) 2009 David Schultz <d...@freebsd.org>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <sys/cdefs.h>
+#if defined(LIBC_SCCS) && !defined(lint)
+__RCSID("$NetBSD: strnlen.c,v 1.1 2011/09/01 22:35:18 jym Exp $");
+#endif /* LIBC_SCCS and not lint */
+/* FreeBSD: src/lib/libc/string/strnlen.c,v 1.1 2009/02/28 06:00:58 das Exp */
+
+#if !defined(_KERNEL) && !defined(_STANDALONE)
+#include <string.h>
+#else
+#include <lib/libkern/libkern.h>
+#endif
+
+size_t
+strnlen(const char *s, size_t maxlen)
+{
+ size_t len;
+
+ for (len = 0; len < maxlen; len++, s++) {
+ if (!*s)
+ break;
+ }
+ return (len);
+}
