mirror of
https://sourceware.org/git/glibc.git
synced 2024-09-30 02:57:50 +00:00
838e5ffe9e
1998-03-19 14:28 Ulrich Drepper <drepper@cygnus.com> * sysdeps/generic/strtok_r.c: Make __strtok_r real name and strtok_r weak alias. * sysdeps/i386/strtok_r.c: Likewise. * sysdeps/libm-i387/i686/s_fdim.S: Make it really work. * sysdeps/libm-i387/i686/s_fdimf.S: Likewise. * sysdeps/libm-i387/i686/s_fdiml.S: Likewise. * sysdeps/libm-i387/i686/s_fmin.S: Likewise. * sysdeps/libm-i387/i686/s_fminf.S: Likewise. * sysdeps/libm-i387/i686/s_fminl.S: Likewise. 1998-03-19 Andreas Jaeger <aj@arthur.rhein-neckar.de> * intl/localealias.c: Remove unneeded define for strdup. 1998-03-19 13:45 Ulrich Drepper <drepper@cygnus.com> * manual/argp.texi: Adjust for better TeX output. * manual/arith.texi: Likewise. * manual/conf.texi: Likewise. * manual/filesys.texi: Likewise. * manual/header.texi: Likewise. * manual/lgpl.texinfo: Likewise. * manual/math.texi: Likewise. * manual/message.texi: Likewise. * manual/pattern.texi: Likewise. * manual/process.texi: Likewise. * manual/signal.texi: Likewise. * manual/socket.texi: Likewise. * manual/startup.texi: Likewise. * manual/stdio.texi: Likewise. * manual/terminal.texi: Likewise. * manual/examples/rprintf.c: Likewise. * manual/examples/testopt.c: Likewise. Patches by Zack Weinberg <zack@rabi.phys.columbia.edu>. 1998-03-19 20:45 Tim Waugh <tim@cyberelk.demon.co.uk> * posix/wordexp.c (parse_param): Don't immediately stop parsing a parameter name after seeing a digit if it's enclosed in braces.
65 lines
1.9 KiB
C
65 lines
1.9 KiB
C
/* Reentrant string tokenizer. Generic version.
|
|
Copyright (C) 1991, 1996, 1997, 1998 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
|
|
|
|
/* 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')
|
|
return NULL;
|
|
|
|
/* Find the end of the token. */
|
|
token = s;
|
|
s = strpbrk (token, delim);
|
|
if (s == NULL)
|
|
/* This token finishes the string. */
|
|
*save_ptr = strchr (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)
|