changeset 14291:517e0af1a79b

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.
author Bruno Haible <bruno@clisp.org>
date Sun, 06 Feb 2011 12:16:54 +0100
parents 0da9f0fe36fe
children ba9661869dda
files ChangeLog doc/posix-functions/wcscasecmp.texi lib/wchar.in.h lib/wcscasecmp-impl.h lib/wcscasecmp.c m4/wchar_h.m4 m4/wcscasecmp.m4 modules/wchar modules/wcscasecmp tests/test-wchar-c++.cc
diffstat 10 files changed, 144 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Sun Feb 06 04:47:49 2011 +0100
+++ b/ChangeLog	Sun Feb 06 12:16:54 2011 +0100
@@ -1,3 +1,18 @@
+2011-02-06  Bruno Haible  <bruno@clisp.org>
+
+	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  <bruno@clisp.org>
 
 	New module 'wcsncmp'.
--- a/doc/posix-functions/wcscasecmp.texi	Sun Feb 06 04:47:49 2011 +0100
+++ b/doc/posix-functions/wcscasecmp.texi	Sun Feb 06 12:16:54 2011 +0100
@@ -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
--- a/lib/wchar.in.h	Sun Feb 06 04:47:49 2011 +0100
+++ b/lib/wchar.in.h	Sun Feb 06 12:16:54 2011 +0100
@@ -686,6 +686,22 @@
 #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
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/lib/wcscasecmp-impl.h	Sun Feb 06 12:16:54 2011 +0100
@@ -0,0 +1,32 @@
+/* Compare two wide strings ignoring case.
+   Copyright (C) 1999, 2011 Free Software Foundation, Inc.
+   Written by Bruno Haible <bruno@clisp.org>, 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 <http://www.gnu.org/licenses/>.  */
+
+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'.  */
+    }
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/lib/wcscasecmp.c	Sun Feb 06 12:16:54 2011 +0100
@@ -0,0 +1,25 @@
+/* Compare two wide strings ignoring case.
+   Copyright (C) 2011 Free Software Foundation, Inc.
+   Written by Bruno Haible <bruno@clisp.org>, 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 <http://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+/* Specification.  */
+#include <wchar.h>
+
+#include <wctype.h>
+
+#include "wcscasecmp-impl.h"
--- a/m4/wchar_h.m4	Sun Feb 06 04:47:49 2011 +0100
+++ b/m4/wchar_h.m4	Sun Feb 06 12:16:54 2011 +0100
@@ -52,7 +52,7 @@
     [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 @@
   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 @@
   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])
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/m4/wcscasecmp.m4	Sun Feb 06 12:16:54 2011 +0100
@@ -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
+])
--- a/modules/wchar	Sun Feb 06 04:47:49 2011 +0100
+++ b/modules/wchar	Sun Feb 06 12:16:54 2011 +0100
@@ -56,6 +56,7 @@
 	      -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 @@
 	      -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' \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/modules/wcscasecmp	Sun Feb 06 12:16:54 2011 +0100
@@ -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:
+<wchar.h>
+
+License:
+LGPL
+
+Maintainer:
+Bruno Haible
--- a/tests/test-wchar-c++.cc	Sun Feb 06 04:47:49 2011 +0100
+++ b/tests/test-wchar-c++.cc	Sun Feb 06 12:16:54 2011 +0100
@@ -148,6 +148,11 @@
                  (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 ()