diff --git a/lib/Makefile b/lib/Makefile index d35abb1293..9822d89627 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -45,9 +45,10 @@ endif STRING_SRCS = lib_memset.c lib_memcpy.c lib_memcmp.c lib_memmove.c \ lib_strcpy.c lib_strncpy.c lib_strcmp.c lib_strncmp.c \ - lib_strlen.c lib_strdup.c lib_strcat.c lib_strncat.c \ - lib_strtol.c lib_strchr.c lib_strrchr.c lib_strspn.c \ - lib_strcspn.c lib_strtok.c lib_strtokr.c lib_strerror.c + lib_strcasecmp.c lib_strncasecmp.c lib_strlen.c lib_strdup.c \ + lib_strcat.c lib_strncat.c lib_strtol.c lib_strchr.c \ + lib_strrchr.c lib_strspn.c lib_strcspn.c lib_strtok.c \ + lib_strtokr.c lib_strerror.c CTYPE_SRCS = diff --git a/lib/lib_strcasecmp.c b/lib/lib_strcasecmp.c new file mode 100644 index 0000000000..e5d14bda9c --- /dev/null +++ b/lib/lib_strcasecmp.c @@ -0,0 +1,65 @@ +/**************************************************************************** + * lib/lib_strcasecmp.c + * + * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt + * + * 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 NuttX 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 COPYRIGHT HOLDERS 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 + * COPYRIGHT OWNER 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. + * + *****************************************************************************/ + +/**************************************************************************** + * Compilation Switches + *****************************************************************************/ + +/**************************************************************************** + * Included Files + *****************************************************************************/ + +#include + +#include +#include +#include + +/**************************************************************************** + * Public Functions + *****************************************************************************/ + +#ifndef CONFIG_ARCH_STRCMP +int strcasecmp(const char *cs, const char *ct) +{ + register signed char result; + for (;;) + { + if ((result = toupper(*cs) - toupper(*ct++)) != 0 || !*cs++) + break; + } + return result; +} +#endif diff --git a/lib/lib_strcmp.c b/lib/lib_strcmp.c index 0b1ce89d52..1fa24f177a 100644 --- a/lib/lib_strcmp.c +++ b/lib/lib_strcmp.c @@ -1,7 +1,7 @@ -/************************************************************ - * lib_strcmp.c +/**************************************************************************** + * lib/lib_strcmp.c * - * Copyright (C) 2007 Gregory Nutt. All rights reserved. + * Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -14,7 +14,7 @@ * notice, this list of conditions and the following disclaimer in * the documentation and/or other materials provided with the * distribution. - * 3. Neither the name Gregory Nutt nor the names of its contributors may be + * 3. Neither the name NuttX nor the names of its contributors may be * used to endorse or promote products derived from this software * without specific prior written permission. * @@ -31,23 +31,23 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - ************************************************************/ + *****************************************************************************/ -/************************************************************ +/**************************************************************************** * Compilation Switches - ************************************************************/ + *****************************************************************************/ -/************************************************************ +/**************************************************************************** * Included Files - ************************************************************/ + *****************************************************************************/ #include #include #include -/************************************************************ - * Global Functions - ************************************************************/ +/**************************************************************************** + * Public Functions + *****************************************************************************/ #ifndef CONFIG_ARCH_STRCMP int strcmp(const char *cs, const char *ct) diff --git a/lib/lib_strncasecmp.c b/lib/lib_strncasecmp.c new file mode 100644 index 0000000000..3fc26baf6f --- /dev/null +++ b/lib/lib_strncasecmp.c @@ -0,0 +1,67 @@ +/**************************************************************************** + * lib/lib_strncasecmp.c + * + * Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt + * + * 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 NuttX 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 COPYRIGHT HOLDERS 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 + * COPYRIGHT OWNER 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. + * + *****************************************************************************/ + +/**************************************************************************** + * Compilation Switches + *****************************************************************************/ + +/**************************************************************************** + * Included Files + *****************************************************************************/ + +#include + +#include +#include +#include + +/**************************************************************************** + * Global Functions + *****************************************************************************/ + +#ifndef CONFIG_ARCH_STRNCMP +int strncmp(const char *cs, const char *ct, size_t nb) +{ + register signed char result = 0; + for (; nb > 0; nb--) + { + if ((result = toupper(*cs) - toupper(*ct++)) != 0 || !*cs++) + { + break; + } + } + return result; +} +#endif diff --git a/lib/lib_strncmp.c b/lib/lib_strncmp.c index 1153dfd87c..c50ec105ea 100644 --- a/lib/lib_strncmp.c +++ b/lib/lib_strncmp.c @@ -1,7 +1,7 @@ -/************************************************************ - * lib_strncmp.c +/**************************************************************************** + * lib/lib_strncmp.c * - * Copyright (C) 2007 Gregory Nutt. All rights reserved. + * Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -14,7 +14,7 @@ * notice, this list of conditions and the following disclaimer in * the documentation and/or other materials provided with the * distribution. - * 3. Neither the name Gregory Nutt nor the names of its contributors may be + * 3. Neither the name NuttX nor the names of its contributors may be * used to endorse or promote products derived from this software * without specific prior written permission. * @@ -31,23 +31,23 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - ************************************************************/ + *****************************************************************************/ -/************************************************************ +/**************************************************************************** * Compilation Switches - ************************************************************/ + *****************************************************************************/ -/************************************************************ +/**************************************************************************** * Included Files - ************************************************************/ + *****************************************************************************/ #include #include #include -/************************************************************ +/**************************************************************************** * Global Functions - ************************************************************/ + *****************************************************************************/ #ifndef CONFIG_ARCH_STRNCMP int strncmp(const char *cs, const char *ct, size_t nb)