[Glibc-bsd-commits] r5194 - in trunk/freebsd-glue: debian include src/freebsd-glue
rmh at alioth.debian.org
rmh at alioth.debian.org
Sat Nov 30 11:10:08 UTC 2013
Author: rmh
Date: 2013-11-30 11:10:08 +0000 (Sat, 30 Nov 2013)
New Revision: 5194
Added:
trunk/freebsd-glue/src/freebsd-glue/strnstr.c
Modified:
trunk/freebsd-glue/debian/changelog
trunk/freebsd-glue/debian/copyright
trunk/freebsd-glue/debian/libfreebsd-glue-0.symbols
trunk/freebsd-glue/include/string.h
trunk/freebsd-glue/src/freebsd-glue/Makefile
Log:
Add strnstr().
Modified: trunk/freebsd-glue/debian/changelog
===================================================================
--- trunk/freebsd-glue/debian/changelog 2013-11-30 11:07:22 UTC (rev 5193)
+++ trunk/freebsd-glue/debian/changelog 2013-11-30 11:10:08 UTC (rev 5194)
@@ -1,3 +1,9 @@
+freebsd-glue (0.2.2) UNRELEASED; urgency=low
+
+ * Add strnstr().
+
+ -- Robert Millan <rmh at debian.org> Sat, 30 Nov 2013 12:09:03 +0100
+
freebsd-glue (0.2.1) unstable; urgency=low
* Fix broken external references in mac_set.c.
Modified: trunk/freebsd-glue/debian/copyright
===================================================================
--- trunk/freebsd-glue/debian/copyright 2013-11-30 11:07:22 UTC (rev 5193)
+++ trunk/freebsd-glue/debian/copyright 2013-11-30 11:10:08 UTC (rev 5194)
@@ -44,6 +44,10 @@
Copyright: 2008, Yahoo!, Inc
License: BSD (2 clause)
+Files: src/freebsd-glue/strnstr.c
+Copyright: 1990, 1993, 2001, Mike Barcroft <mike at FreeBSD.org>
+License: BSD (3 clause)
+
Files: include/sys/param.h
Copyright: 1982, 1986, 1989, 1993
UNIX System Laboratories, Inc
Modified: trunk/freebsd-glue/debian/libfreebsd-glue-0.symbols
===================================================================
--- trunk/freebsd-glue/debian/libfreebsd-glue-0.symbols 2013-11-30 11:07:22 UTC (rev 5193)
+++ trunk/freebsd-glue/debian/libfreebsd-glue-0.symbols 2013-11-30 11:10:08 UTC (rev 5194)
@@ -45,3 +45,4 @@
setfstab at Base 0.1.15
(arch=kfreebsd-any)setloginclass at Base 0.1.15
srandomdev at Base 0.1.15
+ strnstr at Base 0.2.2
Modified: trunk/freebsd-glue/include/string.h
===================================================================
--- trunk/freebsd-glue/include/string.h 2013-11-30 11:07:22 UTC (rev 5193)
+++ trunk/freebsd-glue/include/string.h 2013-11-30 11:10:08 UTC (rev 5194)
@@ -5,4 +5,5 @@
size_t strlcat(char * __restrict, const char * __restrict, size_t);
size_t strlcpy(char * __restrict, const char * __restrict, size_t);
void strmode(int, char *);
+char *strnstr(const char *big, const char *little, size_t len);
#endif
Modified: trunk/freebsd-glue/src/freebsd-glue/Makefile
===================================================================
--- trunk/freebsd-glue/src/freebsd-glue/Makefile 2013-11-30 11:07:22 UTC (rev 5193)
+++ trunk/freebsd-glue/src/freebsd-glue/Makefile 2013-11-30 11:10:08 UTC (rev 5194)
@@ -7,6 +7,7 @@
getcap.c \
getosreldate.c \
random.c \
+ strnstr.c \
${NULL}
LDADD= -lbsd -ldb
Added: trunk/freebsd-glue/src/freebsd-glue/strnstr.c
===================================================================
--- trunk/freebsd-glue/src/freebsd-glue/strnstr.c (rev 0)
+++ trunk/freebsd-glue/src/freebsd-glue/strnstr.c 2013-11-30 11:10:08 UTC (rev 5194)
@@ -0,0 +1,65 @@
+/*-
+ * Copyright (c) 2001 Mike Barcroft <mike at FreeBSD.org>
+ * Copyright (c) 1990, 1993
+ * The Regents of the University of California. All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Chris Torek.
+ *
+ * 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.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char sccsid[] = "@(#)strstr.c 8.1 (Berkeley) 6/4/93";
+#endif /* LIBC_SCCS and not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <string.h>
+
+/*
+ * Find the first occurrence of find in s, where the search is limited to the
+ * first slen characters of s.
+ */
+char *
+strnstr(const char *s, const char *find, size_t slen)
+{
+ char c, sc;
+ size_t len;
+
+ if ((c = *find++) != '\0') {
+ len = strlen(find);
+ do {
+ do {
+ if (slen-- < 1 || (sc = *s++) == '\0')
+ return (NULL);
+ } while (sc != c);
+ if (len > slen)
+ return (NULL);
+ } while (strncmp(s, find, len) != 0);
+ s--;
+ }
+ return ((char *)s);
+}
More information about the Glibc-bsd-commits
mailing list