From 83527ac1b14a16ad2254b81ced7457fbaa791550 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 5 Feb 2011 15:15:14 +0100 Subject: [PATCH] New module 'wcpcpy'. * modules/wcpcpy: New file. * lib/wchar.in.h (wcpcpy): New declaration. * lib/wcpcpy.c: New file. * lib/wcpcpy-impl.h: New file, from libutf8 with modifications. * m4/wcpcpy.m4: New file. * m4/wchar_h.m4 (gl_WCHAR_H): Test whether wcpcpy is declared. (gl_WCHAR_H_DEFAULTS): Initialize GNULIB_WCPCPY, HAVE_WCPCPY. * modules/wchar (Makefile.am): Substitute GNULIB_WCPCPY, HAVE_WCPCPY. * tests/test-wchar-c++.cc: Test the declaration of wcpcpy. * doc/posix-functions/wcpcpy.texi: Mention the new module. --- ChangeLog | 14 ++++++++++++++ doc/posix-functions/wcpcpy.texi | 10 +++++----- lib/wchar.in.h | 16 ++++++++++++++++ lib/wcpcpy-impl.h | 24 ++++++++++++++++++++++++ lib/wcpcpy.c | 23 +++++++++++++++++++++++ m4/wchar_h.m4 | 4 +++- m4/wcpcpy.m4 | 15 +++++++++++++++ modules/wchar | 2 ++ modules/wcpcpy | 31 +++++++++++++++++++++++++++++++ tests/test-wchar-c++.cc | 5 +++++ 10 files changed, 138 insertions(+), 6 deletions(-) create mode 100644 lib/wcpcpy-impl.h create mode 100644 lib/wcpcpy.c create mode 100644 m4/wcpcpy.m4 create mode 100644 modules/wcpcpy diff --git a/ChangeLog b/ChangeLog index 26dc9eef9..d1b8b0b7e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,19 @@ 2011-02-05 Bruno Haible + New module 'wcpcpy'. + * modules/wcpcpy: New file. + * lib/wchar.in.h (wcpcpy): New declaration. + * lib/wcpcpy.c: New file. + * lib/wcpcpy-impl.h: New file, from libutf8 with modifications. + * m4/wcpcpy.m4: New file. + * m4/wchar_h.m4 (gl_WCHAR_H): Test whether wcpcpy is declared. + (gl_WCHAR_H_DEFAULTS): Initialize GNULIB_WCPCPY, HAVE_WCPCPY. + * modules/wchar (Makefile.am): Substitute GNULIB_WCPCPY, HAVE_WCPCPY. + * tests/test-wchar-c++.cc: Test the declaration of wcpcpy. + * doc/posix-functions/wcpcpy.texi: Mention the new module. + +2011-02-05 Bruno Haible + New module 'wcscpy'. * modules/wcscpy: New file. * lib/wchar.in.h (wcscpy): New declaration. diff --git a/doc/posix-functions/wcpcpy.texi b/doc/posix-functions/wcpcpy.texi index 97a21b3b9..30b59befc 100644 --- a/doc/posix-functions/wcpcpy.texi +++ b/doc/posix-functions/wcpcpy.texi @@ -4,19 +4,19 @@ POSIX specification:@* @url{http://www.opengroup.org/onlinepubs/9699919799/functions/wcpcpy.html} -Gnulib module: --- +Gnulib module: wcpcpy Portability problems fixed by Gnulib: @itemize +@item +This function is missing on some platforms: +MacOS X 10.5, FreeBSD 6.0, NetBSD 5.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, Interix 3.5, BeOS. @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 5.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, Interix 3.5, BeOS. -@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 be088ed3c..828d35f73 100644 --- a/lib/wchar.in.h +++ b/lib/wchar.in.h @@ -565,6 +565,22 @@ _GL_WARN_ON_USE (wcscpy, "wcscpy is unportable - " #endif +/* Copy SRC to DEST, returning the address of the terminating L'\0' in DEST. */ +#if @GNULIB_WCPCPY@ +# if !@HAVE_WCPCPY@ +_GL_FUNCDECL_SYS (wcpcpy, wchar_t *, (wchar_t *dest, const wchar_t *src)); +# endif +_GL_CXXALIAS_SYS (wcpcpy, wchar_t *, (wchar_t *dest, const wchar_t *src)); +_GL_CXXALIASWARN (wcpcpy); +#elif defined GNULIB_POSIXCHECK +# undef wcpcpy +# if HAVE_RAW_DECL_WCPCPY +_GL_WARN_ON_USE (wcpcpy, "wcpcpy is unportable - " + "use gnulib module wcpcpy for portability"); +# endif +#endif + + #endif /* _GL_WCHAR_H */ #endif /* _GL_WCHAR_H */ #endif diff --git a/lib/wcpcpy-impl.h b/lib/wcpcpy-impl.h new file mode 100644 index 000000000..f7f0f7dfd --- /dev/null +++ b/lib/wcpcpy-impl.h @@ -0,0 +1,24 @@ +/* Copy a wide string. + 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 * +wcpcpy (wchar_t *dest, const wchar_t *src) +{ + for (; (*dest = *src) != (wchar_t)'\0'; src++, dest++) + ; + return dest; +} diff --git a/lib/wcpcpy.c b/lib/wcpcpy.c new file mode 100644 index 000000000..fdc29fcb7 --- /dev/null +++ b/lib/wcpcpy.c @@ -0,0 +1,23 @@ +/* Copy a wide string. + 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 "wcpcpy-impl.h" diff --git a/m4/wchar_h.m4 b/m4/wchar_h.m4 index 55b3bf69b..a304d5068 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 + wcslen wcsnlen wcscpy wcpcpy ]) ]) @@ -154,6 +154,7 @@ AC_DEFUN([gl_WCHAR_H_DEFAULTS], GNULIB_WCSLEN=0; AC_SUBST([GNULIB_WCSLEN]) GNULIB_WCSNLEN=0; AC_SUBST([GNULIB_WCSNLEN]) GNULIB_WCSCPY=0; AC_SUBST([GNULIB_WCSCPY]) + GNULIB_WCPCPY=0; AC_SUBST([GNULIB_WCPCPY]) dnl Assume proper GNU behavior unless another module says otherwise. HAVE_BTOWC=1; AC_SUBST([HAVE_BTOWC]) HAVE_MBSINIT=1; AC_SUBST([HAVE_MBSINIT]) @@ -172,6 +173,7 @@ AC_DEFUN([gl_WCHAR_H_DEFAULTS], HAVE_WCSLEN=1; AC_SUBST([HAVE_WCSLEN]) HAVE_WCSNLEN=1; AC_SUBST([HAVE_WCSNLEN]) HAVE_WCSCPY=1; AC_SUBST([HAVE_WCSCPY]) + HAVE_WCPCPY=1; AC_SUBST([HAVE_WCPCPY]) 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/wcpcpy.m4 b/m4/wcpcpy.m4 new file mode 100644 index 000000000..5ffe1a12e --- /dev/null +++ b/m4/wcpcpy.m4 @@ -0,0 +1,15 @@ +# wcpcpy.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_WCPCPY], +[ + AC_REQUIRE([gl_WCHAR_H_DEFAULTS]) + AC_CHECK_FUNCS_ONCE([wcpcpy]) + if test $ac_cv_func_wcpcpy = no; then + HAVE_WCPCPY=0 + AC_LIBOBJ([wcpcpy]) + fi +]) diff --git a/modules/wchar b/modules/wchar index 6ab871a4a..d14d1fce8 100644 --- a/modules/wchar +++ b/modules/wchar @@ -49,6 +49,7 @@ wchar.h: wchar.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) -e 's|@''GNULIB_WCSLEN''@|$(GNULIB_WCSLEN)|g' \ -e 's|@''GNULIB_WCSNLEN''@|$(GNULIB_WCSNLEN)|g' \ -e 's|@''GNULIB_WCSCPY''@|$(GNULIB_WCSCPY)|g' \ + -e 's|@''GNULIB_WCPCPY''@|$(GNULIB_WCPCPY)|g' \ -e 's|@''HAVE_WINT_T''@|$(HAVE_WINT_T)|g' \ -e 's|@''HAVE_BTOWC''@|$(HAVE_BTOWC)|g' \ -e 's|@''HAVE_MBSINIT''@|$(HAVE_MBSINIT)|g' \ @@ -67,6 +68,7 @@ wchar.h: wchar.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) -e 's|@''HAVE_WCSLEN''@|$(HAVE_WCSLEN)|g' \ -e 's|@''HAVE_WCSNLEN''@|$(HAVE_WCSNLEN)|g' \ -e 's|@''HAVE_WCSCPY''@|$(HAVE_WCSCPY)|g' \ + -e 's|@''HAVE_WCPCPY''@|$(HAVE_WCPCPY)|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/wcpcpy b/modules/wcpcpy new file mode 100644 index 000000000..50ec8c316 --- /dev/null +++ b/modules/wcpcpy @@ -0,0 +1,31 @@ +Description: +wcpcpy() function: copy a wide string. + +Status: +obsolete + +Notice: +This module is obsolete. + +Files: +lib/wcpcpy.c +lib/wcpcpy-impl.h +m4/wcpcpy.m4 + +Depends-on: +wchar + +configure.ac: +gl_FUNC_WCPCPY +gl_WCHAR_MODULE_INDICATOR([wcpcpy]) + +Makefile.am: + +Include: + + +License: +LGPL + +Maintainer: +Bruno Haible diff --git a/tests/test-wchar-c++.cc b/tests/test-wchar-c++.cc index 35032b5d1..89bb5e590 100644 --- a/tests/test-wchar-c++.cc +++ b/tests/test-wchar-c++.cc @@ -113,6 +113,11 @@ SIGNATURE_CHECK (GNULIB_NAMESPACE::wcscpy, wchar_t *, (wchar_t *, const wchar_t *)); #endif +#if GNULIB_TEST_WCPCPY +SIGNATURE_CHECK (GNULIB_NAMESPACE::wcpcpy, wchar_t *, + (wchar_t *, const wchar_t *)); +#endif + int main () -- 2.11.0