diff options
author | Damien Miller <djm@mindrot.org> | 2000-09-24 11:21:31 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2000-09-24 11:21:31 +1100 |
commit | 80ecfe8fb8dbbb89ba9edba6b0159ce9adea3f3e (patch) | |
tree | 5878839a06d4887ba654b06578679e9611ea41f8 | |
parent | 72c9a7e958689740cb3449df5732e0956d52ef5b (diff) |
- (djm) Include strtok_r() from OpenBSD libc. Fixes report from Mark Miller
<markm@swoon.net>
-rw-r--r-- | ChangeLog | 2 | ||||
-rw-r--r-- | bsd-strtok.c | 92 | ||||
-rw-r--r-- | bsd-strtok.h | 10 | ||||
-rw-r--r-- | configure.in | 2 | ||||
-rw-r--r-- | openbsd-compat.h | 1 |
5 files changed, 106 insertions, 1 deletions
@@ -1,6 +1,8 @@ | |||
1 | 20000924 | 1 | 20000924 |
2 | - (djm) Merged cleanup patch from Mark Miller <markm@swoon.net> | 2 | - (djm) Merged cleanup patch from Mark Miller <markm@swoon.net> |
3 | - (djm) A bit more cleanup - created cygwin_util.h | 3 | - (djm) A bit more cleanup - created cygwin_util.h |
4 | - (djm) Include strtok_r() from OpenBSD libc. Fixes report from Mark Miller | ||
5 | <markm@swoon.net> | ||
4 | 6 | ||
5 | 20000923 | 7 | 20000923 |
6 | - (djm) Fix address logging in utmp from Kevin Steves | 8 | - (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 @@ | |||
1 | /* | ||
2 | * Copyright (c) 1988 Regents of the University of California. | ||
3 | * All rights reserved. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions | ||
7 | * are met: | ||
8 | * 1. Redistributions of source code must retain the above copyright | ||
9 | * notice, this list of conditions and the following disclaimer. | ||
10 | * 2. Redistributions in binary form must reproduce the above copyright | ||
11 | * notice, this list of conditions and the following disclaimer in the | ||
12 | * documentation and/or other materials provided with the distribution. | ||
13 | * 3. All advertising materials mentioning features or use of this software | ||
14 | * must display the following acknowledgement: | ||
15 | * This product includes software developed by the University of | ||
16 | * California, Berkeley and its contributors. | ||
17 | * 4. Neither the name of the University nor the names of its contributors | ||
18 | * may be used to endorse or promote products derived from this software | ||
19 | * without specific prior written permission. | ||
20 | * | ||
21 | * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND | ||
22 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
23 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
24 | * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE | ||
25 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
26 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
27 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
28 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
29 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||
30 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | ||
31 | * SUCH DAMAGE. | ||
32 | */ | ||
33 | |||
34 | #include "config.h" | ||
35 | |||
36 | #ifndef HAVE_STRTOK_R | ||
37 | |||
38 | #include "bsd-strtok.h" | ||
39 | |||
40 | #if defined(LIBC_SCCS) && !defined(lint) | ||
41 | static char *rcsid = "$OpenBSD: strtok.c,v 1.3 1999/11/09 11:19:46 art Exp $"; | ||
42 | #endif /* LIBC_SCCS and not lint */ | ||
43 | |||
44 | #include <string.h> | ||
45 | |||
46 | char *strtok_r(char *s, const char *delim, char **last) | ||
47 | { | ||
48 | register char *spanp; | ||
49 | register int c, sc; | ||
50 | char *tok; | ||
51 | |||
52 | if (s == NULL && (s = *last) == NULL) | ||
53 | return (NULL); | ||
54 | |||
55 | /* | ||
56 | * Skip (span) leading delimiters (s += strspn(s, delim), sort of). | ||
57 | */ | ||
58 | cont: | ||
59 | c = *s++; | ||
60 | for (spanp = (char *)delim; (sc = *spanp++) != 0;) { | ||
61 | if (c == sc) | ||
62 | goto cont; | ||
63 | } | ||
64 | |||
65 | if (c == 0) { /* no non-delimiter characters */ | ||
66 | *last = NULL; | ||
67 | return (NULL); | ||
68 | } | ||
69 | tok = s - 1; | ||
70 | |||
71 | /* | ||
72 | * Scan token (scan for delimiters: s += strcspn(s, delim), sort of). | ||
73 | * Note that delim must have one NUL; we stop if we see that, too. | ||
74 | */ | ||
75 | for (;;) { | ||
76 | c = *s++; | ||
77 | spanp = (char *)delim; | ||
78 | do { | ||
79 | if ((sc = *spanp++) == c) { | ||
80 | if (c == 0) | ||
81 | s = NULL; | ||
82 | else | ||
83 | s[-1] = 0; | ||
84 | *last = s; | ||
85 | return (tok); | ||
86 | } | ||
87 | } while (sc != 0); | ||
88 | } | ||
89 | /* NOTREACHED */ | ||
90 | } | ||
91 | |||
92 | #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 @@ | |||
1 | #ifndef _BSD_STRTOK_H | ||
2 | #define _BSD_STRTOK_H | ||
3 | |||
4 | #include "config.h" | ||
5 | |||
6 | #ifndef HAVE_STRTOK_R | ||
7 | char *strtok_r(char *s, const char *delim, char **last); | ||
8 | #endif /* HAVE_STRTOK_R */ | ||
9 | |||
10 | #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 | |||
233 | 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) | 233 | 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) |
234 | 234 | ||
235 | dnl Checks for library functions. | 235 | dnl Checks for library functions. |
236 | 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) | 236 | 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) |
237 | dnl Checks for time functions | 237 | dnl Checks for time functions |
238 | AC_CHECK_FUNCS(gettimeofday time) | 238 | AC_CHECK_FUNCS(gettimeofday time) |
239 | dnl Checks for libutil functions | 239 | 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 @@ | |||
18 | #include "bsd-inet_aton.h" | 18 | #include "bsd-inet_aton.h" |
19 | #include "bsd-inet_ntoa.h" | 19 | #include "bsd-inet_ntoa.h" |
20 | #include "bsd-strsep.h" | 20 | #include "bsd-strsep.h" |
21 | #include "bsd-strtok.h" | ||
21 | 22 | ||
22 | /* rfc2553 socket API replacements */ | 23 | /* rfc2553 socket API replacements */ |
23 | #include "fake-getaddrinfo.h" | 24 | #include "fake-getaddrinfo.h" |