Replace strtok_r when it's not available. The implementation comes

from glibc 2.6.1 (like the strsep replacement) and uses the same
autoconf hooks.

diff --git a/ChangeLog b/ChangeLog
index 0877f1d3adf142a40f28d0ccbb1ecc0c9dff8ac3..3e618f84c807dd6905474b8ce585b455bffaa50c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-04-09 18:13 +0200  Christian Ebert  <blacktrash@gmx.net>  (ae90c8e8ea4d)
+
+       * doc/manual.xml.head: manual.xml.head: grammar correction
+
+2008-03-11 17:20 -0700  N.J. Mann  <njm@njm.f2s.com>  (e3bc99a4a6bd)
+
+       * mbox.c, mh.c, pop.c: Respect ctx->quiet when initializing
+       progress bar.
+
 2008-03-09 14:01 -0700  Sébastien Hinderer  <Sebastien.Hinderer@ens-lyon.org>  (c4212a17fad6)
 
        * compose.c, mx.c: Remove pointless NULL checks against

diff --git a/configure.ac b/configure.ac
index d28557c56ad5b9f7a5d1f1370e5ba07174e45a90..01696769ae2f3ee9b95b65a0fec6ab66b3ce9d19 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -335,7 +335,7 @@ AC_CHECK_TYPE(ssize_t, int)
 
 AC_CHECK_FUNCS(fgetpos memmove setegid srand48 strerror)
 
-AC_REPLACE_FUNCS([setenv strcasecmp strdup strsep])
+AC_REPLACE_FUNCS([setenv strcasecmp strdup strsep strtok_r])
 
 AC_CHECK_FUNC(getopt)
 if test $ac_cv_func_getopt = yes; then

diff --git a/strtok_r.c b/strtok_r.c
new file mode 100644 (file)
index 0000000..a4268dd
--- /dev/null
+++ b/strtok_r.c
@@ -0,0 +1,63 @@
+/* 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>
+
+/* Taken from glibc 2.6.1 */
+
+/* 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 = strchr (token, '\0');
+  else
+    {
+      /* Terminate the token and make *SAVE_PTR point past it.  */
+      *s = '\0';
+      *save_ptr = s + 1;
+    }
+  return token;
+}