changeset 14294:b19db9397852

New module 'wcsxfrm'. * modules/wcsxfrm: New file. * lib/wchar.in.h (wcsxfrm): New declaration. * lib/wcsxfrm.c: New file. * lib/wcsxfrm-impl.h: New file. * m4/wcsxfrm.m4: New file. * m4/wchar_h.m4 (gl_WCHAR_H): Test whether wcsxfrm is declared. (gl_WCHAR_H_DEFAULTS): Initialize GNULIB_WCSXFRM, HAVE_WCSXFRM. * modules/wchar (Makefile.am): Substitute GNULIB_WCSXFRM, HAVE_WCSXFRM. * tests/test-wchar-c++.cc: Test the declaration of wcsxfrm. * doc/posix-functions/wcsxfrm.texi: Mention the new module.
author Bruno Haible <bruno@clisp.org>
date Sun, 06 Feb 2011 13:30:53 +0100
parents 13e6946b4e9a
children 34809a158a33
files ChangeLog doc/posix-functions/wcsxfrm.texi lib/wchar.in.h lib/wcsxfrm-impl.h lib/wcsxfrm.c m4/wchar_h.m4 m4/wcsxfrm.m4 modules/wchar modules/wcsxfrm tests/test-wchar-c++.cc
diffstat 10 files changed, 210 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2011-02-06  Bruno Haible  <bruno@clisp.org>
+
+	New module 'wcsxfrm'.
+	* modules/wcsxfrm: New file.
+	* lib/wchar.in.h (wcsxfrm): New declaration.
+	* lib/wcsxfrm.c: New file.
+	* lib/wcsxfrm-impl.h: New file.
+	* m4/wcsxfrm.m4: New file.
+	* m4/wchar_h.m4 (gl_WCHAR_H): Test whether wcsxfrm is declared.
+	(gl_WCHAR_H_DEFAULTS): Initialize GNULIB_WCSXFRM, HAVE_WCSXFRM.
+	* modules/wchar (Makefile.am): Substitute GNULIB_WCSXFRM, HAVE_WCSXFRM.
+	* tests/test-wchar-c++.cc: Test the declaration of wcsxfrm.
+	* doc/posix-functions/wcsxfrm.texi: Mention the new module.
+
 2011-02-06  Bruno Haible  <bruno@clisp.org>
 
 	New module 'wcscoll'.
