From 85210ed9bfad18a03894cc4cfb78d20a1651c6f5 Mon Sep 17 00:00:00 2001 From: Zeev Suraski Date: Sat, 27 Nov 1999 00:48:50 +0000 Subject: Get Win32 to compile again --- main/php.h | 4 ++ main/strlcat.c | 2 +- main/strlcpy.c | 2 +- php4dllts.dsp | 4 ++ strtok_r.c | 113 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 123 insertions(+), 2 deletions(-) create mode 100644 strtok_r.c diff --git a/main/php.h b/main/php.h index ea59e21a47..47f0f367c8 100644 --- 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 a8be3b437e..6b2cc1f679 100644 --- 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 fe6760ca76..c34bf0a001 100644 --- 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 f0be228be3..25e3343ffb 100644 --- a/php4dllts.dsp +++ b/php4dllts.dsp @@ -165,6 +165,10 @@ SOURCE=.\strlcat.c SOURCE=.\strlcpy.c # End Source File +# Begin Source File + +SOURCE=.\strtok_r.c +# End Source File # End Group # Begin Group "Header Files" diff --git a/strtok_r.c b/strtok_r.c new file mode 100644 index 0000000000..fea43bdead --- /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 + * + * 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 +#include + +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 -- cgit v1.2.1