From 80ecfe8fb8dbbb89ba9edba6b0159ce9adea3f3e Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Sun, 24 Sep 2000 11:21:31 +1100 Subject: [PATCH] - (djm) Include strtok_r() from OpenBSD libc. Fixes report from Mark Miller --- ChangeLog | 2 ++ bsd-strtok.c | 92 ++++++++++++++++++++++++++++++++++++++++++++++++ bsd-strtok.h | 10 ++++++ configure.in | 2 +- openbsd-compat.h | 1 + 5 files changed, 106 insertions(+), 1 deletion(-) create mode 100644 bsd-strtok.c create mode 100644 bsd-strtok.h diff --git a/ChangeLog b/ChangeLog index 0290869b9..6aceb92a1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,8 @@ 20000924 - (djm) Merged cleanup patch from Mark Miller - (djm) A bit more cleanup - created cygwin_util.h + - (djm) Include strtok_r() from OpenBSD libc. Fixes report from Mark Miller + 20000923 - (djm) Fix address logging in utmp from Kevin Steves diff --git a/bsd-strtok.c b/bsd-strtok.c new file mode 100644 index 000000000..d197734cb --- /dev/null +++ b/bsd-strtok.c @@ -0,0 +1,92 @@ +/* + * Copyright (c) 1988 Regents of the University of California. + * 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. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the University of + * California, Berkeley and its contributors. + * 4. 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 "config.h" + +#ifndef HAVE_STRTOK_R + +#include "bsd-strtok.h" + +#if defined(LIBC_SCCS) && !defined(lint) +static char *rcsid = "$OpenBSD: strtok.c,v 1.3 1999/11/09 11:19:46 art Exp $"; +#endif /* LIBC_SCCS and not lint */ + +#include + +char *strtok_r(char *s, const char *delim, char **last) +{ + register char *spanp; + register int c, sc; + char *tok; + + if (s == NULL && (s = *last) == NULL) + return (NULL); + + /* + * Skip (span) leading delimiters (s += strspn(s, delim), sort of). + */ +cont: + c = *s++; + for (spanp = (char *)delim; (sc = *spanp++) != 0;) { + if (c == sc) + goto cont; + } + + if (c == 0) { /* no non-delimiter characters */ + *last = NULL; + return (NULL); + } + tok = s - 1; + + /* + * Scan token (scan for delimiters: s += strcspn(s, delim), sort of). + * Note that delim must have one NUL; we stop if we see that, too. + */ + for (;;) { + c = *s++; + spanp = (char *)delim; + do { + if ((sc = *spanp++) == c) { + if (c == 0) + s = NULL; + else + s[-1] = 0; + *last = s; + return (tok); + } + } while (sc != 0); + } + /* NOTREACHED */ +} + +#endif /* !HAVE_STRTOK_R */ diff --git a/bsd-strtok.h b/bsd-strtok.h new file mode 100644 index 000000000..5a3a56959 --- /dev/null +++ b/bsd-strtok.h @@ -0,0 +1,10 @@ +#ifndef _BSD_STRTOK_H +#define _BSD_STRTOK_H + +#include "config.h" + +#ifndef HAVE_STRTOK_R +char *strtok_r(char *s, const char *delim, char **last); +#endif /* HAVE_STRTOK_R */ + +#endif /* _BSD_STRTOK_H */ diff --git a/configure.in b/configure.in index 398ab8c1b..1c228dd9c 100644 --- a/configure.in +++ b/configure.in @@ -233,7 +233,7 @@ fi AC_CHECK_HEADERS(bstring.h endian.h floatingpoint.h getopt.h lastlog.h limits.h login.h login_cap.h maillock.h netdb.h netgroup.h netinet/in_systm.h paths.h poll.h pty.h shadow.h security/pam_appl.h sys/bitypes.h sys/bsdtty.h sys/cdefs.h sys/poll.h sys/select.h sys/stat.h sys/stropts.h sys/sysmacros.h sys/time.h sys/ttcompat.h stddef.h time.h ttyent.h usersec.h util.h utmp.h utmpx.h) dnl Checks for library functions. -AC_CHECK_FUNCS(arc4random atexit b64_ntop bcopy bindresvport_af clock freeaddrinfo futimes gai_strerror getaddrinfo getnameinfo getrusage getttyent inet_aton inet_ntoa innetgr login_getcapbool md5_crypt memmove mkdtemp on_exit openpty rresvport_af setenv seteuid setlogin setproctitle setreuid sigaction sigvec snprintf strerror strlcat strlcpy strsep vsnprintf vhangup _getpty __b64_ntop) +AC_CHECK_FUNCS(arc4random atexit b64_ntop bcopy bindresvport_af clock freeaddrinfo futimes gai_strerror getaddrinfo getnameinfo getrusage getttyent inet_aton inet_ntoa innetgr login_getcapbool md5_crypt memmove mkdtemp on_exit openpty rresvport_af setenv seteuid setlogin setproctitle setreuid sigaction sigvec snprintf strerror strlcat strlcpy strsep strtok_r vsnprintf vhangup _getpty __b64_ntop) dnl Checks for time functions AC_CHECK_FUNCS(gettimeofday time) dnl Checks for libutil functions diff --git a/openbsd-compat.h b/openbsd-compat.h index 521579b96..671728fbc 100644 --- a/openbsd-compat.h +++ b/openbsd-compat.h @@ -18,6 +18,7 @@ #include "bsd-inet_aton.h" #include "bsd-inet_ntoa.h" #include "bsd-strsep.h" +#include "bsd-strtok.h" /* rfc2553 socket API replacements */ #include "fake-getaddrinfo.h"