Mercurial > hg > octave-nkf > gnulib-hg
changeset 14283:f6f1da9d12f7
New module 'wcscpy'.
* modules/wcscpy: New file.
* lib/wchar.in.h (wcscpy): New declaration.
* lib/wcscpy.c: New file.
* lib/wcscpy-impl.h: New file, from libutf8 with modifications.
* m4/wcscpy.m4: New file.
* m4/wchar_h.m4 (gl_WCHAR_H): Test whether wcscpy is declared.
(gl_WCHAR_H_DEFAULTS): Initialize GNULIB_WCSCPY, HAVE_WCSCPY.
* modules/wchar (Makefile.am): Substitute GNULIB_WCSCPY, HAVE_WCSCPY.
* tests/test-wchar-c++.cc: Test the declaration of wcscpy.
* doc/posix-functions/wcscpy.texi: Mention the new module.
author | Bruno Haible <bruno@clisp.org> |
---|---|
date | Sat, 05 Feb 2011 14:23:31 +0100 |
parents | 3e1169cfa252 |
children | 252e51b8dd78 |
files | ChangeLog doc/posix-functions/wcscpy.texi lib/wchar.in.h lib/wcscpy-impl.h lib/wcscpy.c m4/wchar_h.m4 m4/wcscpy.m4 modules/wchar modules/wcscpy tests/test-wchar-c++.cc |
diffstat | 10 files changed, 139 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2011-02-05 Bruno Haible <bruno@clisp.org> + + New module 'wcscpy'. + * modules/wcscpy: New file. + * lib/wchar.in.h (wcscpy): New declaration. + * lib/wcscpy.c: New file. + * lib/wcscpy-impl.h: New file, from libutf8 with modifications. + * m4/wcscpy.m4: New file. + * m4/wchar_h.m4 (gl_WCHAR_H): Test whether wcscpy is declared. + (gl_WCHAR_H_DEFAULTS): Initialize GNULIB_WCSCPY, HAVE_WCSCPY. + * modules/wchar (Makefile.am): Substitute GNULIB_WCSCPY, HAVE_WCSCPY. + * tests/test-wchar-c++.cc: Test the declaration of wcscpy. + * doc/posix-functions/wcscpy.texi: Mention the new module. + 2011-02-05 Bruno Haible <bruno@clisp.org> New module 'wcsnlen'.
--- a/doc/posix-functions/wcscpy.texi +++ b/doc/posix-functions/wcscpy.texi @@ -4,18 +4,18 @@ POSIX specification:@* @url{http://www.opengroup.org/onlinepubs/9699919799/functions/wcscpy.html} -Gnulib module: --- +Gnulib module: wcscpy 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
--- a/lib/wchar.in.h +++ b/lib/wchar.in.h @@ -549,6 +549,22 @@ #endif +/* Copy SRC to DEST. */ +#if @GNULIB_WCSCPY@ +# if !@HAVE_WCSCPY@ +_GL_FUNCDECL_SYS (wcscpy, wchar_t *, (wchar_t *dest, const wchar_t *src)); +# endif +_GL_CXXALIAS_SYS (wcscpy, wchar_t *, (wchar_t *dest, const wchar_t *src)); +_GL_CXXALIASWARN (wcscpy); +#elif defined GNULIB_POSIXCHECK +# undef wcscpy +# if HAVE_RAW_DECL_WCSCPY +_GL_WARN_ON_USE (wcscpy, "wcscpy is unportable - " + "use gnulib module wcscpy for portability"); +# endif +#endif + + #endif /* _GL_WCHAR_H */ #endif /* _GL_WCHAR_H */ #endif
new file mode 100644 --- /dev/null +++ b/lib/wcscpy-impl.h @@ -0,0 +1,26 @@ +/* Copy a wide string. + Copyright (C) 1999, 2011 Free Software Foundation, Inc. + Written by Bruno Haible <bruno@clisp.org>, 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 <http://www.gnu.org/licenses/>. */ + +wchar_t * +wcscpy (wchar_t *dest, const wchar_t *src) +{ + wchar_t *destptr = dest; + + for (; (*destptr = *src) != (wchar_t)'\0'; src++, destptr++) + ; + return dest; +}
new file mode 100644 --- /dev/null +++ b/lib/wcscpy.c @@ -0,0 +1,23 @@ +/* Copy a wide string. + 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 "wcscpy-impl.h"
--- a/m4/wchar_h.m4 +++ b/m4/wchar_h.m4 @@ -51,7 +51,7 @@ ]], [btowc wctob mbsinit mbrtowc mbrlen mbsrtowcs mbsnrtowcs wcrtomb wcsrtombs wcsnrtombs wcwidth wmemchr wmemcmp wmemcpy wmemmove wmemset - wcslen wcsnlen + wcslen wcsnlen wcscpy ]) ]) @@ -153,6 +153,7 @@ GNULIB_WMEMSET=0; AC_SUBST([GNULIB_WMEMSET]) GNULIB_WCSLEN=0; AC_SUBST([GNULIB_WCSLEN]) GNULIB_WCSNLEN=0; AC_SUBST([GNULIB_WCSNLEN]) + GNULIB_WCSCPY=0; AC_SUBST([GNULIB_WCSCPY]) dnl Assume proper GNU behavior unless another module says otherwise. HAVE_BTOWC=1; AC_SUBST([HAVE_BTOWC]) HAVE_MBSINIT=1; AC_SUBST([HAVE_MBSINIT]) @@ -170,6 +171,7 @@ HAVE_WMEMSET=1; AC_SUBST([HAVE_WMEMSET]) HAVE_WCSLEN=1; AC_SUBST([HAVE_WCSLEN]) HAVE_WCSNLEN=1; AC_SUBST([HAVE_WCSNLEN]) + HAVE_WCSCPY=1; AC_SUBST([HAVE_WCSCPY]) 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/wcscpy.m4 @@ -0,0 +1,15 @@ +# wcscpy.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_WCSCPY], +[ + AC_REQUIRE([gl_WCHAR_H_DEFAULTS]) + AC_CHECK_FUNCS_ONCE([wcscpy]) + if test $ac_cv_func_wcscpy = no; then + HAVE_WCSCPY=0 + AC_LIBOBJ([wcscpy]) + fi +])
--- a/modules/wchar +++ b/modules/wchar @@ -48,6 +48,7 @@ -e 's|@''GNULIB_WMEMSET''@|$(GNULIB_WMEMSET)|g' \ -e 's|@''GNULIB_WCSLEN''@|$(GNULIB_WCSLEN)|g' \ -e 's|@''GNULIB_WCSNLEN''@|$(GNULIB_WCSNLEN)|g' \ + -e 's|@''GNULIB_WCSCPY''@|$(GNULIB_WCSCPY)|g' \ -e 's|@''HAVE_WINT_T''@|$(HAVE_WINT_T)|g' \ -e 's|@''HAVE_BTOWC''@|$(HAVE_BTOWC)|g' \ -e 's|@''HAVE_MBSINIT''@|$(HAVE_MBSINIT)|g' \ @@ -65,6 +66,7 @@ -e 's|@''HAVE_WMEMSET''@|$(HAVE_WMEMSET)|g' \ -e 's|@''HAVE_WCSLEN''@|$(HAVE_WCSLEN)|g' \ -e 's|@''HAVE_WCSNLEN''@|$(HAVE_WCSNLEN)|g' \ + -e 's|@''HAVE_WCSCPY''@|$(HAVE_WCSCPY)|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/wcscpy @@ -0,0 +1,31 @@ +Description: +wcscpy() function: copy a wide string. + +Status: +obsolete + +Notice: +This module is obsolete. + +Files: +lib/wcscpy.c +lib/wcscpy-impl.h +m4/wcscpy.m4 + +Depends-on: +wchar + +configure.ac: +gl_FUNC_WCSCPY +gl_WCHAR_MODULE_INDICATOR([wcscpy]) + +Makefile.am: + +Include: +<wchar.h> + +License: +LGPL + +Maintainer: +Bruno Haible
--- a/tests/test-wchar-c++.cc +++ b/tests/test-wchar-c++.cc @@ -108,6 +108,11 @@ SIGNATURE_CHECK (GNULIB_NAMESPACE::wcsnlen, size_t, (const wchar_t *, size_t)); #endif +#if GNULIB_TEST_WCSCPY +SIGNATURE_CHECK (GNULIB_NAMESPACE::wcscpy, wchar_t *, + (wchar_t *, const wchar_t *)); +#endif + int main ()