Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 679a201
strnstr: is not used at all.
Baptiste Daroussin committed 3 months ago
commit 679a201759eb3f02e776469818cffd4804e8af30
parent 529a33b
4 files changed +1 -67
modified auto.def
@@ -178,7 +178,7 @@ cc-check-includes stdint.h inttypes.h


# check for pkg itself

cc-check-functions arc4random arc4random_stir chflagsat \
- 
	closefrom eaccess fopencookie funopen getprogname strnstr \
+ 
	closefrom eaccess fopencookie funopen getprogname \

	strtofflags strtonum utimensat __res_setservers \

	faccessat fstatat openat readlinkat fflagstostr reallocarray strchrnul \

	copy_file_range
modified compat/Makefile.autosetup
@@ -4,7 +4,6 @@ SRCS= closefrom.c \
	file_at.c \

	humanize_number.c \

	strtonum.c \
- 
	strnstr.c \

	funopen.c



LOCAL_CFLAGS=	-I$(top_srcdir)/compat \
modified compat/bsd_compat.h
@@ -132,10 +132,6 @@ ssize_t readlinkat(int fd, const char *restrict path, char *restrict buf, size_t
long long strtonum(const char *, long long, long long, const char **);

#endif
- 
#if !HAVE_STRNSTR
- 
char * strnstr(const char *s, const char *find, size_t slen);
- 
#endif
- 


#ifndef _PATH_GROUP

#define _PATH_GROUP "/etc/group"

#endif
deleted compat/strnstr.c
@@ -1,61 +0,0 @@
- 
/*-
- 
 * Copyright (c) 2001 Mike Barcroft <mike@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.
- 
 */
-
- 
#include <string.h>
-
- 
#if !HAVE_STRNSTR
- 
/*
- 
 * 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);
- 
}
- 
#endif