From 98b6cac347783a047671e9a9235933dddd9e5aa8 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 6 Feb 2011 12:16:54 +0100 Subject: [PATCH] New module 'wcscasecmp'. * modules/wcscasecmp: New file. * lib/wchar.in.h (wcscasecmp): New declaration. * lib/wcscasecmp.c: New file. * lib/wcscasecmp-impl.h: New file, from libutf8 with modifications. * m4/wcscasecmp.m4: New file. * m4/wchar_h.m4 (gl_WCHAR_H): Test whether wcscasecmp is declared. (gl_WCHAR_H_DEFAULTS): Initialize GNULIB_WCSCASECMP, HAVE_WCSCASECMP. * modules/wchar (Makefile.am): Substitute GNULIB_WCSCASECMP, HAVE_WCSCASECMP. * tests/test-wchar-c++.cc: Test the declaration of wcscasecmp. * doc/posix-functions/wcscasecmp.texi: Mention the new module. --- ChangeLog | 15 +++++++++++++++ doc/posix-functions/wcscasecmp.texi | 10 +++++----- lib/wchar.in.h | 16 ++++++++++++++++ lib/wcscasecmp-impl.h | 32 ++++++++++++++++++++++++++++++++ lib/wcscasecmp.c | 25 +++++++++++++++++++++++++ m4/wchar_h.m4 | 4 +++- m4/wcscasecmp.m4 | 15 +++++++++++++++ modules/wchar | 2 ++ modules/wcscasecmp | 26 ++++++++++++++++++++++++++ tests/test-wchar-c++.cc | 5 +++++ 10 files changed, 144 insertions(+), 6 deletions(-) create mode 100644 lib/wcscasecmp-impl.h create mode 100644 lib/wcscasecmp.c create mode 100644 m4/wcscasecmp.m4 create mode 100644 modules/wcscasecmp diff --git a/ChangeLog b/ChangeLog index bdb931337..e58831532 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +2011-02-06 Bruno Haible + + New module 'wcscasecmp'. + * modules/wcscasecmp: New file. + * lib/wchar.in.h (wcscasecmp): New declaration. + * lib/wcscasecmp.c: New file. + * lib/wcscasecmp-impl.h: New file, from libutf8 with modifications. + * m4/wcscasecmp.m4: New file. + * m4/wchar_h.m4 (gl_WCHAR_H): Test whether wcscasecmp is declared. + (gl_WCHAR_H_DEFAULTS): Initialize GNULIB_WCSCASECMP, HAVE_WCSCASECMP. + * modules/wchar (Makefile.am): Substitute GNULIB_WCSCASECMP, + HAVE_WCSCASECMP. + * tests/test-wchar-c++.cc: Test the declaration of wcscasecmp. + * doc/posix-functions/wcscasecmp.texi: Mention the new module. + 2011-02-05 Bruno Haible New module 'wcsncmp'. diff --git a/doc/posix-functions/wcscasecmp.texi b/doc/posix-functions/wcscasecmp.texi index 221a32d42..2b18a9a98 100644 --- a/doc/posix-functions/wcscasecmp.texi +++ b/doc/posix-functions/wcscasecmp.texi @@ -4,19 +4,19 @@ POSIX specification:@* @url{http://www.opengroup.org/onlinepubs/9699919799/functions/wcscasecmp.html} -Gnulib module: --- +Gnulib module: wcscasecmp Portability problems fixed by Gnulib: @itemize +@item +This function is missing on some platforms: +MacOS X 10.5, FreeBSD 6.0, NetBSD 3.0, OpenBSD 3.8, AIX 4.3.2, HP-UX 11, +IRIX 6.5, OSF/1 5.1, Solaris 10, Cygwin 1.5.x, mingw. @end itemize Portability problems not fixed by Gnulib: @itemize @item -This function is missing on some platforms: -MacOS X 10.5, FreeBSD 6.0, NetBSD 3.0, OpenBSD 3.8, AIX 4.3.2, HP-UX -11, IRIX 6.5, OSF/1 5.1, Solaris 10, Cygwin 1.5.x, mingw. -@item On AIX and Windows platforms, @code{wchar_t} is a 16-bit type and therefore cannot accommodate all Unicode characters. @end itemize diff --git a/lib/wchar.in.h b/lib/wchar.in.h index 9bece3472..d9d023aab 100644 --- a/lib/wchar.in.h +++ b/lib/wchar.in.h @@ -686,6 +686,22 @@ _GL_WARN_ON_USE (wcsncmp, "wcsncmp is unportable - " #endif +/* Compare S1 and S2, ignoring case. */ +#if @GNULIB_WCSCASECMP@ +# if !@HAVE_WCSCASECMP@ +_GL_FUNCDECL_SYS (wcscasecmp, int, (const wchar_t *s1, const wchar_t *s2)); +# endif +_GL_CXXALIAS_SYS (wcscasecmp, int, (const wchar_t *s1, const wchar_t *s2)); +_GL_CXXALIASWARN (wcscasecmp); +#elif defined GNULIB_POSIXCHECK +# undef wcscasecmp +# if HAVE_RAW_DECL_WCSCASECMP +_GL_WARN_ON_USE (wcscasecmp, "wcscasecmp is unportable - " + "use gnulib module wcscasecmp for portability"); +# endif +#endif + + #endif /* _GL_WCHAR_H */ #endif /* _GL_WCHAR_H */ #endif diff --git a/lib/wcscasecmp-impl.h b/lib/wcscasecmp-impl.h new file mode 100644 index 000000000..8c716fa3d --- /dev/null +++ b/lib/wcscasecmp-impl.h @@ -0,0 +1,32 @@ +/* Compare two wide strings ignoring case. + Copyright (C) 1999, 2011 Free Software Foundation, Inc. + Written by Bruno Haible , 2011. + + 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 3 of the License, 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, see . */ + +int +wcscasecmp (const wchar_t *s1, const wchar_t *s2) +{ + for (;;) + { + wchar_t wc1 = towlower (*s1++); + wchar_t wc2 = towlower (*s2++); + if (wc1 != (wchar_t)'\0' && wc1 == wc2) + continue; + /* Note that wc1 and wc2 each have at most 31 bits. */ + return (int)wc1 - (int)wc2; + /* > 0 if wc1 > wc2, < 0 if wc1 < wc2, + = 0 if wc1 and wc2 are both '\0'. */ + } +} diff --git a/lib/wcscasecmp.c b/lib/wcscasecmp.c new file mode 100644 index 000000000..f3796e058 --- /dev/null +++ b/lib/wcscasecmp.c @@ -0,0 +1,25 @@ +/* Compare two wide strings ignoring case. + Copyright (C) 2011 Free Software Foundation, Inc. + Written by Bruno Haible , 2011. + + 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 3 of the License, 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, see . */ + +#include + +/* Specification. */ +#include + +#include + +#include "wcscasecmp-impl.h" diff --git a/m4/wchar_h.m4 b/m4/wchar_h.m4 index 6f24ee967..578134c23 100644 --- a/m4/wchar_h.m4 +++ b/m4/wchar_h.m4 @@ -52,7 +52,7 @@ AC_DEFUN([gl_WCHAR_H], [btowc wctob mbsinit mbrtowc mbrlen mbsrtowcs mbsnrtowcs wcrtomb wcsrtombs wcsnrtombs wcwidth wmemchr wmemcmp wmemcpy wmemmove wmemset wcslen wcsnlen wcscpy wcpcpy wcsncpy wcpncpy wcscat wcsncat wcscmp - wcsncmp + wcsncmp wcscasecmp ]) ]) @@ -162,6 +162,7 @@ AC_DEFUN([gl_WCHAR_H_DEFAULTS], GNULIB_WCSNCAT=0; AC_SUBST([GNULIB_WCSNCAT]) GNULIB_WCSCMP=0; AC_SUBST([GNULIB_WCSCMP]) GNULIB_WCSNCMP=0; AC_SUBST([GNULIB_WCSNCMP]) + GNULIB_WCSCASECMP=0; AC_SUBST([GNULIB_WCSCASECMP]) dnl Assume proper GNU behavior unless another module says otherwise. HAVE_BTOWC=1; AC_SUBST([HAVE_BTOWC]) HAVE_MBSINIT=1; AC_SUBST([HAVE_MBSINIT]) @@ -187,6 +188,7 @@ AC_DEFUN([gl_WCHAR_H_DEFAULTS], HAVE_WCSNCAT=1; AC_SUBST([HAVE_WCSNCAT]) HAVE_WCSCMP=1; AC_SUBST([HAVE_WCSCMP]) HAVE_WCSNCMP=1; AC_SUBST([HAVE_WCSNCMP]) + HAVE_WCSCASECMP=1; AC_SUBST([HAVE_WCSCASECMP]) HAVE_DECL_WCTOB=1; AC_SUBST([HAVE_DECL_WCTOB]) HAVE_DECL_WCWIDTH=1; AC_SUBST([HAVE_DECL_WCWIDTH]) REPLACE_MBSTATE_T=0; AC_SUBST([REPLACE_MBSTATE_T]) diff --git a/m4/wcscasecmp.m4 b/m4/wcscasecmp.m4 new file mode 100644 index 000000000..801381344 --- /dev/null +++ b/m4/wcscasecmp.m4 @@ -0,0 +1,15 @@ +# wcscasecmp.m4 serial 1 +dnl Copyright (C) 2011 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +AC_DEFUN([gl_FUNC_WCSCASECMP], +[ + AC_REQUIRE([gl_WCHAR_H_DEFAULTS]) + AC_CHECK_FUNCS_ONCE([wcscasecmp]) + if test $ac_cv_func_wcscasecmp = no; then + HAVE_WCSCASECMP=0 + AC_LIBOBJ([wcscasecmp]) + fi +]) diff --git a/modules/wchar b/modules/wchar index 2eb67e1bd..81861ce9c 100644 --- a/modules/wchar +++ b/modules/wchar @@ -56,6 +56,7 @@ wchar.h: wchar.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) -e 's|@''GNULIB_WCSNCAT''@|$(GNULIB_WCSNCAT)|g' \ -e 's|@''GNULIB_WCSCMP''@|$(GNULIB_WCSCMP)|g' \ -e 's|@''GNULIB_WCSNCMP''@|$(GNULIB_WCSNCMP)|g' \ + -e 's|@''GNULIB_WCSCASECMP''@|$(GNULIB_WCSCASECMP)|g' \ -e 's|@''HAVE_WINT_T''@|$(HAVE_WINT_T)|g' \ -e 's|@''HAVE_BTOWC''@|$(HAVE_BTOWC)|g' \ -e 's|@''HAVE_MBSINIT''@|$(HAVE_MBSINIT)|g' \ @@ -81,6 +82,7 @@ wchar.h: wchar.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) -e 's|@''HAVE_WCSNCAT''@|$(HAVE_WCSNCAT)|g' \ -e 's|@''HAVE_WCSCMP''@|$(HAVE_WCSCMP)|g' \ -e 's|@''HAVE_WCSNCMP''@|$(HAVE_WCSNCMP)|g' \ + -e 's|@''HAVE_WCSCASECMP''@|$(HAVE_WCSCASECMP)|g' \ -e 's|@''HAVE_DECL_WCTOB''@|$(HAVE_DECL_WCTOB)|g' \ -e 's|@''HAVE_DECL_WCWIDTH''@|$(HAVE_DECL_WCWIDTH)|g' \ -e 's|@''REPLACE_MBSTATE_T''@|$(REPLACE_MBSTATE_T)|g' \ diff --git a/modules/wcscasecmp b/modules/wcscasecmp new file mode 100644 index 000000000..b5e8e69a3 --- /dev/null +++ b/modules/wcscasecmp @@ -0,0 +1,26 @@ +Description: +wcscasecmp() function: compare two wide strings ignoring case. + +Files: +lib/wcscasecmp.c +lib/wcscasecmp-impl.h +m4/wcscasecmp.m4 + +Depends-on: +wchar +wctype + +configure.ac: +gl_FUNC_WCSCASECMP +gl_WCHAR_MODULE_INDICATOR([wcscasecmp]) + +Makefile.am: + +Include: + + +License: +LGPL + +Maintainer: +Bruno Haible diff --git a/tests/test-wchar-c++.cc b/tests/test-wchar-c++.cc index 8d4acc191..58521353c 100644 --- a/tests/test-wchar-c++.cc +++ b/tests/test-wchar-c++.cc @@ -148,6 +148,11 @@ SIGNATURE_CHECK (GNULIB_NAMESPACE::wcsncmp, int, (const wchar_t *, const wchar_t *, size_t)); #endif +#if GNULIB_TEST_WCSCASECMP +SIGNATURE_CHECK (GNULIB_NAMESPACE::wcscasecmp, int, + (const wchar_t *, const wchar_t *)); +#endif + int main () -- 2.11.0