[Bug-gnulib] strtok_r

[Simon Josefsson]

Opinions?

Some potential issues:

* The strtok_r.c license header will be GPL once glibc contain these
  fixes, and srclist-update has imported it to gnulib.  I'll submit
  the glibc patch into bugzilla later tonight.

* Is strchr the same as rawmemchr?  I didn't like rawmemchr.

* Glibc doesn't seem to have restrict keywords in the *.c file.  Is
  that a bug?  Is it sufficient to have them in *.h?

I have verified that this module make Shishi compile on
powerpc-apple-darwin5.5, which doesn't have strtok_r.

Thanks.

2004-11-11  Simon Josefsson  <address@hidden>

        * modules/strtok_r: New file.

        * MODULES.html.sh (Support for systems lacking POSIX:2001): Add
        strtok_r.

2004-11-11  Simon Josefsson  <address@hidden>

        * strtok_r.m4: New file.

2004-11-11  Simon Josefsson  <address@hidden>

        * strtok_r.h, strtok_r.c: New file.

Index: modules/strtok_r
===================================================================
RCS file: modules/strtok_r
diff -N modules/strtok_r
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ modules/strtok_r    11 Nov 2004 19:20:36 -0000
@@ -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
Index: MODULES.html.sh
===================================================================
RCS file: /cvsroot/gnulib/gnulib/MODULES.html.sh,v
retrieving revision 1.67
diff -u -p -r1.67 MODULES.html.sh
--- MODULES.html.sh     10 Nov 2004 14:53:00 -0000      1.67
+++ MODULES.html.sh     11 Nov 2004 19:20:36 -0000
@@ -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
 
Index: m4/strtok_r.m4
===================================================================
RCS file: m4/strtok_r.m4
diff -N m4/strtok_r.m4
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ m4/strtok_r.m4      11 Nov 2004 19:20:36 -0000
@@ -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])
+])
Index: lib/strtok_r.h
===================================================================
RCS file: lib/strtok_r.h
diff -N lib/strtok_r.h
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ lib/strtok_r.h      11 Nov 2004 19:20:36 -0000
@@ -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 <string.h>
+
+#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 */
Index: lib/strtok_r.c
===================================================================
RCS file: lib/strtok_r.c
diff -N lib/strtok_r.c
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ lib/strtok_r.c      11 Nov 2004 19:20:36 -0000
@@ -0,0 +1,79 @@
+/* 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 <config.h>
+#endif
+
+#include <string.h>
+
+#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"
+*/
+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