--- a/doc/posix-functions/wcsxfrm.texi
+++ b/doc/posix-functions/wcsxfrm.texi
@@ -4,18 +4,18 @@
 
 POSIX specification:@* @url{http://www.opengroup.org/onlinepubs/9699919799/functions/wcsxfrm.html}
 
-Gnulib module: ---
+Gnulib module: wcsxfrm
 
 Portability problems fixed by Gnulib:
 @itemize
+@item
+This function is missing on some platforms:
+IRIX 5.3, Solaris 2.5.1, Cygwin 1.5.x.
 @end itemize
 
 Portability problems not fixed by Gnulib:
 @itemize
 @item
-This function is missing on some platforms:
-IRIX 5.3, Solaris 2.5.1, Cygwin 1.5.x.
-@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
+++ b/lib/wchar.in.h
@@ -737,6 +737,24 @@
 #endif
 
 
+/* Transform S2 into array pointed to by S1 such that if wcscmp is applied
+   to two transformed strings the result is the as applying 'wcscoll' to the
+   original strings.  */
+#if @GNULIB_WCSXFRM@
+# if !@HAVE_WCSXFRM@
+_GL_FUNCDECL_SYS (wcsxfrm, size_t, (wchar_t *s1, const wchar_t *s2, size_t n));
+# endif
+_GL_CXXALIAS_SYS (wcsxfrm, size_t, (wchar_t *s1, const wchar_t *s2, size_t n));
+_GL_CXXALIASWARN (wcsxfrm);
+#elif defined GNULIB_POSIXCHECK
+# undef wcsxfrm
+# if HAVE_RAW_DECL_WCSXFRM
+_GL_WARN_ON_USE (wcsxfrm, "wcsxfrm is unportable - "
+                 "use gnulib module wcsxfrm for portability");
+# endif
+#endif
+
+
 #endif /* _GL_WCHAR_H */
 #endif /* _GL_WCHAR_H */
 #endif
new file mode 100644
--- /dev/null
+++ b/lib/wcsxfrm-impl.h
@@ -0,0 +1,96 @@
+/* Transform wide string for comparison using the current locale.
+   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/>.  */
+
+size_t
+wcsxfrm (wchar_t *s1, const wchar_t *s2, size_t n)
+{
+  char mbbuf2[1024];
+  char *mbs2;
+
+  {
+    int saved_errno = errno;
+    size_t result;
+
+    /* Convert s2 to a multibyte string, trying to avoid malloc().  */
+    {
+      size_t ret;
+
+      ret = wcstombs (mbbuf2, s2, sizeof (mbbuf2));
+      if (ret == (size_t)-1)
+        goto failed;
+      if (ret < sizeof (mbbuf2))
+        mbs2 = mbbuf2;
+      else
+        {
+          size_t need = wcstombs (NULL, s2, 0);
+          if (need == (size_t)-1)
+            goto failed;
+          mbs2 = (char *) malloc (need + 1);
+          if (mbs2 == NULL)
+            goto out_of_memory;
+          ret = wcstombs (mbs2, s2, need + 1);
+          if (ret != need)
+            abort ();
+        }
+    }
+
+    /* Transform the multibyte string.  */
+    errno = 0;
+    result = strxfrm ((char *)s1, mbs2, n);
+    if (errno != 0)
+      {
+        /* An error occurred.  */
+        if (mbs2 != mbbuf2)
+          {
+            saved_errno = errno;
+            free (mbs2);
+            errno = saved_errno;
+          }
+        return 0;
+      }
+
+    if (result < n)
+      {
+        /* Convert the result by mapping char[] -> wchar_t[].
+           Since strcmp() compares the elements as 'unsigned char' values,
+           whereas wcscmp() compares the elements as 'wchar_t' values, we need
+           to map 1 'unsigned char' to 1 'wchar_t'.  (We could also map 2
+           consecutive 'unsigned char' values to 1 'wchar_t' value, but this is
+           not needed.  */
+        wchar_t *wcp = s1 + n;
+        char *cp = (char *)s1 + n;
+
+        while (wcp > s1)
+          *--wcp = (wchar_t) (unsigned char) *--cp;
+      }
+
+    if (mbs2 != mbbuf2)
+      free (mbs2);
+
+    /* No error.  */
+    errno = saved_errno;
+    return result;
+  }
+
+ out_of_memory:
+  errno = ENOMEM;
+  return 0;
+
+ failed:
+  errno = EILSEQ;
+  return 0;
+}
new file mode 100644
--- /dev/null
+++ b/lib/wcsxfrm.c
@@ -0,0 +1,27 @@
+/* Transform wide string for comparison using the current locale.
+   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 <errno.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "wcsxfrm-impl.h"
--- a/m4/wchar_h.m4
+++ b/m4/wchar_h.m4
@@ -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 wcscasecmp wcsncasecmp wcscoll
+     wcsncmp wcscasecmp wcsncasecmp wcscoll wcsxfrm
     ])
 ])
 
@@ -165,6 +165,7 @@
   GNULIB_WCSCASECMP=0;  AC_SUBST([GNULIB_WCSCASECMP])
   GNULIB_WCSNCASECMP=0; AC_SUBST([GNULIB_WCSNCASECMP])
   GNULIB_WCSCOLL=0;     AC_SUBST([GNULIB_WCSCOLL])
+  GNULIB_WCSXFRM=0;     AC_SUBST([GNULIB_WCSXFRM])
   dnl Assume proper GNU behavior unless another module says otherwise.
   HAVE_BTOWC=1;         AC_SUBST([HAVE_BTOWC])
   HAVE_MBSINIT=1;       AC_SUBST([HAVE_MBSINIT])
@@ -193,6 +194,7 @@
   HAVE_WCSCASECMP=1;    AC_SUBST([HAVE_WCSCASECMP])
   HAVE_WCSNCASECMP=1;   AC_SUBST([HAVE_WCSNCASECMP])
   HAVE_WCSCOLL=1;       AC_SUBST([HAVE_WCSCOLL])
+  HAVE_WCSXFRM=1;       AC_SUBST([HAVE_WCSXFRM])
   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])
new file mode 100644
--- /dev/null
+++ b/m4/wcsxfrm.m4
@@ -0,0 +1,15 @@
+# wcsxfrm.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_WCSXFRM],
+[
+  AC_REQUIRE([gl_WCHAR_H_DEFAULTS])
+  AC_CHECK_FUNCS_ONCE([wcsxfrm])
+  if test $ac_cv_func_wcsxfrm = no; then
+    HAVE_WCSXFRM=0
+    AC_LIBOBJ([wcsxfrm])
+  fi
+])
--- a/modules/wchar
+++ b/modules/wchar
@@ -59,6 +59,7 @@
 	      -e 's|@''GNULIB_WCSCASECMP''@|$(GNULIB_WCSCASECMP)|g' \
 	      -e 's|@''GNULIB_WCSNCASECMP''@|$(GNULIB_WCSNCASECMP)|g' \
 	      -e 's|@''GNULIB_WCSCOLL''@|$(GNULIB_WCSCOLL)|g' \
+	      -e 's|@''GNULIB_WCSXFRM''@|$(GNULIB_WCSXFRM)|g' \
 	      -e 's|@''HAVE_WINT_T''@|$(HAVE_WINT_T)|g' \
 	      -e 's|@''HAVE_BTOWC''@|$(HAVE_BTOWC)|g' \
 	      -e 's|@''HAVE_MBSINIT''@|$(HAVE_MBSINIT)|g' \
@@ -87,6 +88,7 @@
 	      -e 's|@''HAVE_WCSCASECMP''@|$(HAVE_WCSCASECMP)|g' \
 	      -e 's|@''HAVE_WCSNCASECMP''@|$(HAVE_WCSNCASECMP)|g' \
 	      -e 's|@''HAVE_WCSCOLL''@|$(HAVE_WCSCOLL)|g' \
+	      -e 's|@''HAVE_WCSXFRM''@|$(HAVE_WCSXFRM)|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' \
new file mode 100644
--- /dev/null
+++ b/modules/wcsxfrm
@@ -0,0 +1,26 @@
+Description:
+wcsxfrm() function: transform wide string for comparison using the current
+locale.
+
+Files:
+lib/wcsxfrm.c
+lib/wcsxfrm-impl.h
+m4/wcsxfrm.m4
+
+Depends-on:
+wchar
+
+configure.ac:
+gl_FUNC_WCSXFRM
+gl_WCHAR_MODULE_INDICATOR([wcsxfrm])
+
+Makefile.am:
+
+Include:
+<wchar.h>
+
+License:
+LGPL
+
+Maintainer:
+Bruno Haible
--- a/tests/test-wchar-c++.cc
+++ b/tests/test-wchar-c++.cc
@@ -163,6 +163,11 @@
                  (const wchar_t *, const wchar_t *));
 #endif
 
+#if GNULIB_TEST_WCSXFRM
+SIGNATURE_CHECK (GNULIB_NAMESPACE::wcsxfrm, size_t,
+                 (wchar_t *, const wchar_t *, size_t));
+#endif
+
 
 int
 main ()