mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-11 07:40:05 +00:00
ee600e3f76
2004-07-10 Ulrich Drepper <drepper@redhat.com> * elf/ldconfig.c: Define PROCINFO_CLASS as static before including ldsodefs.h. * sysdeps/generic/ldsodefs.h: Only define PROCINFO_CLASS if it is not already defined. * sysdeps/i386/dl-procinfo.c: Define PROCINFO_CALLS only if not already defined. * elf/rtld.c (print_statistics): Mark with noinline attribute. * sysdeps/i386/dl-machine.h (elf_machine_rel): Mark with always_inline attribute. (elf_machine_rel_relative): Likewise. * include/string.h: Add libc_hidden_proto for __strtok_r and __strsep_g. * sysdeps/generic/strsep.c: Add libc_hidden_def. * sysdeps/generic/strtok_r.c: Likewise. * sysdeps/i386/strtok_r.S: Add alias for internal symbol. * sysdeps/i386/i686/strtok_r.S: Likewise. * sysdeps/x86_64/strtok_r.S: Likewise. 2004-07-09 Alexandre Oliva <aoliva@redhat.com> * inet/getnetgrent_r.c (internal_setnetgrent): Make it hidden instead of internal-linkage, such that we can alias to it. (internal_endnetgrent, internal_getnetgrent_r): Likewise.
70 lines
2.0 KiB
C
70 lines
2.0 KiB
C
/* Reentrant string tokenizer. Generic version.
|
|
Copyright (C) 1991,1996-1999,2001,2004 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 Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 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
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; 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;
|
|
}
|
|
libc_hidden_def (__strtok_r)
|
|
weak_alias (__strtok_r, strtok_r)
|