Get Win32 to compile again

diff --git a/main/php.h b/main/php.h
index ea59e21a47738ef41b0bb6bc7dc18b75cfe39286..47f0f367c8b28fcbfc5a77b26cce088b6a633f3b 100644 (file)
--- a/main/php.h
+++ b/main/php.h
@@ -104,6 +104,10 @@ size_t strlcpy(char *dst, const char *src, size_t siz);
 size_t strlcat(char *dst, const char *src, size_t siz);
 #endif
 
+#ifndef HAVE_STRTOK_R
+char *strtok_r(char *s, const char *delim, char **last);
+#endif
+
 #include "request_info.h"
 
 #if HAVE_LIBDL

diff --git a/main/strlcat.c b/main/strlcat.c
index a8be3b437e229d5df5efc4b81158c49fa76382e2..6b2cc1f679ead97f97ad36fb8c3ba6fe41d6bbd0 100644 (file)
--- a/main/strlcat.c
+++ b/main/strlcat.c
@@ -1,4 +1,4 @@
-#include "php_config.h"
+#include "php.h"
 
 #ifndef HAVE_STRLCAT
 

diff --git a/main/strlcpy.c b/main/strlcpy.c
index fe6760ca76495a67e5cf4bf751e6de3eca56229d..c34bf0a001f7b7cec1b391c0b8ee58a9030c7dfe 100644 (file)
--- a/main/strlcpy.c
+++ b/main/strlcpy.c
@@ -1,4 +1,4 @@
-#include "php_config.h"
+#include "php.h"
 
 #ifndef HAVE_STRLCPY
 

diff --git a/php4dllts.dsp b/php4dllts.dsp
index f0be228be3857455d39a023d69f5256f30c58207..25e3343ffb5b772cbfc5191f57a7a8c3084ba919 100644 (file)
--- a/php4dllts.dsp
+++ b/php4dllts.dsp
@@ -165,6 +165,10 @@ SOURCE=.\strlcat.c
 \r
 SOURCE=.\strlcpy.c\r
 # End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\strtok_r.c\r
+# End Source File\r
 # End Group\r
 # Begin Group "Header Files"\r
 \r

diff --git a/strtok_r.c b/strtok_r.c
new file mode 100644 (file)
index 0000000..fea43bd
--- /dev/null
+++ b/strtok_r.c
@@ -0,0 +1,113 @@
+#include "php.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