>From ebeebe3c464a92ad25c1f0dfbde2e542307075f0 Mon Sep 17 00:00:00 2001
From: Bruno Haible
Date: Sat, 4 Jan 2020 16:02:31 +0100
Subject: [PATCH 3/4] mbsrtoc32s: New module.
* lib/uchar.in.h (mbsrtoc32s): New declaration.
* lib/mbsrtowcs-impl.h: Parameterize: Use macros FUNC, DCHAR_T,
INTERNAL_STATE, MBRTOWC.
* lib/mbsrtowcs.c (FUNC, DCHAR_T, INTERNAL_STATE, MBRTOWC): New macros.
* lib/mbsrtoc32s.c: New file.
* lib/mbsrtoc32s-state.c: New file, based on lib/mbsrtowcs-state.c.
* m4/uchar.m4 (gl_UCHAR_H_DEFAULTS): Initialize GNULIB_MBSRTOC32S.
* modules/uchar (Makefile.am): Substitute GNULIB_MBSRTOC32S.
* modules/mbsrtoc32s: New file.
* tests/test-uchar-c++.cc: Test the signature of mbsrtoc32s.
* doc/posix-functions/mbsrtowcs.texi: Mention the new module.
---
ChangeLog | 15 +++++++++++
doc/posix-functions/mbsrtowcs.texi | 7 +++--
lib/mbsrtoc32s-state.c | 37 ++++++++++++++++++++++++++
lib/mbsrtoc32s.c | 54 ++++++++++++++++++++++++++++++++++++++
lib/mbsrtowcs-impl.h | 10 +++----
lib/mbsrtowcs.c | 4 +++
lib/uchar.in.h | 12 +++++++++
m4/uchar.m4 | 3 ++-
modules/mbsrtoc32s | 36 +++++++++++++++++++++++++
modules/uchar | 1 +
tests/test-uchar-c++.cc | 5 ++++
11 files changed, 176 insertions(+), 8 deletions(-)
create mode 100644 lib/mbsrtoc32s-state.c
create mode 100644 lib/mbsrtoc32s.c
create mode 100644 modules/mbsrtoc32s
diff --git a/ChangeLog b/ChangeLog
index 91bcb3e..08cceb3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,20 @@
2020-01-04 Bruno Haible
+ mbsrtoc32s: New module.
+ * lib/uchar.in.h (mbsrtoc32s): New declaration.
+ * lib/mbsrtowcs-impl.h: Parameterize: Use macros FUNC, DCHAR_T,
+ INTERNAL_STATE, MBRTOWC.
+ * lib/mbsrtowcs.c (FUNC, DCHAR_T, INTERNAL_STATE, MBRTOWC): New macros.
+ * lib/mbsrtoc32s.c: New file.
+ * lib/mbsrtoc32s-state.c: New file, based on lib/mbsrtowcs-state.c.
+ * m4/uchar.m4 (gl_UCHAR_H_DEFAULTS): Initialize GNULIB_MBSRTOC32S.
+ * modules/uchar (Makefile.am): Substitute GNULIB_MBSRTOC32S.
+ * modules/mbsrtoc32s: New file.
+ * tests/test-uchar-c++.cc: Test the signature of mbsrtoc32s.
+ * doc/posix-functions/mbsrtowcs.texi: Mention the new module.
+
+2020-01-04 Bruno Haible
+
mbrtowc, mbrtoc32: Tighten dependendies.
* modules/mbrtowc (Depends-on): Disable hard-locale, mbsinit if
REPLACE_MBSTATE_T is 1.
diff --git a/doc/posix-functions/mbsrtowcs.texi b/doc/posix-functions/mbsrtowcs.texi
index e6e4e5a..03c9983 100644
--- a/doc/posix-functions/mbsrtowcs.texi
+++ b/doc/posix-functions/mbsrtowcs.texi
@@ -22,8 +22,11 @@ mingw.
Portability problems not fixed by Gnulib:
@itemize
@item
-On Windows and 32-bit AIX platforms, @code{wchar_t} is a 16-bit type and therefore cannot
-accommodate all Unicode characters.
+On Windows and 32-bit AIX platforms, @code{wchar_t} is a 16-bit type and
+therefore cannot accommodate all Unicode characters.
+However, the Gnulib function @code{mbsrtoc32s}, provided by Gnulib module
+@code{mbsrtoc32s}, operates on 32-bit wide characters and therefore does not
+have this limitation.
@item
The specification is not clear about whether this function should update the
conversion state when the first argument (the destination pointer) is NULL.
diff --git a/lib/mbsrtoc32s-state.c b/lib/mbsrtoc32s-state.c
new file mode 100644
index 0000000..6e041ef
--- /dev/null
+++ b/lib/mbsrtoc32s-state.c
@@ -0,0 +1,37 @@
+/* Convert string to 32-bit wide string.
+ Copyright (C) 2008-2020 Free Software Foundation, Inc.
+ Written by Bruno Haible , 2020.
+
+ 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
+
+#include
+
+/* Internal state used by the functions mbsrtoc32s() and mbsnrtoc32s(). */
+mbstate_t _gl_mbsrtoc32s_state
+/* The state must initially be in the "initial state"; so, zero-initialize it.
+ On most systems, putting it into BSS is sufficient. Not so on Mac OS X 10.3,
+ see .
+ When it needs an initializer, use 0 or {0} as initializer? 0 only works
+ when mbstate_t is a scalar type (such as when gnulib defines it, or on
+ AIX, IRIX, mingw). {0} works as an initializer in all cases: for a struct
+ or union type, but also for a scalar type (ISO C 99, 6.7.8.(11)). */
+#if defined __ELF__
+ /* On ELF systems, variables in BSS behave well. */
+#else
+ /* Use braces, to be on the safe side. */
+ = { 0 }
+#endif
+ ;
diff --git a/lib/mbsrtoc32s.c b/lib/mbsrtoc32s.c
new file mode 100644
index 0000000..432ffaf
--- /dev/null
+++ b/lib/mbsrtoc32s.c
@@ -0,0 +1,54 @@
+/* Convert string to 32-bit wide string.
+ Copyright (C) 2020 Free Software Foundation, Inc.
+ Written by Bruno Haible , 2020.
+
+ 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
+
+#if _GL_LARGE_CHAR32_T
+
+# include
+# include
+# include
+
+# include "strnlen1.h"
+
+extern mbstate_t _gl_mbsrtoc32s_state;
+
+# define FUNC mbsrtoc32s
+# define DCHAR_T char32_t
+# define INTERNAL_STATE _gl_mbsrtoc32s_state
+# define MBRTOWC mbrtoc32
+# include "mbsrtowcs-impl.h"
+
+#else
+/* char32_t and wchar_t are equivalent. */
+
+# include "verify.h"
+
+verify (sizeof (char32_t) == sizeof (wchar_t));
+
+size_t
+mbsrtoc32s (char32_t *dest, const char **srcp, size_t len, mbstate_t *ps)
+{
+ return mbsrtowcs ((wchar_t *) dest, srcp, len, ps);
+}
+
+#endif
diff --git a/lib/mbsrtowcs-impl.h b/lib/mbsrtowcs-impl.h
index 053417b..06ecec2 100644
--- a/lib/mbsrtowcs-impl.h
+++ b/lib/mbsrtowcs-impl.h
@@ -16,16 +16,16 @@
along with this program. If not, see . */
size_t
-mbsrtowcs (wchar_t *dest, const char **srcp, size_t len, mbstate_t *ps)
+FUNC (DCHAR_T *dest, const char **srcp, size_t len, mbstate_t *ps)
{
if (ps == NULL)
- ps = &_gl_mbsrtowcs_state;
+ ps = &INTERNAL_STATE;
{
const char *src = *srcp;
if (dest != NULL)
{
- wchar_t *destptr = dest;
+ DCHAR_T *destptr = dest;
for (; len > 0; destptr++, len--)
{
@@ -46,7 +46,7 @@ mbsrtowcs (wchar_t *dest, const char **srcp, size_t len, mbstate_t *ps)
src_avail = 4 + strnlen1 (src + 4, MB_LEN_MAX - 4);
/* Parse the next multibyte character. */
- ret = mbrtowc (destptr, src, src_avail, ps);
+ ret = MBRTOWC (destptr, src, src_avail, ps);
if (ret == (size_t)(-2))
/* Encountered a multibyte character that extends past a '\0' byte
@@ -93,7 +93,7 @@ mbsrtowcs (wchar_t *dest, const char **srcp, size_t len, mbstate_t *ps)
src_avail = 4 + strnlen1 (src + 4, MB_LEN_MAX - 4);
/* Parse the next multibyte character. */
- ret = mbrtowc (NULL, src, src_avail, &state);
+ ret = MBRTOWC (NULL, src, src_avail, &state);
if (ret == (size_t)(-2))
/* Encountered a multibyte character that extends past a '\0' byte
diff --git a/lib/mbsrtowcs.c b/lib/mbsrtowcs.c
index 0c164e7..6d1c685 100644
--- a/lib/mbsrtowcs.c
+++ b/lib/mbsrtowcs.c
@@ -29,4 +29,8 @@
extern mbstate_t _gl_mbsrtowcs_state;
+#define FUNC mbsrtowcs
+#define DCHAR_T wchar_t
+#define INTERNAL_STATE _gl_mbsrtowcs_state
+#define MBRTOWC mbrtowc
#include "mbsrtowcs-impl.h"
diff --git a/lib/uchar.in.h b/lib/uchar.in.h
index 5241b2e..318cf8e 100644
--- a/lib/uchar.in.h
+++ b/lib/uchar.in.h
@@ -107,4 +107,16 @@ _GL_WARN_ON_USE (mbrtoc32, "mbrtoc32 is not portable - "
#endif
+/* Convert a string to a 32-bit wide string. */
+#if @GNULIB_MBSRTOC32S@
+_GL_FUNCDECL_SYS (mbsrtoc32s, size_t,
+ (char32_t *dest, const char **srcp, size_t len, mbstate_t *ps)
+ _GL_ARG_NONNULL ((2)));
+_GL_CXXALIAS_SYS (mbsrtoc32s, size_t,
+ (char32_t *dest, const char **srcp, size_t len,
+ mbstate_t *ps));
+_GL_CXXALIASWARN (mbsrtoc32s);
+#endif
+
+
#endif /* _@GUARD_PREFIX@_UCHAR_H */
diff --git a/m4/uchar.m4 b/m4/uchar.m4
index 4aebf5c..e92f5d6 100644
--- a/m4/uchar.m4
+++ b/m4/uchar.m4
@@ -1,4 +1,4 @@
-# uchar.m4 serial 5
+# uchar.m4 serial 6
dnl Copyright (C) 2019-2020 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -50,6 +50,7 @@ AC_DEFUN([gl_UCHAR_H_DEFAULTS],
GNULIB_BTOC32=0; AC_SUBST([GNULIB_BTOC32])
GNULIB_C32TOB=0; AC_SUBST([GNULIB_C32TOB])
GNULIB_MBRTOC32=0; AC_SUBST([GNULIB_MBRTOC32])
+ GNULIB_MBSRTOC32S=0; AC_SUBST([GNULIB_MBSRTOC32S])
dnl Assume proper GNU behavior unless another module says otherwise.
HAVE_MBRTOC32=1; AC_SUBST([HAVE_MBRTOC32])
REPLACE_MBRTOC32=0; AC_SUBST([REPLACE_MBRTOC32])
diff --git a/modules/mbsrtoc32s b/modules/mbsrtoc32s
new file mode 100644
index 0000000..66b578e
--- /dev/null
+++ b/modules/mbsrtoc32s
@@ -0,0 +1,36 @@
+Description:
+mbsrtoc32s() function: convert string to 32-bit wide string.
+
+Files:
+lib/mbsrtoc32s.c
+lib/mbsrtowcs-impl.h
+lib/mbsrtoc32s-state.c
+
+Depends-on:
+uchar
+wchar
+verify
+mbrtoc32 [test $SMALL_WCHAR_T = 1]
+strnlen1 [test $SMALL_WCHAR_T = 1]
+mbsrtowcs [test $SMALL_WCHAR_T = 0]
+
+configure.ac:
+if test $SMALL_WCHAR_T = 1; then
+ AC_LIBOBJ([mbsrtoc32s-state])
+fi
+gl_UCHAR_MODULE_INDICATOR([mbsrtoc32s])
+
+Makefile.am:
+lib_SOURCES += mbsrtoc32s.c
+
+Include:
+
+
+Link:
+$(LIB_MBRTOWC)
+
+License:
+LGPLv2+
+
+Maintainer:
+Bruno Haible
diff --git a/modules/uchar b/modules/uchar
index bd1b4e0..03101c1 100644
--- a/modules/uchar
+++ b/modules/uchar
@@ -31,6 +31,7 @@ uchar.h: uchar.in.h $(top_builddir)/config.status $(CXXDEFS_H)
-e 's/@''GNULIB_BTOC32''@/$(GNULIB_BTOC32)/g' \
-e 's/@''GNULIB_C32TOB''@/$(GNULIB_C32TOB)/g' \
-e 's/@''GNULIB_MBRTOC32''@/$(GNULIB_MBRTOC32)/g' \
+ -e 's/@''GNULIB_MBSRTOC32S''@/$(GNULIB_MBSRTOC32S)/g' \
-e 's|@''HAVE_MBRTOC32''@|$(HAVE_MBRTOC32)|g' \
-e 's|@''REPLACE_MBRTOC32''@|$(REPLACE_MBRTOC32)|g' \
-e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
diff --git a/tests/test-uchar-c++.cc b/tests/test-uchar-c++.cc
index 56a3a25..a7132a1 100644
--- a/tests/test-uchar-c++.cc
+++ b/tests/test-uchar-c++.cc
@@ -37,6 +37,11 @@ SIGNATURE_CHECK (GNULIB_NAMESPACE::mbrtoc32, size_t,
(char32_t *, const char *, size_t, mbstate_t *));
#endif
+#if GNULIB_TEST_MBSRTOC32S
+SIGNATURE_CHECK (GNULIB_NAMESPACE::mbsrtoc32s, size_t,
+ (char32_t *, const char **, size_t, mbstate_t *));
+#endif
+
int
main ()
--
2.7.4