diff options
Diffstat (limited to 'newlib/libc/string/strtok.c')
| -rw-r--r-- | newlib/libc/string/strtok.c | 43 |
1 files changed, 10 insertions, 33 deletions
diff --git a/newlib/libc/string/strtok.c b/newlib/libc/string/strtok.c index 7640fb73d..7f250b456 100644 --- a/newlib/libc/string/strtok.c +++ b/newlib/libc/string/strtok.c @@ -1,6 +1,6 @@ /* FUNCTION - <<strtok>>, <<strtok_r>>, <<strsep>>---get next token from a string + <<strtok>>---get next token from a string INDEX strtok @@ -8,15 +8,11 @@ INDEX INDEX strtok_r -INDEX - strsep - ANSI_SYNOPSIS #include <string.h> char *strtok(char *<[source]>, const char *<[delimiters]>) char *strtok_r(char *<[source]>, const char *<[delimiters]>, char **<[lasts]>) - char *strsep(char **<[source_ptr]>, const char *<[delimiters]>) TRAD_SYNOPSIS #include <string.h> @@ -29,10 +25,6 @@ TRAD_SYNOPSIS char *<[delimiters]>; char **<[lasts]>; - char *strsep(<[source_ptr]>, <[delimiters]>) - char **<[source_ptr]>; - char *<[delimiters]>; - DESCRIPTION The <<strtok>> function is used to isolate sequential tokens in a null-terminated string, <<*<[source]>>>. These tokens are delimited @@ -40,41 +32,29 @@ DESCRIPTION The first time that <<strtok>> is called, <<*<[source]>>> should be specified; subsequent calls, wishing to obtain further tokens from the same string, should pass a null pointer instead. The separator - string, <<*<[delimiters]>>>, must be supplied each time and may + string, <<*<[delimiters]>>>, must be supplied each time, and may change between calls. The <<strtok>> function returns a pointer to the beginning of each subsequent token in the string, after replacing the separator - character itself with a null character. When no more tokens remain, + character itself with a NUL character. When no more tokens remain, a null pointer is returned. The <<strtok_r>> function has the same behavior as <<strtok>>, except - a pointer to placeholder <<*<[lasts]>>> must be supplied by the caller. - - The <<strsep>> function is similar in behavior to <<strtok>>, except - a pointer to the string pointer must be supplied <<<[source_ptr]>>> and - the function does not skip leading delimiters. When the string starts - with a delimiter, the delimiter is changed to the null character and - the empty string is returned. Like <<strtok_r>> and <<strtok>>, the - <<*<[source_ptr]>>> is updated to the next character following the - last delimiter found or NULL if the end of string is reached with - no more delimiters. + a pointer to placeholder <<*[lasts]>> must be supplied by the caller. RETURNS - <<strtok>>, <<strtok_r>>, and <<strsep>> all return a pointer to the - next token, or <<NULL>> if no more tokens can be found. For - <<strsep>>, a token may be the empty string. + <<strtok>> returns a pointer to the next token, or <<NULL>> if + no more tokens can be found. NOTES - <<strtok>> is unsafe for multi-threaded applications. <<strtok_r>> - and <<strsep>> are thread-safe and should be used instead. + <<strtok>> is unsafe for multi-thread applications. <<strtok_r>> + is MT-Safe and should be used instead. PORTABILITY <<strtok>> is ANSI C. -<<strtok_r>> is POSIX. -<<strsep>> is a BSD extension. -<<strtok>>, <<strtok_r>>, and <<strsep>> require no supporting OS subroutines. +<<strtok>> requires no supporting OS subroutines. QUICKREF strtok ansi impure @@ -88,14 +68,11 @@ QUICKREF #ifndef _REENT_ONLY -extern char *__strtok_r (char *, const char *, char **, int); - char * _DEFUN (strtok, (s, delim), register char *s _AND register const char *delim) { - _REENT_CHECK_MISC(_REENT); - return __strtok_r (s, delim, &(_REENT_STRTOK_LAST(_REENT)), 1); + return strtok_r (s, delim, &(_REENT->_new._reent._strtok_last)); } #endif |