Mercurial > hg > octave-lyh > gnulib-hg
changeset 14288:75ffd7ebdec7
New module 'wcsncat'.
* modules/wcsncat: New file.
* lib/wchar.in.h (wcsncat): New declaration.
* lib/wcsncat.c: New file.
* lib/wcsncat-impl.h: New file, from libutf8 with modifications.
* m4/wcsncat.m4: New file.
* m4/wchar_h.m4 (gl_WCHAR_H): Test whether wcsncat is declared.
(gl_WCHAR_H_DEFAULTS): Initialize GNULIB_WCSNCAT, HAVE_WCSNCAT.
* modules/wchar (Makefile.am): Substitute GNULIB_WCSNCAT, HAVE_WCSNCAT.
* tests/test-wchar-c++.cc: Test the declaration of wcsncat.
* doc/posix-functions/wcsncat.texi: Mention the new module.
author | Bruno Haible <bruno@clisp.org> |
---|---|
date | Sun, 06 Feb 2011 04:09:52 +0100 |
parents | 783f910af794 |
children | b5843d4d8441 |
files | ChangeLog doc/posix-functions/wcsncat.texi lib/wchar.in.h lib/wcsncat-impl.h lib/wcsncat.c m4/wchar_h.m4 m4/wcsncat.m4 modules/wchar modules/wcsncat tests/test-wchar-c++.cc |
diffstat | 10 files changed, 143 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 'wcsncat'. + * modules/wcsncat: New file. + * lib/wchar.in.h (wcsncat): New declaration. + * lib/wcsncat.c: New file. + * lib/wcsncat-impl.h: New file, from libutf8 with modifications. + * m4/wcsncat.m4: New file. + * m4/wchar_h.m4 (gl_WCHAR_H): Test whether wcsncat is declared. + (gl_WCHAR_H_DEFAULTS): Initialize GNULIB_WCSNCAT, HAVE_WCSNCAT. + * modules/wchar (Makefile.am): Substitute GNULIB_WCSNCAT, HAVE_WCSNCAT. + * tests/test-wchar-c++.cc: Test the declaration of wcsncat. + * doc/posix-functions/wcsncat.texi: Mention the new module. + 2011-02-05 Bruno Haible <bruno@clisp.org> New module 'wcscat'.
--- a/doc/posix-functions/wcsncat.texi +++ b/doc/posix-functions/wcsncat.texi @@ -4,18 +4,18 @@ POSIX specification:@* @url{http://www.opengroup.org/onlinepubs/9699919799/functions/wcsncat.html} -Gnulib module: --- +Gnulib module: wcsncat 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 @@ -634,6 +634,24 @@ #endif +/* Append no more than N wide characters of SRC onto DEST. */ +#if @GNULIB_WCSNCAT@ +# if !@HAVE_WCSNCAT@ +_GL_FUNCDECL_SYS (wcsncat, wchar_t *, + (wchar_t *dest, const wchar_t *src, size_t n)); +# endif +_GL_CXXALIAS_SYS (wcsncat, wchar_t *, + (wchar_t *dest, const wchar_t *src, size_t n)); +_GL_CXXALIASWARN (wcsncat); +#elif defined GNULIB_POSIXCHECK +# undef wcsncat +# if HAVE_RAW_DECL_WCSNCAT +_GL_WARN_ON_USE (wcsncat, "wcsncat is unportable - " + "use gnulib module wcsncat for portability"); +# endif +#endif + + #endif /* _GL_WCHAR_H */ #endif /* _GL_WCHAR_H */ #endif
new file mode 100644 --- /dev/null +++ b/lib/wcsncat-impl.h @@ -0,0 +1,28 @@ +/* Append part of a wide string to 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 * +wcsncat (wchar_t *dest, const wchar_t *src, size_t n) +{ + wchar_t *destptr = dest + wcslen (dest); + + for (; n > 0 && (*destptr = *src) != (wchar_t)'\0'; src++, destptr++, n--) + ; + if (n == 0) + *destptr = (wchar_t)'\0'; + return dest; +}
new file mode 100644 --- /dev/null +++ b/lib/wcsncat.c @@ -0,0 +1,23 @@ +/* Append part of a wide string to 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 "wcsncat-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 wcscpy wcpcpy wcsncpy wcpncpy wcscat + wcslen wcsnlen wcscpy wcpcpy wcsncpy wcpncpy wcscat wcsncat ]) ]) @@ -158,6 +158,7 @@ GNULIB_WCSNCPY=0; AC_SUBST([GNULIB_WCSNCPY]) GNULIB_WCPNCPY=0; AC_SUBST([GNULIB_WCPNCPY]) GNULIB_WCSCAT=0; AC_SUBST([GNULIB_WCSCAT]) + GNULIB_WCSNCAT=0; AC_SUBST([GNULIB_WCSNCAT]) dnl Assume proper GNU behavior unless another module says otherwise. HAVE_BTOWC=1; AC_SUBST([HAVE_BTOWC]) HAVE_MBSINIT=1; AC_SUBST([HAVE_MBSINIT]) @@ -180,6 +181,7 @@ HAVE_WCSNCPY=1; AC_SUBST([HAVE_WCSNCPY]) HAVE_WCPNCPY=1; AC_SUBST([HAVE_WCPNCPY]) HAVE_WCSCAT=1; AC_SUBST([HAVE_WCSCAT]) + HAVE_WCSNCAT=1; AC_SUBST([HAVE_WCSNCAT]) 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/wcsncat.m4 @@ -0,0 +1,15 @@ +# wcsncat.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_WCSNCAT], +[ + AC_REQUIRE([gl_WCHAR_H_DEFAULTS]) + AC_CHECK_FUNCS_ONCE([wcsncat]) + if test $ac_cv_func_wcsncat = no; then + HAVE_WCSNCAT=0 + AC_LIBOBJ([wcsncat]) + fi +])
--- a/modules/wchar +++ b/modules/wchar @@ -53,6 +53,7 @@ -e 's|@''GNULIB_WCSNCPY''@|$(GNULIB_WCSNCPY)|g' \ -e 's|@''GNULIB_WCPNCPY''@|$(GNULIB_WCPNCPY)|g' \ -e 's|@''GNULIB_WCSCAT''@|$(GNULIB_WCSCAT)|g' \ + -e 's|@''GNULIB_WCSNCAT''@|$(GNULIB_WCSNCAT)|g' \ -e 's|@''HAVE_WINT_T''@|$(HAVE_WINT_T)|g' \ -e 's|@''HAVE_BTOWC''@|$(HAVE_BTOWC)|g' \ -e 's|@''HAVE_MBSINIT''@|$(HAVE_MBSINIT)|g' \ @@ -75,6 +76,7 @@ -e 's|@''HAVE_WCSNCPY''@|$(HAVE_WCSNCPY)|g' \ -e 's|@''HAVE_WCPNCPY''@|$(HAVE_WCPNCPY)|g' \ -e 's|@''HAVE_WCSCAT''@|$(HAVE_WCSCAT)|g' \ + -e 's|@''HAVE_WCSNCAT''@|$(HAVE_WCSNCAT)|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/wcsncat @@ -0,0 +1,31 @@ +Description: +wcsncat() function: append part of a wide string to a wide string. + +Status: +obsolete + +Notice: +This module is obsolete. + +Files: +lib/wcsncat.c +lib/wcsncat-impl.h +m4/wcsncat.m4 + +Depends-on: +wchar + +configure.ac: +gl_FUNC_WCSNCAT +gl_WCHAR_MODULE_INDICATOR([wcsncat]) + +Makefile.am: + +Include: +<wchar.h> + +License: +LGPL + +Maintainer: +Bruno Haible