From 854a5d353795189e727ba52631ec5b5862cbcb8f Mon Sep 17 00:00:00 2001 From: Simon Josefsson Date: Fri, 12 Nov 2004 00:00:47 +0000 Subject: [PATCH] Add strtok_r. --- MODULES.html.sh | 1 + lib/strtok_r.c | 90 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ lib/strtok_r.h | 30 +++++++++++++++++++ m4/strtok_r.m4 | 19 ++++++++++++ modules/strtok_r | 24 +++++++++++++++ 5 files changed, 164 insertions(+) create mode 100644 lib/strtok_r.c create mode 100644 lib/strtok_r.h create mode 100644 m4/strtok_r.m4 create mode 100644 modules/strtok_r diff --git a/MODULES.html.sh b/MODULES.html.sh index 9f8092154..e05912c4a 100755 --- a/MODULES.html.sh +++ b/MODULES.html.sh @@ -1749,6 +1749,7 @@ func_all_modules () func_module regex func_module rename func_module rmdir + func_module strtok_r func_module utime func_end_table diff --git a/lib/strtok_r.c b/lib/strtok_r.c new file mode 100644 index 000000000..ef2f513a9 --- /dev/null +++ b/lib/strtok_r.c @@ -0,0 +1,90 @@ +/* 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. */ + +#ifdef HAVE_CONFIG_H +# include +#endif + +#include + +#undef strtok_r +#undef __strtok_r + +#ifndef _LIBC +/* Get specification. */ +# include "strtok_r.h" +# 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" + + For the POSIX documentation for this function, see: + http://www.opengroup.org/onlinepubs/009695399/functions/strtok.html + + Caveat: It modifies the original string. + Caveat: These functions cannot be used on constant strings. + Caveat: The identity of the delimiting character is lost. + Caveat: It doesn't work with multibyte strings unless all of the delimiter + characters are ASCII characters < 0x80. + + See also strsep(). +*/ +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 diff --git a/lib/strtok_r.h b/lib/strtok_r.h new file mode 100644 index 000000000..153520928 --- /dev/null +++ b/lib/strtok_r.h @@ -0,0 +1,30 @@ +/* Split string into tokens + Copyright (C) 2004 Free Software Foundation, Inc. + Written by Simon Josefsson. + + 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 2, 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, write to the Free Software Foundation, + Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + +#ifndef STRTOK_R_H +#define STRTOK_R_H + +/* Get strtok_r declaration, if available. */ +#include + +#if defined HAVE_DECL_STRTOK_R && !HAVE_DECL_STRTOK_R +char *strtok_r(char *restrict s, const char *restrict sep, + char **restrict lasts); +#endif + +#endif /* STRTOK_R_H */ diff --git a/m4/strtok_r.m4 b/m4/strtok_r.m4 new file mode 100644 index 000000000..390b7faf4 --- /dev/null +++ b/m4/strtok_r.m4 @@ -0,0 +1,19 @@ +# strtok_r.m4 serial 1 +dnl Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. + +AC_DEFUN([gl_FUNC_STRTOK_R], +[ + AC_REPLACE_FUNCS(strtok_r) + AC_CHECK_DECLS_ONCE(strtok_r) + gl_PREREQ_STRTOK_R +]) + +# Prerequisites of lib/strtok_r.h and lib/strtok_r.c. +AC_DEFUN([gl_PREREQ_STRTOK_R], [ + AC_REQUIRE([gl_C_RESTRICT]) +]) diff --git a/modules/strtok_r b/modules/strtok_r new file mode 100644 index 000000000..32134ba07 --- /dev/null +++ b/modules/strtok_r @@ -0,0 +1,24 @@ +Description: +strtok_r() function: split string into tokens, thread safe. + +Files: +lib/strtok_r.c +lib/strtok_r.h +m4/strtok_r.m4 + +Depends-on: + +configure.ac: +gl_FUNC_STRTOK_R + +Makefile.am: +lib_SOURCES += strtok_r.h + +Include: +"strtok_r.h" + +License: +LGPL + +Maintainer: +all, glibc -- 2.11.0