From: Peter Johnson Date: Mon, 24 Sep 2001 05:57:28 +0000 (-0000) Subject: Add check and BSD replacement for strsep(3). X-Git-Tag: v0.1.0~303 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=df62b73779426fea55eacde3056c87bb6f1dd544;p=yasm Add check and BSD replacement for strsep(3). svn path=/trunk/yasm/; revision=218 --- diff --git a/configure.ac b/configure.ac index 3586b37f..e41e41a6 100644 --- a/configure.ac +++ b/configure.ac @@ -81,7 +81,7 @@ AC_TYPE_SIZE_T AC_FUNC_VPRINTF AC_CHECK_FUNCS(memcpy toascii abort) AC_CHECK_FUNCS(strcasecmp stricmp strcmpi, break) -AC_REPLACE_FUNCS(strdup strtoul) +AC_REPLACE_FUNCS(strdup strsep strtoul) AC_CHECK_HEADERS(limits.h sys/queue.h sys/cdefs.h) diff --git a/configure.in b/configure.in index 3586b37f..e41e41a6 100644 --- a/configure.in +++ b/configure.in @@ -81,7 +81,7 @@ AC_TYPE_SIZE_T AC_FUNC_VPRINTF AC_CHECK_FUNCS(memcpy toascii abort) AC_CHECK_FUNCS(strcasecmp stricmp strcmpi, break) -AC_REPLACE_FUNCS(strdup strtoul) +AC_REPLACE_FUNCS(strdup strsep strtoul) AC_CHECK_HEADERS(limits.h sys/queue.h sys/cdefs.h) diff --git a/libyasm/strsep.c b/libyasm/strsep.c new file mode 100644 index 00000000..64a71889 --- /dev/null +++ b/libyasm/strsep.c @@ -0,0 +1,86 @@ +/* $IdPath$ + * strsep() implementation for systems that don't have it. + * + * Copyright (c) 1990, 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 + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. 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 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 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. + */ + +#if defined(LIBC_SCCS) && !defined(lint) +static char sccsid[] = "@(#)strsep.c 8.1 (Berkeley) 6/4/93"; +#endif /* LIBC_SCCS and not lint */ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include "util.h" + +#include + +#ifdef STDC_HEADERS +#include +#endif + +RCSID("$IdPath$"); + +/* + * Get next token from string *stringp, where tokens are possibly-empty + * strings separated by characters from delim. + * + * Writes NULs into the string at *stringp to end tokens. + * delim need not remain constant from call to call. + * On return, *stringp points past the last NUL written (if there might + * be further tokens), or is NULL (if there are definitely no more tokens). + * + * If *stringp is NULL, strsep returns NULL. + */ +char * +strsep(char **stringp, const char *delim) +{ + register char *s; + register const char *spanp; + register int c, sc; + char *tok; + + if ((s = *stringp) == NULL) + return (NULL); + for (tok = s;;) { + c = *s++; + spanp = delim; + do { + if ((sc = *spanp++) == c) { + if (c == 0) + s = NULL; + else + s[-1] = 0; + *stringp = s; + return (tok); + } + } while (sc != 0); + } + /* NOTREACHED */ +} diff --git a/libyasm/util.h b/libyasm/util.h index bc54cb77..2ad3237b 100644 --- a/libyasm/util.h +++ b/libyasm/util.h @@ -30,6 +30,10 @@ char *strdup(const char *str); #endif +#if !defined(HAVE_STRSEP) || defined(HAVE_GNU_C_LIBRARY) +char *strsep(char **stringp, const char *delim); +#endif + #if !defined(HAVE_STRTOUL) || defined(HAVE_GNU_C_LIBRARY) unsigned long strtoul(const char *nptr, char **endptr, int base); #endif @@ -61,6 +65,8 @@ int strncasecmp(const char *s1, const char *s2, size_t n); # include "compat-queue.h" #endif +#include "ternary.h" + #ifdef HAVE_SYS_CDEFS_H # include #endif diff --git a/src/strsep.c b/src/strsep.c new file mode 100644 index 00000000..64a71889 --- /dev/null +++ b/src/strsep.c @@ -0,0 +1,86 @@ +/* $IdPath$ + * strsep() implementation for systems that don't have it. + * + * Copyright (c) 1990, 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 + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. 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 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 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. + */ + +#if defined(LIBC_SCCS) && !defined(lint) +static char sccsid[] = "@(#)strsep.c 8.1 (Berkeley) 6/4/93"; +#endif /* LIBC_SCCS and not lint */ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include "util.h" + +#include + +#ifdef STDC_HEADERS +#include +#endif + +RCSID("$IdPath$"); + +/* + * Get next token from string *stringp, where tokens are possibly-empty + * strings separated by characters from delim. + * + * Writes NULs into the string at *stringp to end tokens. + * delim need not remain constant from call to call. + * On return, *stringp points past the last NUL written (if there might + * be further tokens), or is NULL (if there are definitely no more tokens). + * + * If *stringp is NULL, strsep returns NULL. + */ +char * +strsep(char **stringp, const char *delim) +{ + register char *s; + register const char *spanp; + register int c, sc; + char *tok; + + if ((s = *stringp) == NULL) + return (NULL); + for (tok = s;;) { + c = *s++; + spanp = delim; + do { + if ((sc = *spanp++) == c) { + if (c == 0) + s = NULL; + else + s[-1] = 0; + *stringp = s; + return (tok); + } + } while (sc != 0); + } + /* NOTREACHED */ +} diff --git a/src/util.h b/src/util.h index bc54cb77..2ad3237b 100644 --- a/src/util.h +++ b/src/util.h @@ -30,6 +30,10 @@ char *strdup(const char *str); #endif +#if !defined(HAVE_STRSEP) || defined(HAVE_GNU_C_LIBRARY) +char *strsep(char **stringp, const char *delim); +#endif + #if !defined(HAVE_STRTOUL) || defined(HAVE_GNU_C_LIBRARY) unsigned long strtoul(const char *nptr, char **endptr, int base); #endif @@ -61,6 +65,8 @@ int strncasecmp(const char *s1, const char *s2, size_t n); # include "compat-queue.h" #endif +#include "ternary.h" + #ifdef HAVE_SYS_CDEFS_H # include #endif diff --git a/strsep.c b/strsep.c new file mode 100644 index 00000000..64a71889 --- /dev/null +++ b/strsep.c @@ -0,0 +1,86 @@ +/* $IdPath$ + * strsep() implementation for systems that don't have it. + * + * Copyright (c) 1990, 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 + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. 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 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 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. + */ + +#if defined(LIBC_SCCS) && !defined(lint) +static char sccsid[] = "@(#)strsep.c 8.1 (Berkeley) 6/4/93"; +#endif /* LIBC_SCCS and not lint */ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include "util.h" + +#include + +#ifdef STDC_HEADERS +#include +#endif + +RCSID("$IdPath$"); + +/* + * Get next token from string *stringp, where tokens are possibly-empty + * strings separated by characters from delim. + * + * Writes NULs into the string at *stringp to end tokens. + * delim need not remain constant from call to call. + * On return, *stringp points past the last NUL written (if there might + * be further tokens), or is NULL (if there are definitely no more tokens). + * + * If *stringp is NULL, strsep returns NULL. + */ +char * +strsep(char **stringp, const char *delim) +{ + register char *s; + register const char *spanp; + register int c, sc; + char *tok; + + if ((s = *stringp) == NULL) + return (NULL); + for (tok = s;;) { + c = *s++; + spanp = delim; + do { + if ((sc = *spanp++) == c) { + if (c == 0) + s = NULL; + else + s[-1] = 0; + *stringp = s; + return (tok); + } + } while (sc != 0); + } + /* NOTREACHED */ +} diff --git a/util.h b/util.h index bc54cb77..2ad3237b 100644 --- a/util.h +++ b/util.h @@ -30,6 +30,10 @@ char *strdup(const char *str); #endif +#if !defined(HAVE_STRSEP) || defined(HAVE_GNU_C_LIBRARY) +char *strsep(char **stringp, const char *delim); +#endif + #if !defined(HAVE_STRTOUL) || defined(HAVE_GNU_C_LIBRARY) unsigned long strtoul(const char *nptr, char **endptr, int base); #endif @@ -61,6 +65,8 @@ int strncasecmp(const char *s1, const char *s2, size_t n); # include "compat-queue.h" #endif +#include "ternary.h" + #ifdef HAVE_SYS_CDEFS_H # include #endif