# HG changeset patch # User Bruno Haible # Date 1296961368 -3600 # Node ID 783f910af794dbe547bcafbbc316b8149a0c7938 # Parent c436f87485c4a6d33909e8bbfe404ed733cb4b6b New module 'wcscat'. * modules/wcscat: New file. * lib/wchar.in.h (wcscat): New declaration. * lib/wcscat.c: New file. * lib/wcscat-impl.h: New file, from libutf8 with modifications. * m4/wcscat.m4: New file. * m4/wchar_h.m4 (gl_WCHAR_H): Test whether wcscat is declared. (gl_WCHAR_H_DEFAULTS): Initialize GNULIB_WCSCAT, HAVE_WCSCAT. * modules/wchar (Makefile.am): Substitute GNULIB_WCSCAT, HAVE_WCSCAT. * tests/test-wchar-c++.cc: Test the declaration of wcscat. * doc/posix-functions/wcscat.texi: Mention the new module. diff --git a/ChangeLog b/ChangeLog --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2011-02-05 Bruno Haible + + New module 'wcscat'. + * modules/wcscat: New file. + * lib/wchar.in.h (wcscat): New declaration. + * lib/wcscat.c: New file. + * lib/wcscat-impl.h: New file, from libutf8 with modifications. + * m4/wcscat.m4: New file. + * m4/wchar_h.m4 (gl_WCHAR_H): Test whether wcscat is declared. + (gl_WCHAR_H_DEFAULTS): Initialize GNULIB_WCSCAT, HAVE_WCSCAT. + * modules/wchar (Makefile.am): Substitute GNULIB_WCSCAT, HAVE_WCSCAT. + * tests/test-wchar-c++.cc: Test the declaration of wcscat. + * doc/posix-functions/wcscat.texi: Mention the new module. + 2011-02-05 Bruno Haible New module 'wcpncpy'. diff --git a/doc/posix-functions/wcscat.texi b/doc/posix-functions/wcscat.texi --- a/doc/posix-functions/wcscat.texi +++ b/doc/posix-functions/wcscat.texi @@ -4,18 +4,18 @@ POSIX specification:@* @url{http://www.opengroup.org/onlinepubs/9699919799/functions/wcscat.html} -Gnulib module: --- +Gnulib module: wcscat 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 diff --git a/lib/wchar.in.h b/lib/wchar.in.h --- a/lib/wchar.in.h +++ b/lib/wchar.in.h @@ -618,6 +618,22 @@ #endif +/* Append SRC onto DEST. */ +#if @GNULIB_WCSCAT@ +# if !@HAVE_WCSCAT@ +_GL_FUNCDECL_SYS (wcscat, wchar_t *, (wchar_t *dest, const wchar_t *src)); +# endif +_GL_CXXALIAS_SYS (wcscat, wchar_t *, (wchar_t *dest, const wchar_t *src)); +_GL_CXXALIASWARN (wcscat); +#elif defined GNULIB_POSIXCHECK +# undef wcscat +# if HAVE_RAW_DECL_WCSCAT +_GL_WARN_ON_USE (wcscat, "wcscat is unportable - " + "use gnulib module wcscat for portability"); +# endif +#endif + + #endif /* _GL_WCHAR_H */ #endif /* _GL_WCHAR_H */ #endif diff --git a/lib/wcscat-impl.h b/lib/wcscat-impl.h new file mode 100644 --- /dev/null +++ b/lib/wcscat-impl.h @@ -0,0 +1,26 @@ +/* Concatenate two wide strings. + 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 * +wcscat (wchar_t *dest, const wchar_t *src) +{ + wchar_t *destptr = dest + wcslen (dest); + + for (; (*destptr = *src) != (wchar_t)'\0'; src++, destptr++) + ; + return dest; +} diff --git a/lib/wcscat.c b/lib/wcscat.c new file mode 100644 --- /dev/null +++ b/lib/wcscat.c @@ -0,0 +1,23 @@ +/* Concatenate two wide strings. + 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 "wcscat-impl.h" diff --git a/m4/wchar_h.m4 b/m4/wchar_h.m4 --- 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 wcscpy wcpcpy wcsncpy wcpncpy + wcslen wcsnlen wcscpy wcpcpy wcsncpy wcpncpy wcscat ]) ]) @@ -157,6 +157,7 @@ GNULIB_WCPCPY=0; AC_SUBST([GNULIB_WCPCPY]) GNULIB_WCSNCPY=0; AC_SUBST([GNULIB_WCSNCPY]) GNULIB_WCPNCPY=0; AC_SUBST([GNULIB_WCPNCPY]) + GNULIB_WCSCAT=0; AC_SUBST([GNULIB_WCSCAT]) dnl Assume proper GNU behavior unless another module says otherwise. HAVE_BTOWC=1; AC_SUBST([HAVE_BTOWC]) HAVE_MBSINIT=1; AC_SUBST([HAVE_MBSINIT]) @@ -178,6 +179,7 @@ HAVE_WCPCPY=1; AC_SUBST([HAVE_WCPCPY]) HAVE_WCSNCPY=1; AC_SUBST([HAVE_WCSNCPY]) HAVE_WCPNCPY=1; AC_SUBST([HAVE_WCPNCPY]) + HAVE_WCSCAT=1; AC_SUBST([HAVE_WCSCAT]) 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/wcscat.m4 b/m4/wcscat.m4 new file mode 100644 --- /dev/null +++ b/m4/wcscat.m4 @@ -0,0 +1,15 @@ +# wcscat.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_WCSCAT], +[ + AC_REQUIRE([gl_WCHAR_H_DEFAULTS]) + AC_CHECK_FUNCS_ONCE([wcscat]) + if test $ac_cv_func_wcscat = no; then + HAVE_WCSCAT=0 + AC_LIBOBJ([wcscat]) + fi +]) diff --git a/modules/wchar b/modules/wchar --- a/modules/wchar +++ b/modules/wchar @@ -52,6 +52,7 @@ -e 's|@''GNULIB_WCPCPY''@|$(GNULIB_WCPCPY)|g' \ -e 's|@''GNULIB_WCSNCPY''@|$(GNULIB_WCSNCPY)|g' \ -e 's|@''GNULIB_WCPNCPY''@|$(GNULIB_WCPNCPY)|g' \ + -e 's|@''GNULIB_WCSCAT''@|$(GNULIB_WCSCAT)|g' \ -e 's|@''HAVE_WINT_T''@|$(HAVE_WINT_T)|g' \ -e 's|@''HAVE_BTOWC''@|$(HAVE_BTOWC)|g' \ -e 's|@''HAVE_MBSINIT''@|$(HAVE_MBSINIT)|g' \ @@ -73,6 +74,7 @@ -e 's|@''HAVE_WCPCPY''@|$(HAVE_WCPCPY)|g' \ -e 's|@''HAVE_WCSNCPY''@|$(HAVE_WCSNCPY)|g' \ -e 's|@''HAVE_WCPNCPY''@|$(HAVE_WCPNCPY)|g' \ + -e 's|@''HAVE_WCSCAT''@|$(HAVE_WCSCAT)|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/wcscat b/modules/wcscat new file mode 100644 --- /dev/null +++ b/modules/wcscat @@ -0,0 +1,31 @@ +Description: +wcscat() function: concatenate two wide strings. + +Status: +obsolete + +Notice: +This module is obsolete. + +Files: +lib/wcscat.c +lib/wcscat-impl.h +m4/wcscat.m4 + +Depends-on: +wchar + +configure.ac: +gl_FUNC_WCSCAT +gl_WCHAR_MODULE_INDICATOR([wcscat]) + +Makefile.am: + +Include: + + +License: +LGPL + +Maintainer: +Bruno Haible diff --git a/tests/test-wchar-c++.cc b/tests/test-wchar-c++.cc --- a/tests/test-wchar-c++.cc +++ b/tests/test-wchar-c++.cc @@ -128,6 +128,11 @@ (wchar_t *, const wchar_t *, size_t)); #endif +#if GNULIB_TEST_WCSCAT +SIGNATURE_CHECK (GNULIB_NAMESPACE::wcscat, wchar_t *, + (wchar_t *, const wchar_t *)); +#endif + int main ()