Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Implement strtok() in terms of strtok_r()

Browse Source
This commit is contained in:
dsl 2004-10-27 19:12:31 +00:00
parent fc23d32c7d
commit d6329c55cd
1 changed files with 6 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
lib/libc/string/strtok.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: strtok.c,v 1.11 2003/08/07 16:43:53 agc Exp $ */
/* $NetBSD: strtok.c,v 1.12 2004/10/27 19:12:31 dsl Exp $ */
/*
* Copyright (c) 1988, 1993
@ -34,62 +34,17 @@
#if 0
static char sccsid[] = "@(#)strtok.c 8.1 (Berkeley) 6/4/93";
#else
__RCSID("$NetBSD: strtok.c,v 1.11 2003/08/07 16:43:53 agc Exp $");
__RCSID("$NetBSD: strtok.c,v 1.12 2004/10/27 19:12:31 dsl Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
#include <assert.h>
#include <namespace.h>
#include <string.h>
char *
strtok(s, delim)
char *s;
const char *delim;
strtok(char *s, const char *delim)
{
const char *spanp;
int c, sc;
char *tok;
static char *last;
static char *lasts;
/* s may be NULL */
_DIAGASSERT(delim != NULL);
if (s == NULL && (s = last) == NULL)
return (NULL);
/*
* Skip (span) leading delimiters (s += strspn(s, delim), sort of).
*/
cont:
c = *s++;
for (spanp = 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 = delim;
do {
if ((sc = *spanp++) == c) {
if (c == 0)
s = NULL;
else
s[-1] = 0;
last = s;
return (tok);
}
} while (sc != 0);
}
/* NOTREACHED */
return strtok_r(s, delim, &lasts);
}