From be86abb4e6d5be278524ebb6b84392b67b017ed3 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 6 Feb 2011 04:39:48 +0100 Subject: [PATCH] New module 'wcscmp'. * modules/wcscmp: New file. * lib/wchar.in.h (wcscmp): New declaration. * lib/wcscmp.c: New file. * lib/wcscmp-impl.h: New file, from libutf8 with modifications. * m4/wcscmp.m4: New file. * m4/wchar_h.m4 (gl_WCHAR_H): Test whether wcscmp is declared. (gl_WCHAR_H_DEFAULTS): Initialize GNULIB_WCSCMP, HAVE_WCSCMP. * modules/wchar (Makefile.am): Substitute GNULIB_WCSCMP, HAVE_WCSCMP. * tests/test-wchar-c++.cc: Test the declaration of wcscmp. * doc/posix-functions/wcscmp.texi: Mention the new module. --- ChangeLog | 14 ++++++++++++++ doc/posix-functions/wcscmp.texi | 8 ++++---- lib/wchar.in.h | 16 ++++++++++++++++ lib/wcscmp-impl.h | 32 ++++++++++++++++++++++++++++++++ lib/wcscmp.c | 23 +++++++++++++++++++++++ m4/wchar_h.m4 | 4 +++- m4/wcscmp.m4 | 15 +++++++++++++++ modules/wchar | 2 ++ modules/wcscmp | 31 +++++++++++++++++++++++++++++++ tests/test-wchar-c++.cc | 5 +++++ 10 files changed, 145 insertions(+), 5 deletions(-) create mode 100644 lib/wcscmp-impl.h create mode 100644 lib/wcscmp.c create mode 100644 m4/wcscmp.m4 create mode 100644 modules/wcscmp diff --git a/ChangeLog b/ChangeLog index ceb9a0336..f5445cbfb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,19 @@ 2011-02-05 Bruno Haible + New module 'wcscmp'. + * modules/wcscmp: New file. + * lib/wchar.in.h (wcscmp): New declaration. + * lib/wcscmp.c: New file. + * lib/wcscmp-impl.h: New file, from libutf8 with modifications. + * m4/wcscmp.m4: New file. + * m4/wchar_h.m4 (gl_WCHAR_H): Test whether wcscmp is declared. + (gl_WCHAR_H_DEFAULTS): Initialize GNULIB_WCSCMP, HAVE_WCSCMP. + * modules/wchar (Makefile.am): Substitute GNULIB_WCSCMP, HAVE_WCSCMP. + * tests/test-wchar-c++.cc: Test the declaration of wcscmp. + * doc/posix-functions/wcscmp.texi: Mention the new module. + +2011-02-05 Bruno Haible + New module 'wcsncat'. * modules/wcsncat: New file. * lib/wchar.in.h (wcsncat): New declaration. diff --git a/doc/posix-functions/wcscmp.texi b/doc/posix-functions/wcscmp.texi index bdaa99e28..9766b9d24 100644 --- a/doc/posix-functions/wcscmp.texi +++ b/doc/posix-functions/wcscmp.texi @@ -4,18 +4,18 @@ POSIX specification:@* @url{http://www.opengroup.org/onlinepubs/9699919799/functions/wcscmp.html} -Gnulib module: --- +Gnulib module: wcscmp Portability problems fixed by Gnulib: @itemize +@item +This function is missing on some platforms: +IRIX 5.3, Solaris 2.5.1. @end itemize Portability problems not fixed by Gnulib: @itemize @item -This function is missing on some platforms: -IRIX 5.3, Solaris 2.5.1. -@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 9783b5ede..d3c978946 100644 --- a/lib/wchar.in.h +++ b/lib/wchar.in.h @@ -652,6 +652,22 @@ _GL_WARN_ON_USE (wcsncat, "wcsncat is unportable - " #endif +/* Compare S1 and S2. */ +#if @GNULIB_WCSCMP@ +# if !@HAVE_WCSCMP@ +_GL_FUNCDECL_SYS (wcscmp, int, (const wchar_t *s1, const wchar_t *s2)); +# endif +_GL_CXXALIAS_SYS (wcscmp, int, (const wchar_t *s1, const wchar_t *s2)); +_GL_CXXALIASWARN (wcscmp); +#elif defined GNULIB_POSIXCHECK +# undef wcscmp +# if HAVE_RAW_DECL_WCSCMP +_GL_WARN_ON_USE (wcscmp, "wcscmp is unportable - " + "use gnulib module wcscmp for portability"); +# endif +#endif + + #endif /* _GL_WCHAR_H */ #endif /* _GL_WCHAR_H */ #endif diff --git a/lib/wcscmp-impl.h b/lib/wcscmp-impl.h new file mode 100644 index 000000000..1c384c675 --- /dev/null +++ b/lib/wcscmp-impl.h @@ -0,0 +1,32 @@ +/* Compare two wide strings. + Copyright (C) 1999, 2011 Free Software Foundation, Inc. + Written by Bruno Haible , 1999. + + 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 +wcscmp (const wchar_t *s1, const wchar_t *s2) +{ + for (;;) + { + wchar_t wc1 = *s1++; + wchar_t wc2 = *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/wcscmp.c b/lib/wcscmp.c new file mode 100644 index 000000000..9a73a2582 --- /dev/null +++ b/lib/wcscmp.c @@ -0,0 +1,23 @@ +/* Compare two wide strings. + 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 "wcscmp-impl.h" diff --git a/m4/wchar_h.m4 b/m4/wchar_h.m4 index 909f6f28d..15897e927 100644 --- a/m4/wchar_h.m4 +++ b/m4/wchar_h.m4 @@ -51,7 +51,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 + wcslen wcsnlen wcscpy wcpcpy wcsncpy wcpncpy wcscat wcsncat wcscmp ]) ]) @@ -159,6 +159,7 @@ AC_DEFUN([gl_WCHAR_H_DEFAULTS], GNULIB_WCPNCPY=0; AC_SUBST([GNULIB_WCPNCPY]) GNULIB_WCSCAT=0; AC_SUBST([GNULIB_WCSCAT]) GNULIB_WCSNCAT=0; AC_SUBST([GNULIB_WCSNCAT]) + GNULIB_WCSCMP=0; AC_SUBST([GNULIB_WCSCMP]) dnl Assume proper GNU behavior unless another module says otherwise. HAVE_BTOWC=1; AC_SUBST([HAVE_BTOWC]) HAVE_MBSINIT=1; AC_SUBST([HAVE_MBSINIT]) @@ -182,6 +183,7 @@ AC_DEFUN([gl_WCHAR_H_DEFAULTS], HAVE_WCPNCPY=1; AC_SUBST([HAVE_WCPNCPY]) HAVE_WCSCAT=1; AC_SUBST([HAVE_WCSCAT]) HAVE_WCSNCAT=1; AC_SUBST([HAVE_WCSNCAT]) + HAVE_WCSCMP=1; AC_SUBST([HAVE_WCSCMP]) 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/wcscmp.m4 b/m4/wcscmp.m4 new file mode 100644 index 000000000..376965fd3 --- /dev/null +++ b/m4/wcscmp.m4 @@ -0,0 +1,15 @@ +# wcscmp.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_WCSCMP], +[ + AC_REQUIRE([gl_WCHAR_H_DEFAULTS]) + AC_CHECK_FUNCS_ONCE([wcscmp]) + if test $ac_cv_func_wcscmp = no; then + HAVE_WCSCMP=0 + AC_LIBOBJ([wcscmp]) + fi +]) diff --git a/modules/wchar b/modules/wchar index 44d950c04..b9290397f 100644 --- a/modules/wchar +++ b/modules/wchar @@ -54,6 +54,7 @@ wchar.h: wchar.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) -e 's|@''GNULIB_WCPNCPY''@|$(GNULIB_WCPNCPY)|g' \ -e 's|@''GNULIB_WCSCAT''@|$(GNULIB_WCSCAT)|g' \ -e 's|@''GNULIB_WCSNCAT''@|$(GNULIB_WCSNCAT)|g' \ + -e 's|@''GNULIB_WCSCMP''@|$(GNULIB_WCSCMP)|g' \ -e 's|@''HAVE_WINT_T''@|$(HAVE_WINT_T)|g' \ -e 's|@''HAVE_BTOWC''@|$(HAVE_BTOWC)|g' \ -e 's|@''HAVE_MBSINIT''@|$(HAVE_MBSINIT)|g' \ @@ -77,6 +78,7 @@ wchar.h: wchar.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) -e 's|@''HAVE_WCPNCPY''@|$(HAVE_WCPNCPY)|g' \ -e 's|@''HAVE_WCSCAT''@|$(HAVE_WCSCAT)|g' \ -e 's|@''HAVE_WCSNCAT''@|$(HAVE_WCSNCAT)|g' \ + -e 's|@''HAVE_WCSCMP''@|$(HAVE_WCSCMP)|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/wcscmp b/modules/wcscmp new file mode 100644 index 000000000..27c162166 --- /dev/null +++ b/modules/wcscmp @@ -0,0 +1,31 @@ +Description: +wcscmp() function: compare two wide strings. + +Status: +obsolete + +Notice: +This module is obsolete. + +Files: +lib/wcscmp.c +lib/wcscmp-impl.h +m4/wcscmp.m4 + +Depends-on: +wchar + +configure.ac: +gl_FUNC_WCSCMP +gl_WCHAR_MODULE_INDICATOR([wcscmp]) + +Makefile.am: + +Include: + + +License: +LGPL + +Maintainer: +Bruno Haible diff --git a/tests/test-wchar-c++.cc b/tests/test-wchar-c++.cc index 6af65dc98..1a68a3d9e 100644 --- a/tests/test-wchar-c++.cc +++ b/tests/test-wchar-c++.cc @@ -138,6 +138,11 @@ SIGNATURE_CHECK (GNULIB_NAMESPACE::wcsncat, wchar_t *, (wchar_t *, const wchar_t *, size_t)); #endif +#if GNULIB_TEST_WCSCMP +SIGNATURE_CHECK (GNULIB_NAMESPACE::wcscmp, int, + (const wchar_t *, const wchar_t *)); +#endif + int main () -- 2.11.0