From: Peter Johnson Date: Sun, 16 Sep 2001 09:13:00 +0000 (-0000) Subject: Check for case-insensitive string comparisons. Use strcasecmp and strncasecmp X-Git-Tag: v0.1.0~353 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c09f4addc8392be18c28acd94be8842c480e5142;p=yasm Check for case-insensitive string comparisons. Use strcasecmp and strncasecmp in the source: if stricmp or strcmpi is available, they're mapped to strcasecmp. svn path=/trunk/yasm/; revision=159 --- diff --git a/configure.ac b/configure.ac index 8e4e11e5..8af8f6c0 100644 --- a/configure.ac +++ b/configure.ac @@ -31,7 +31,7 @@ AC_C_CONST AC_TYPE_SIZE_T AC_FUNC_VPRINTF -AC_CHECK_FUNCS(memcpy toascii abort) +AC_CHECK_FUNCS(memcpy toascii abort strcasecmp stricmp strcmpi) AC_REPLACE_FUNCS(strdup strtoul) AC_CHECK_HEADERS(limits.h sys/queue.h sys/cdefs.h) diff --git a/configure.in b/configure.in index 8e4e11e5..8af8f6c0 100644 --- a/configure.in +++ b/configure.in @@ -31,7 +31,7 @@ AC_C_CONST AC_TYPE_SIZE_T AC_FUNC_VPRINTF -AC_CHECK_FUNCS(memcpy toascii abort) +AC_CHECK_FUNCS(memcpy toascii abort strcasecmp stricmp strcmpi) AC_REPLACE_FUNCS(strdup strtoul) AC_CHECK_HEADERS(limits.h sys/queue.h sys/cdefs.h) diff --git a/libyasm/strcasecmp.c b/libyasm/strcasecmp.c new file mode 100644 index 00000000..1975b43f --- /dev/null +++ b/libyasm/strcasecmp.c @@ -0,0 +1,82 @@ +/* $Id: strcasecmp.c,v 1.1 2001/09/16 09:13:00 peter Exp $ + * strcasecmp() implementation for systems that don't have it or stricmp() + * or strcmpi(). + * + * Copyright (c) 1987, 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. + */ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include "util.h" + +#ifdef USE_OUR_OWN_STRCASECMP + +#if defined(LIBC_SCCS) && !defined(lint) +static char sccsid[] = "@(#)strcasecmp.c 8.1 (Berkeley) 6/4/93"; +#endif /* LIBC_SCCS and not lint */ + +#ifdef STDC_HEADERS +# include +# include +#endif + +RCSID("$Id: strcasecmp.c,v 1.1 2001/09/16 09:13:00 peter Exp $"); + +int +strcasecmp(const char *s1, const char *s2) +{ + const unsigned char + *us1 = (const unsigned char *)s1, + *us2 = (const unsigned char *)s2; + + while (tolower(*us1) == tolower(*us2++)) + if (*us1++ == '\0') + return (0); + return (tolower(*us1) - tolower(*--us2)); +} + +int +strncasecmp(const char *s1, const char *s2, size_t n) +{ + const unsigned char + *us1 = (const unsigned char *)s1, + *us2 = (const unsigned char *)s2; + + if (n != 0) { + do { + if (tolower(*us1) != tolower(*us2++)) + return (tolower(*us1) - tolower(*--us2)); + if (*us1++ == '\0') + break; + } while (--n != 0); + } + return (0); +} +#endif diff --git a/libyasm/util.h b/libyasm/util.h index 2d91d1b3..d6741dac 100644 --- a/libyasm/util.h +++ b/libyasm/util.h @@ -1,4 +1,4 @@ -/* $Id: util.h,v 1.6 2001/08/19 07:32:39 peter Exp $ +/* $Id: util.h,v 1.7 2001/09/16 09:13:00 peter Exp $ * Defines prototypes for replacement functions if needed. * * Copyright (C) 2001 Peter Johnson @@ -30,6 +30,18 @@ char *strdup(const char *str); unsigned long strtoul(const char *nptr, char **endptr, int base); #endif +#ifndef HAVE_STRCASECMP +# ifdef HAVE_STRICMP +# define strcasecmp(x, y) stricmp(x, y) +# define strncasecmp(x, y) strnicmp(x, y) +# elif HAVE_STRCMPI +# define strcasecmp(x, y) strcmpi(x, y) +# define strcasecmp(x, y) strncmpi(x, y) +# else +# define USE_OUR_OWN_STRCASECMP +# endif +#endif + #ifndef HAVE_TOASCII # define toascii(c) ((c) & 0x7F) #endif diff --git a/src/Makefile.am b/src/Makefile.am index fbb33816..d648ac7f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -20,7 +20,8 @@ yasm_SOURCES = \ objfmt.h \ preproc.h \ parser.c \ - parser.h + parser.h \ + strcasecmp.c yasm_LDADD = \ parsers/nasm/libparser.a \ diff --git a/src/strcasecmp.c b/src/strcasecmp.c new file mode 100644 index 00000000..1975b43f --- /dev/null +++ b/src/strcasecmp.c @@ -0,0 +1,82 @@ +/* $Id: strcasecmp.c,v 1.1 2001/09/16 09:13:00 peter Exp $ + * strcasecmp() implementation for systems that don't have it or stricmp() + * or strcmpi(). + * + * Copyright (c) 1987, 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. + */ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include "util.h" + +#ifdef USE_OUR_OWN_STRCASECMP + +#if defined(LIBC_SCCS) && !defined(lint) +static char sccsid[] = "@(#)strcasecmp.c 8.1 (Berkeley) 6/4/93"; +#endif /* LIBC_SCCS and not lint */ + +#ifdef STDC_HEADERS +# include +# include +#endif + +RCSID("$Id: strcasecmp.c,v 1.1 2001/09/16 09:13:00 peter Exp $"); + +int +strcasecmp(const char *s1, const char *s2) +{ + const unsigned char + *us1 = (const unsigned char *)s1, + *us2 = (const unsigned char *)s2; + + while (tolower(*us1) == tolower(*us2++)) + if (*us1++ == '\0') + return (0); + return (tolower(*us1) - tolower(*--us2)); +} + +int +strncasecmp(const char *s1, const char *s2, size_t n) +{ + const unsigned char + *us1 = (const unsigned char *)s1, + *us2 = (const unsigned char *)s2; + + if (n != 0) { + do { + if (tolower(*us1) != tolower(*us2++)) + return (tolower(*us1) - tolower(*--us2)); + if (*us1++ == '\0') + break; + } while (--n != 0); + } + return (0); +} +#endif diff --git a/src/util.h b/src/util.h index 2d91d1b3..d6741dac 100644 --- a/src/util.h +++ b/src/util.h @@ -1,4 +1,4 @@ -/* $Id: util.h,v 1.6 2001/08/19 07:32:39 peter Exp $ +/* $Id: util.h,v 1.7 2001/09/16 09:13:00 peter Exp $ * Defines prototypes for replacement functions if needed. * * Copyright (C) 2001 Peter Johnson @@ -30,6 +30,18 @@ char *strdup(const char *str); unsigned long strtoul(const char *nptr, char **endptr, int base); #endif +#ifndef HAVE_STRCASECMP +# ifdef HAVE_STRICMP +# define strcasecmp(x, y) stricmp(x, y) +# define strncasecmp(x, y) strnicmp(x, y) +# elif HAVE_STRCMPI +# define strcasecmp(x, y) strcmpi(x, y) +# define strcasecmp(x, y) strncmpi(x, y) +# else +# define USE_OUR_OWN_STRCASECMP +# endif +#endif + #ifndef HAVE_TOASCII # define toascii(c) ((c) & 0x7F) #endif diff --git a/util.h b/util.h index 2d91d1b3..d6741dac 100644 --- a/util.h +++ b/util.h @@ -1,4 +1,4 @@ -/* $Id: util.h,v 1.6 2001/08/19 07:32:39 peter Exp $ +/* $Id: util.h,v 1.7 2001/09/16 09:13:00 peter Exp $ * Defines prototypes for replacement functions if needed. * * Copyright (C) 2001 Peter Johnson @@ -30,6 +30,18 @@ char *strdup(const char *str); unsigned long strtoul(const char *nptr, char **endptr, int base); #endif +#ifndef HAVE_STRCASECMP +# ifdef HAVE_STRICMP +# define strcasecmp(x, y) stricmp(x, y) +# define strncasecmp(x, y) strnicmp(x, y) +# elif HAVE_STRCMPI +# define strcasecmp(x, y) strcmpi(x, y) +# define strcasecmp(x, y) strncmpi(x, y) +# else +# define USE_OUR_OWN_STRCASECMP +# endif +#endif + #ifndef HAVE_TOASCII # define toascii(c) ((c) & 0x7F) #endif