diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rwxr-xr-x | MODULES.html.sh | 1 | ||||
| -rw-r--r-- | lib/ChangeLog | 6 | ||||
| -rw-r--r-- | lib/c-strcase.h | 55 | ||||
| -rw-r--r-- | lib/c-strcasecmp.c | 59 | ||||
| -rw-r--r-- | lib/c-strncasecmp.c | 59 | ||||
| -rw-r--r-- | modules/c-strcase | 25 |
7 files changed, 210 insertions, 0 deletions
@@ -1,3 +1,8 @@ +2005-10-11 Bruno Haible <bruno@clisp.org> + + * modules/c-strcase: New file. + * MODULES.html.sh (String handling <string.h>): Add c-strcase. + 2005-10-11 Simon Josefsson <jas@extundo.com> * tests/test-crc.c: New file. diff --git a/MODULES.html.sh b/MODULES.html.sh index 72dfecdb66..fcf11cf008 100755 --- a/MODULES.html.sh +++ b/MODULES.html.sh @@ -1526,6 +1526,7 @@ func_all_modules () func_module memrchr func_module stpcpy func_module stpncpy + func_module c-strcase func_module strcase func_module strcasestr func_module strchrnul diff --git a/lib/ChangeLog b/lib/ChangeLog index df2b3ab4cb..ed94dee091 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,9 @@ +2005-10-11 Bruno Haible <bruno@clisp.org> + + * c-strcase.h: New file, from GNU gettext. + * c-strcasecmp.c: New file, from GNU gettext. + * c-strncasecmp.c: New file, from GNU gettext. + 2005-10-11 Simon Josefsson <jas@extundo.com> * crc.h, crc.c: New files. diff --git a/lib/c-strcase.h b/lib/c-strcase.h new file mode 100644 index 0000000000..1ababffe84 --- /dev/null +++ b/lib/c-strcase.h @@ -0,0 +1,55 @@ +/* Case-insensitive string comparison functions in C locale. + Copyright (C) 1995-1996, 2001, 2003, 2005 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software Foundation, + Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + +#ifndef C_STRCASE_H +#define C_STRCASE_H + +#include <stddef.h> + + +/* The functions defined in this file assume the "C" locale and a character + set without diacritics (ASCII-US or EBCDIC-US or something like that). + Even if the "C" locale on a particular system is an extension of the ASCII + character set (like on BeOS, where it is UTF-8, or on AmigaOS, where it + is ISO-8859-1), the functions in this file recognize only the ASCII + characters. More precisely, one of the string arguments must be an ASCII + string; the other one can also contain non-ASCII characters (but then + the comparison result will be nonzero). */ + + +#ifdef __cplusplus +extern "C" { +#endif + + +/* Compare strings S1 and S2, ignoring case, returning less than, equal to or + greater than zero if S1 is lexicographically less than, equal to or greater + than S2. */ +extern int c_strcasecmp (const char *s1, const char *s2); + +/* Compare no more than N characters of strings S1 and S2, ignoring case, + returning less than, equal to or greater than zero if S1 is + lexicographically less than, equal to or greater than S2. */ +extern int c_strncasecmp (const char *s1, const char *s2, size_t n); + + +#ifdef __cplusplus +} +#endif + + +#endif /* C_STRCASE_H */ diff --git a/lib/c-strcasecmp.c b/lib/c-strcasecmp.c new file mode 100644 index 0000000000..00e3025943 --- /dev/null +++ b/lib/c-strcasecmp.c @@ -0,0 +1,59 @@ +/* c-strcasecmp.c -- case insensitive string comparator in C locale + Copyright (C) 1998, 1999, 2005 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software Foundation, + Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + +#ifdef HAVE_CONFIG_H +# include <config.h> +#endif + +/* Specification. */ +#include "c-strcase.h" + +#include <limits.h> + +#include "c-ctype.h" + +int +c_strcasecmp (const char *s1, const char *s2) +{ + register const unsigned char *p1 = (const unsigned char *) s1; + register const unsigned char *p2 = (const unsigned char *) s2; + unsigned char c1, c2; + + if (p1 == p2) + return 0; + + do + { + c1 = c_tolower (*p1); + c2 = c_tolower (*p2); + + if (c1 == '\0') + break; + + ++p1; + ++p2; + } + while (c1 == c2); + + if (UCHAR_MAX <= INT_MAX) + return c1 - c2; + else + /* On machines where 'char' and 'int' are types of the same size, the + difference of two 'unsigned char' values - including the sign bit - + doesn't fit in an 'int'. */ + return (c1 > c2 ? 1 : c1 < c2 ? -1 : 0); +} diff --git a/lib/c-strncasecmp.c b/lib/c-strncasecmp.c new file mode 100644 index 0000000000..2d260efb67 --- /dev/null +++ b/lib/c-strncasecmp.c @@ -0,0 +1,59 @@ +/* c-strncasecmp.c -- case insensitive string comparator in C locale + Copyright (C) 1998, 1999, 2005 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software Foundation, + Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + +#ifdef HAVE_CONFIG_H +# include <config.h> +#endif + +/* Specification. */ +#include "c-strcase.h" + +#include <limits.h> + +#include "c-ctype.h" + +int +c_strncasecmp (const char *s1, const char *s2, size_t n) +{ + register const unsigned char *p1 = (const unsigned char *) s1; + register const unsigned char *p2 = (const unsigned char *) s2; + unsigned char c1, c2; + + if (p1 == p2 || n == 0) + return 0; + + do + { + c1 = c_tolower (*p1); + c2 = c_tolower (*p2); + + if (--n == 0 || c1 == '\0') + break; + + ++p1; + ++p2; + } + while (c1 == c2); + + if (UCHAR_MAX <= INT_MAX) + return c1 - c2; + else + /* On machines where 'char' and 'int' are types of the same size, the + difference of two 'unsigned char' values - including the sign bit - + doesn't fit in an 'int'. */ + return (c1 > c2 ? 1 : c1 < c2 ? -1 : 0); +} diff --git a/modules/c-strcase b/modules/c-strcase new file mode 100644 index 0000000000..eceac9e56c --- /dev/null +++ b/modules/c-strcase @@ -0,0 +1,25 @@ +Description: +Case-insensitive string comparison functions in C locale. + +Files: +lib/c-strcase.h +lib/c-strcasecmp.c +lib/c-strncasecmp.c + +Depends-on: +c-ctype + +configure.ac: + +Makefile.am: +lib_SOURCES += c-strcase.h c-strcasecmp.c c-strncasecmp.c + +Include: +"c-strcase.h" + +License: +LGPL + +Maintainer: +Bruno Haible + |