421693b020
gdb/linux-tdep.c recently gained a strtok_r use. That broke --enable-targets=all with some versions of mingw64, which don't have strtok_r: https://sourceware.org/ml/gdb-patches/2015-04/msg00266.html Fix that by importing the strtok_r gnulib module. gdb/ChangeLog: 2015-04-09 Pedro Alves <palves@redhat.com> * gnulib/update-gnulib.sh (IMPORTED_GNULIB_MODULES): Add strtok_r. * gnulib/Makefile.in (aclocal_m4_deps): Add import/m4/strtok_r.m4. * gnulib/configure, gnulib/config.in, gnulib/aclocal.m4: Regenerate. * gnulib/import/Makefile.am: Update. * gnulib/import/Makefile.in: Update. * gnulib/import/m4/gnulib-cache.m4: Update. * gnulib/import/m4/gnulib-comp.m4: Update. * gnulib/import/m4/strtok_r.m4: New file. * gnulib/import/strtok_r.c: New file.
76 lines
2.1 KiB
C
76 lines
2.1 KiB
C
/* Reentrant string tokenizer. Generic version.
|
|
Copyright (C) 1991, 1996-1999, 2001, 2004, 2007, 2009-2012 Free Software
|
|
Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
|
|
This program is free software: you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program 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 General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
# include <config.h>
|
|
#endif
|
|
|
|
#include <string.h>
|
|
|
|
#ifdef _LIBC
|
|
# undef strtok_r
|
|
# undef __strtok_r
|
|
#else
|
|
# define __strtok_r strtok_r
|
|
# define __rawmemchr strchr
|
|
#endif
|
|
|
|
/* 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 (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;
|
|
}
|
|
#ifdef weak_alias
|
|
libc_hidden_def (__strtok_r)
|
|
weak_alias (__strtok_r, strtok_r)
|
|
#endif
|