From e4d07a05390c21a9df213e014efeaf6704593879 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 5 Feb 2011 13:28:21 +0100 Subject: [PATCH] New module 'wmemset'. * modules/wmemset: New file. * lib/wchar.in.h (wmemset): New declaration. * lib/wmemset.c: New file. * lib/wmemset-impl.h: New file, from libutf8 with modifications. * m4/wmemset.m4: New file. * m4/wchar_h.m4 (gl_WCHAR_H): Test whether wmemset is declared. (gl_WCHAR_H_DEFAULTS): Initialize GNULIB_WMEMSET, HAVE_WMEMSET. * modules/wchar (Makefile.am): Substitute GNULIB_WMEMSET, HAVE_WMEMSET. * tests/test-wchar-c++.cc: Test the declaration of wmemset. * doc/posix-functions/wmemset.texi: Mention the new module. --- ChangeLog | 14 ++++++++++++++ doc/posix-functions/wmemset.texi | 8 ++++---- lib/wchar.in.h | 16 ++++++++++++++++ lib/wmemset-impl.h | 26 ++++++++++++++++++++++++++ lib/wmemset.c | 23 +++++++++++++++++++++++ m4/wchar_h.m4 | 4 +++- m4/wmemset.m4 | 15 +++++++++++++++ modules/wchar | 2 ++ modules/wmemset | 25 +++++++++++++++++++++++++ tests/test-wchar-c++.cc | 5 +++++ 10 files changed, 133 insertions(+), 5 deletions(-) create mode 100644 lib/wmemset-impl.h create mode 100644 lib/wmemset.c create mode 100644 m4/wmemset.m4 create mode 100644 modules/wmemset diff --git a/ChangeLog b/ChangeLog index b431bb36f..38481a933 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,19 @@ 2011-02-05 Bruno Haible + New module 'wmemset'. + * modules/wmemset: New file. + * lib/wchar.in.h (wmemset): New declaration. + * lib/wmemset.c: New file. + * lib/wmemset-impl.h: New file, from libutf8 with modifications. + * m4/wmemset.m4: New file. + * m4/wchar_h.m4 (gl_WCHAR_H): Test whether wmemset is declared. + (gl_WCHAR_H_DEFAULTS): Initialize GNULIB_WMEMSET, HAVE_WMEMSET. + * modules/wchar (Makefile.am): Substitute GNULIB_WMEMSET, HAVE_WMEMSET. + * tests/test-wchar-c++.cc: Test the declaration of wmemset. + * doc/posix-functions/wmemset.texi: Mention the new module. + +2011-02-05 Bruno Haible + New module 'wmemmove'. * modules/wmemmove: New file. * lib/wchar.in.h (wmemmove): New declaration. diff --git a/doc/posix-functions/wmemset.texi b/doc/posix-functions/wmemset.texi index c2672189b..ac7425dff 100644 --- a/doc/posix-functions/wmemset.texi +++ b/doc/posix-functions/wmemset.texi @@ -4,18 +4,18 @@ POSIX specification:@* @url{http://www.opengroup.org/onlinepubs/9699919799/functions/wmemset.html} -Gnulib module: --- +Gnulib module: wmemset Portability problems fixed by Gnulib: @itemize +@item +This function is missing on some platforms: +HP-UX 11.00, IRIX 6.5, Solaris 2.6, Interix 3.5. @end itemize Portability problems not fixed by Gnulib: @itemize @item -This function is missing on some platforms: -HP-UX 11.00, IRIX 6.5, Solaris 2.6, Interix 3.5. -@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 89031ecf5..a27010a74 100644 --- a/lib/wchar.in.h +++ b/lib/wchar.in.h @@ -501,6 +501,22 @@ _GL_WARN_ON_USE (wmemmove, "wmemmove is unportable - " #endif +/* Set N wide characters of S to C. */ +#if @GNULIB_WMEMSET@ +# if !@HAVE_WMEMSET@ +_GL_FUNCDECL_SYS (wmemset, wchar_t *, (wchar_t *s, wchar_t c, size_t n)); +# endif +_GL_CXXALIAS_SYS (wmemset, wchar_t *, (wchar_t *s, wchar_t c, size_t n)); +_GL_CXXALIASWARN (wmemset); +#elif defined GNULIB_POSIXCHECK +# undef wmemset +# if HAVE_RAW_DECL_WMEMSET +_GL_WARN_ON_USE (wmemset, "wmemset is unportable - " + "use gnulib module wmemset for portability"); +# endif +#endif + + #endif /* _GL_WCHAR_H */ #endif /* _GL_WCHAR_H */ #endif diff --git a/lib/wmemset-impl.h b/lib/wmemset-impl.h new file mode 100644 index 000000000..30b586aa6 --- /dev/null +++ b/lib/wmemset-impl.h @@ -0,0 +1,26 @@ +/* Fill wide character array. + 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 . */ + +wchar_t * +wmemset (wchar_t *s, wchar_t c, size_t n) +{ + wchar_t *ptr = s; + + for (; n > 0; n--) + *ptr++ = c; + return s; +} diff --git a/lib/wmemset.c b/lib/wmemset.c new file mode 100644 index 000000000..15450f592 --- /dev/null +++ b/lib/wmemset.c @@ -0,0 +1,23 @@ +/* Fill wide character array. + 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 "wmemset-impl.h" diff --git a/m4/wchar_h.m4 b/m4/wchar_h.m4 index 591c2fc24..976e92f9b 100644 --- a/m4/wchar_h.m4 +++ b/m4/wchar_h.m4 @@ -50,7 +50,7 @@ AC_DEFUN([gl_WCHAR_H], #include ]], [btowc wctob mbsinit mbrtowc mbrlen mbsrtowcs mbsnrtowcs wcrtomb - wcsrtombs wcsnrtombs wcwidth wmemchr wmemcmp wmemcpy wmemmove + wcsrtombs wcsnrtombs wcwidth wmemchr wmemcmp wmemcpy wmemmove wmemset ]) ]) @@ -149,6 +149,7 @@ AC_DEFUN([gl_WCHAR_H_DEFAULTS], GNULIB_WMEMCMP=0; AC_SUBST([GNULIB_WMEMCMP]) GNULIB_WMEMCPY=0; AC_SUBST([GNULIB_WMEMCPY]) GNULIB_WMEMMOVE=0; AC_SUBST([GNULIB_WMEMMOVE]) + GNULIB_WMEMSET=0; AC_SUBST([GNULIB_WMEMSET]) dnl Assume proper GNU behavior unless another module says otherwise. HAVE_BTOWC=1; AC_SUBST([HAVE_BTOWC]) HAVE_MBSINIT=1; AC_SUBST([HAVE_MBSINIT]) @@ -163,6 +164,7 @@ AC_DEFUN([gl_WCHAR_H_DEFAULTS], HAVE_WMEMCMP=1; AC_SUBST([HAVE_WMEMCMP]) HAVE_WMEMCPY=1; AC_SUBST([HAVE_WMEMCPY]) HAVE_WMEMMOVE=1; AC_SUBST([HAVE_WMEMMOVE]) + HAVE_WMEMSET=1; AC_SUBST([HAVE_WMEMSET]) 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/wmemset.m4 b/m4/wmemset.m4 new file mode 100644 index 000000000..1e960e394 --- /dev/null +++ b/m4/wmemset.m4 @@ -0,0 +1,15 @@ +# wmemset.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_WMEMSET], +[ + AC_REQUIRE([gl_WCHAR_H_DEFAULTS]) + AC_CHECK_FUNCS_ONCE([wmemset]) + if test $ac_cv_func_wmemset = no; then + HAVE_WMEMSET=0 + AC_LIBOBJ([wmemset]) + fi +]) diff --git a/modules/wchar b/modules/wchar index 8789cdf62..ca15ca36e 100644 --- a/modules/wchar +++ b/modules/wchar @@ -45,6 +45,7 @@ wchar.h: wchar.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) -e 's|@''GNULIB_WMEMCMP''@|$(GNULIB_WMEMCMP)|g' \ -e 's|@''GNULIB_WMEMCPY''@|$(GNULIB_WMEMCPY)|g' \ -e 's|@''GNULIB_WMEMMOVE''@|$(GNULIB_WMEMMOVE)|g' \ + -e 's|@''GNULIB_WMEMSET''@|$(GNULIB_WMEMSET)|g' \ -e 's|@''HAVE_WINT_T''@|$(HAVE_WINT_T)|g' \ -e 's|@''HAVE_BTOWC''@|$(HAVE_BTOWC)|g' \ -e 's|@''HAVE_MBSINIT''@|$(HAVE_MBSINIT)|g' \ @@ -59,6 +60,7 @@ wchar.h: wchar.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) -e 's|@''HAVE_WMEMCMP''@|$(HAVE_WMEMCMP)|g' \ -e 's|@''HAVE_WMEMCPY''@|$(HAVE_WMEMCPY)|g' \ -e 's|@''HAVE_WMEMMOVE''@|$(HAVE_WMEMMOVE)|g' \ + -e 's|@''HAVE_WMEMSET''@|$(HAVE_WMEMSET)|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/wmemset b/modules/wmemset new file mode 100644 index 000000000..4a551da28 --- /dev/null +++ b/modules/wmemset @@ -0,0 +1,25 @@ +Description: +wmemset() function: fill wide character array. + +Files: +lib/wmemset.c +lib/wmemset-impl.h +m4/wmemset.m4 + +Depends-on: +wchar + +configure.ac: +gl_FUNC_WMEMSET +gl_WCHAR_MODULE_INDICATOR([wmemset]) + +Makefile.am: + +Include: + + +License: +LGPL + +Maintainer: +Bruno Haible diff --git a/tests/test-wchar-c++.cc b/tests/test-wchar-c++.cc index bdab18a50..b82c3d944 100644 --- a/tests/test-wchar-c++.cc +++ b/tests/test-wchar-c++.cc @@ -95,6 +95,11 @@ SIGNATURE_CHECK (GNULIB_NAMESPACE::wmemmove, wchar_t *, (wchar_t *, const wchar_t *, size_t)); #endif +#if GNULIB_TEST_WMEMSET +SIGNATURE_CHECK (GNULIB_NAMESPACE::wmemset, wchar_t *, + (wchar_t *, wchar_t, size_t)); +#endif + int main () -- 2.11.0