Add strtok_r replacement function from FreeBSD-current.

diff --git a/configure.in b/configure.in
index 21cb1a13c279df267b1fce58bfc61ef44919fd2c..e466f727a904a0ec865ab4dcb081104e6079bce9 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -335,7 +335,7 @@ utime \
 vsnprintf \
 )
 
-AC_REPLACE_FUNCS(strlcat strlcpy)
+AC_REPLACE_FUNCS(strlcat strlcpy strtok_r getopt)
 AC_FUNC_UTIME_NULL
 AC_FUNC_ALLOCA
 dnl## OLDLIBS=$LIBS; LIBS=""
@@ -343,7 +343,6 @@ dnl This is also defined/used in libzend. To avoid a redefinition
 dnl we use that version
 dnl AC_BROKEN_SPRINTF
 dnl## LIBS=$OLDLIBS
-AC_REPLACE_FUNCS(getopt)
 
 dnl AIX keeps in_addr_t in /usr/include/netinet/in.h
 dnl AC_MSG_CHECKING(for in_addr_t)

diff --git a/strtok_r.c b/strtok_r.c
new file mode 100644 (file)
index 0000000..76e33a4
--- /dev/null
+++ b/strtok_r.c
@@ -0,0 +1,113 @@
+#include "php_config.h"
+
+#ifndef HAVE_STRTOK_R
+
+/*
+ * Copyright (c) 1998 Softweyr LLC.  All rights reserved.
+ *
+ * strtok_r, from Berkeley strtok
+ * Oct 13, 1998 by Wes Peters <wes@softweyr.com>
+ *
+ * Copyright (c) 1988, 1993
+ *     The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notices, this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notices, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *
+ *     This product includes software developed by Softweyr LLC, the
+ *      University of California, Berkeley, and its contributors.
+ *
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY SOFTWEYR LLC, THE REGENTS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL SOFTWEYR LLC, THE
+ * REGENTS, OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <stddef.h>
+#include <string.h>
+
+char *
+strtok_r(char *s, const char *delim, char **last)
+{
+    char *spanp;
+    int c, sc;
+    char *tok;
+
+    if (s == NULL && (s = *last) == NULL)
+    {
+       return NULL;
+    }
+
+    /*
+     * Skip (span) leading delimiters (s += strspn(s, delim), sort of).
+     */
+cont:
+    c = *s++;
+    for (spanp = (char *)delim; (sc = *spanp++) != 0; )
+    {
+       if (c == sc)
+       {
+           goto cont;
+       }
+    }
+
+    if (c == 0)                /* no non-delimiter characters */
+    {
+       *last = NULL;
+       return NULL;
+    }
+    tok = s - 1;
+
+    /*
+     * Scan token (scan for delimiters: s += strcspn(s, delim), sort of).
+     * Note that delim must have one NUL; we stop if we see that, too.
+     */
+    for (;;)
+    {
+       c = *s++;
+       spanp = (char *)delim;
+       do
+       {
+           if ((sc = *spanp++) == c)
+           {
+               if (c == 0)
+               {
+                   s = NULL;
+               }
+               else
+               {
+                   char *w = s - 1;
+                   *w = '\0';
+               }
+               *last = s;
+               return tok;
+           }
+       }
+       while (sc != 0);
+    }
+    /* NOTREACHED */
+}
+
+#endif