Thu Jan 9 11:25:11 2014 UTC ()
Make strnlen implementation usable from src/tools/compat.


(apb)
diff -r1.1 -r1.2 src/common/lib/libc/string/strnlen.c
cvs diff -r1.1 -r1.2 src/common/lib/libc/string/strnlen.c (expand / switch to unified diff)

--- src/common/lib/libc/string/strnlen.c 2011/09/01 22:35:18 1.1
+++ src/common/lib/libc/string/strnlen.c 2014/01/09 11:25:11 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: strnlen.c,v 1.1 2011/09/01 22:35:18 jym Exp $ */ 1/* $NetBSD: strnlen.c,v 1.2 2014/01/09 11:25:11 apb Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2009 David Schultz <das@FreeBSD.org> 4 * Copyright (c) 2009 David Schultz <das@FreeBSD.org>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
@@ -16,36 +16,42 @@ @@ -16,36 +16,42 @@
16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND 16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
17 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 17 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
18 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 18 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
19 * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE 19 * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
20 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 20 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
21 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 21 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
22 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 22 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
23 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 23 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
24 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 24 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
26 * SUCH DAMAGE. 26 * SUCH DAMAGE.
27 */ 27 */
28 28
 29#if HAVE_NBTOOL_CONFIG_H
 30#include "nbtool_config.h"
 31#endif
 32
29#include <sys/cdefs.h> 33#include <sys/cdefs.h>
30#if defined(LIBC_SCCS) && !defined(lint) 34#if defined(LIBC_SCCS) && !defined(lint)
31__RCSID("$NetBSD: strnlen.c,v 1.1 2011/09/01 22:35:18 jym Exp $"); 35__RCSID("$NetBSD: strnlen.c,v 1.2 2014/01/09 11:25:11 apb Exp $");
32#endif /* LIBC_SCCS and not lint */ 36#endif /* LIBC_SCCS and not lint */
33/* FreeBSD: src/lib/libc/string/strnlen.c,v 1.1 2009/02/28 06:00:58 das Exp */ 37/* FreeBSD: src/lib/libc/string/strnlen.c,v 1.1 2009/02/28 06:00:58 das Exp */
34 38
35#if !defined(_KERNEL) && !defined(_STANDALONE) 39#if !defined(_KERNEL) && !defined(_STANDALONE)
36#include <string.h> 40#include <string.h>
37#else 41#else
38#include <lib/libkern/libkern.h> 42#include <lib/libkern/libkern.h>
39#endif 43#endif
40 44
 45#if !HAVE_STRNLEN
41size_t 46size_t
42strnlen(const char *s, size_t maxlen) 47strnlen(const char *s, size_t maxlen)
43{ 48{
44 size_t len; 49 size_t len;
45 50
46 for (len = 0; len < maxlen; len++, s++) { 51 for (len = 0; len < maxlen; len++, s++) {
47 if (!*s) 52 if (!*s)
48 break; 53 break;
49 } 54 }
50 return (len); 55 return (len);
51} 56}
 57#endif /* !HAVE_STRNLEN */