mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-15 01:21:06 +00:00
d436a9f710
2001-02-23 Andreas Jaeger <aj@suse.de> * string/tester.c (test_strtok_r): Add testcase. (test_strtok_r): Always initialize cp for proper checking. * sysdeps/generic/strtok.c (strtok): Handle case of first strtok returning NULL correctly. Patch by Fumitoshi UKAI <ukai@debian.or.jp>. * sysdeps/generic/strtok_r.c (__strtok_r): Likewise. 2001-02-23 Ulrich Drepper <drepper@redhat.com> * sysdeps/unix/sysv/aix/bits/types.h: Define __need_NULL before including <stddef.h>. * sysdeps/unix/sysv/aix/write.c: Define alias __libc_write. * include/libc-symbols.h (weak_alias): Don't use .weak if HAVE_ASM_GLOBAL_DOT_NAME is defined. Patches by Michael Keezer <mkeezer@redhat.com>. * sysdeps/generic/ftime.c: Don't include <sys/time.h> at all. Patch by Michael Keezer <mkeezer@redhat.com>. * sysdeps/unix/sysv/aix/Dist: Remove restf.S and savef.S. * sysdeps/unix/sysv/aix/Makefile [$(subdir) == misc] (sysdep_routines): Remove restf.S and savef.S. * sysdeps/unix/sysv/aix/restf.S. Removed. * sysdeps/unix/sysv/aix/savef.S. Removed. * sysdeps/powerpc/fprrest.S: Use C_TEXT to define label. Also define alternative names used on some platforms. * sysdeps/powerpc/fprsave.S: Likewise. * sysdeps/powerpc/gprrest0.S: Likewise. * sysdeps/powerpc/gprrest1.S: Likewise. * sysdeps/powerpc/gprsave0.S: Likewise. * sysdeps/powerpc/gprsave1.S: Likewise. Patch by Michael Keezer <mkeezer@redhat.com>.
69 lines
2.0 KiB
C
69 lines
2.0 KiB
C
/* Reentrant string tokenizer. Generic version.
|
|
Copyright (C) 1991, 1996, 1997, 1998, 1999, 2001 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Library General Public License as
|
|
published by the Free Software Foundation; either version 2 of the
|
|
License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Library General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Library General Public
|
|
License along with the GNU C Library; see the file COPYING.LIB. If not,
|
|
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
Boston, MA 02111-1307, USA. */
|
|
|
|
#include <string.h>
|
|
|
|
#undef strtok_r
|
|
#undef __strtok_r
|
|
|
|
/* Parse S into tokens separated by characters in DELIM.
|
|
If S is NULL, the saved pointer in SAVE_PTR is used as
|
|
the next starting point. For example:
|
|
char s[] = "-abc-=-def";
|
|
char *sp;
|
|
x = strtok_r(s, "-", &sp); // x = "abc", sp = "=-def"
|
|
x = strtok_r(NULL, "-=", &sp); // x = "def", sp = NULL
|
|
x = strtok_r(NULL, "=", &sp); // x = NULL
|
|
// s = "abc\0-def\0"
|
|
*/
|
|
char *
|
|
__strtok_r (s, delim, save_ptr)
|
|
char *s;
|
|
const char *delim;
|
|
char **save_ptr;
|
|
{
|
|
char *token;
|
|
|
|
if (s == NULL)
|
|
s = *save_ptr;
|
|
|
|
/* Scan leading delimiters. */
|
|
s += strspn (s, delim);
|
|
if (*s == '\0')
|
|
{
|
|
*save_ptr = s;
|
|
return NULL;
|
|
}
|
|
|
|
/* Find the end of the token. */
|
|
token = s;
|
|
s = strpbrk (token, delim);
|
|
if (s == NULL)
|
|
/* This token finishes the string. */
|
|
*save_ptr = __rawmemchr (token, '\0');
|
|
else
|
|
{
|
|
/* Terminate the token and make *SAVE_PTR point past it. */
|
|
*s = '\0';
|
|
*save_ptr = s + 1;
|
|
}
|
|
return token;
|
|
}
|
|
weak_alias (__strtok_r, strtok_r)
|