From 023cc5f089abb144d32c9b28f92366d04f06423d Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 5 Feb 2011 13:36:58 +0100 Subject: [PATCH] New module 'wcslen'. * modules/wcslen: New file. * lib/wchar.in.h (wcslen): New declaration. * lib/wcslen.c: New file. * lib/wcslen-impl.h: New file, from libutf8 with modifications. * m4/wcslen.m4: New file. * m4/wchar_h.m4 (gl_WCHAR_H): Test whether wcslen is declared. (gl_WCHAR_H_DEFAULTS): Initialize GNULIB_WCSLEN, HAVE_WCSLEN. * modules/wchar (Makefile.am): Substitute GNULIB_WCSLEN, HAVE_WCSLEN. * tests/test-wchar-c++.cc: Test the declaration of wcslen. * doc/posix-functions/wcslen.texi: Mention the new module. --- ChangeLog | 14 ++++++++++++++ doc/posix-functions/wcslen.texi | 8 ++++---- lib/wchar.in.h | 16 ++++++++++++++++ lib/wcslen-impl.h | 26 ++++++++++++++++++++++++++ lib/wcslen.c | 23 +++++++++++++++++++++++ m4/wchar_h.m4 | 3 +++ m4/wcslen.m4 | 15 +++++++++++++++ modules/wchar | 2 ++ modules/wcslen | 31 +++++++++++++++++++++++++++++++ tests/test-wchar-c++.cc | 4 ++++ 10 files changed, 138 insertions(+), 4 deletions(-) create mode 100644 lib/wcslen-impl.h create mode 100644 lib/wcslen.c create mode 100644 m4/wcslen.m4 create mode 100644 modules/wcslen diff --git a/ChangeLog b/ChangeLog index 38481a933..eebec871d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,19 @@ 2011-02-05 Bruno Haible + New module 'wcslen'. + * modules/wcslen: New file. + * lib/wchar.in.h (wcslen): New declaration. + * lib/wcslen.c: New file. + * lib/wcslen-impl.h: New file, from libutf8 with modifications. + * m4/wcslen.m4: New file. + * m4/wchar_h.m4 (gl_WCHAR_H): Test whether wcslen is declared. + (gl_WCHAR_H_DEFAULTS): Initialize GNULIB_WCSLEN, HAVE_WCSLEN. + * modules/wchar (Makefile.am): Substitute GNULIB_WCSLEN, HAVE_WCSLEN. + * tests/test-wchar-c++.cc: Test the declaration of wcslen. + * doc/posix-functions/wcslen.texi: Mention the new module. + +2011-02-05 Bruno Haible + New module 'wmemset'. * modules/wmemset: New file. * lib/wchar.in.h (wmemset): New declaration. diff --git a/doc/posix-functions/wcslen.texi b/doc/posix-functions/wcslen.texi index ece572251..00999118c 100644 --- a/doc/posix-functions/wcslen.texi +++ b/doc/posix-functions/wcslen.texi @@ -4,18 +4,18 @@ POSIX specification:@* @url{http://www.opengroup.org/onlinepubs/9699919799/functions/wcslen.html} -Gnulib module: --- +Gnulib module: wcslen 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 index a27010a74..d370fe458 100644 --- a/lib/wchar.in.h +++ b/lib/wchar.in.h @@ -517,6 +517,22 @@ _GL_WARN_ON_USE (wmemset, "wmemset is unportable - " #endif +/* Return the number of wide characters in S. */ +#if @GNULIB_WCSLEN@ +# if !@HAVE_WCSLEN@ +_GL_FUNCDECL_SYS (wcslen, size_t, (const wchar_t *s)); +# endif +_GL_CXXALIAS_SYS (wcslen, size_t, (const wchar_t *s)); +_GL_CXXALIASWARN (wcslen); +#elif defined GNULIB_POSIXCHECK +# undef wcslen +# if HAVE_RAW_DECL_WCSLEN +_GL_WARN_ON_USE (wcslen, "wcslen is unportable - " + "use gnulib module wcslen for portability"); +# endif +#endif + + #endif /* _GL_WCHAR_H */ #endif /* _GL_WCHAR_H */ #endif diff --git a/lib/wcslen-impl.h b/lib/wcslen-impl.h new file mode 100644 index 000000000..6dbe92770 --- /dev/null +++ b/lib/wcslen-impl.h @@ -0,0 +1,26 @@ +/* Determine the length of 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 . */ + +size_t +wcslen (const wchar_t *s) +{ + const wchar_t *ptr; + + for (ptr = s; *ptr != (wchar_t)'\0'; ptr++) + ; + return ptr - s; +} diff --git a/lib/wcslen.c b/lib/wcslen.c new file mode 100644 index 000000000..23132dd0c --- /dev/null +++ b/lib/wcslen.c @@ -0,0 +1,23 @@ +/* Determine the length of 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 "wcslen-impl.h" diff --git a/m4/wchar_h.m4 b/m4/wchar_h.m4 index 976e92f9b..c310fd8c5 100644 --- a/m4/wchar_h.m4 +++ b/m4/wchar_h.m4 @@ -51,6 +51,7 @@ AC_DEFUN([gl_WCHAR_H], ]], [btowc wctob mbsinit mbrtowc mbrlen mbsrtowcs mbsnrtowcs wcrtomb wcsrtombs wcsnrtombs wcwidth wmemchr wmemcmp wmemcpy wmemmove wmemset + wcslen ]) ]) @@ -150,6 +151,7 @@ AC_DEFUN([gl_WCHAR_H_DEFAULTS], GNULIB_WMEMCPY=0; AC_SUBST([GNULIB_WMEMCPY]) GNULIB_WMEMMOVE=0; AC_SUBST([GNULIB_WMEMMOVE]) GNULIB_WMEMSET=0; AC_SUBST([GNULIB_WMEMSET]) + GNULIB_WCSLEN=0; AC_SUBST([GNULIB_WCSLEN]) dnl Assume proper GNU behavior unless another module says otherwise. HAVE_BTOWC=1; AC_SUBST([HAVE_BTOWC]) HAVE_MBSINIT=1; AC_SUBST([HAVE_MBSINIT]) @@ -165,6 +167,7 @@ AC_DEFUN([gl_WCHAR_H_DEFAULTS], HAVE_WMEMCPY=1; AC_SUBST([HAVE_WMEMCPY]) HAVE_WMEMMOVE=1; AC_SUBST([HAVE_WMEMMOVE]) HAVE_WMEMSET=1; AC_SUBST([HAVE_WMEMSET]) + HAVE_WCSLEN=1; AC_SUBST([HAVE_WCSLEN]) 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/wcslen.m4 b/m4/wcslen.m4 new file mode 100644 index 000000000..1f74aaf44 --- /dev/null +++ b/m4/wcslen.m4 @@ -0,0 +1,15 @@ +# wcslen.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_WCSLEN], +[ + AC_REQUIRE([gl_WCHAR_H_DEFAULTS]) + AC_CHECK_FUNCS_ONCE([wcslen]) + if test $ac_cv_func_wcslen = no; then + HAVE_WCSLEN=0 + AC_LIBOBJ([wcslen]) + fi +]) diff --git a/modules/wchar b/modules/wchar index ca15ca36e..29055a09d 100644 --- a/modules/wchar +++ b/modules/wchar @@ -46,6 +46,7 @@ wchar.h: wchar.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) -e 's|@''GNULIB_WMEMCPY''@|$(GNULIB_WMEMCPY)|g' \ -e 's|@''GNULIB_WMEMMOVE''@|$(GNULIB_WMEMMOVE)|g' \ -e 's|@''GNULIB_WMEMSET''@|$(GNULIB_WMEMSET)|g' \ + -e 's|@''GNULIB_WCSLEN''@|$(GNULIB_WCSLEN)|g' \ -e 's|@''HAVE_WINT_T''@|$(HAVE_WINT_T)|g' \ -e 's|@''HAVE_BTOWC''@|$(HAVE_BTOWC)|g' \ -e 's|@''HAVE_MBSINIT''@|$(HAVE_MBSINIT)|g' \ @@ -61,6 +62,7 @@ wchar.h: wchar.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) -e 's|@''HAVE_WMEMCPY''@|$(HAVE_WMEMCPY)|g' \ -e 's|@''HAVE_WMEMMOVE''@|$(HAVE_WMEMMOVE)|g' \ -e 's|@''HAVE_WMEMSET''@|$(HAVE_WMEMSET)|g' \ + -e 's|@''HAVE_WCSLEN''@|$(HAVE_WCSLEN)|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/wcslen b/modules/wcslen new file mode 100644 index 000000000..2dc00a621 --- /dev/null +++ b/modules/wcslen @@ -0,0 +1,31 @@ +Description: +wcslen() function: determine the length of a wide string. + +Status: +obsolete + +Notice: +This module is obsolete. + +Files: +lib/wcslen.c +lib/wcslen-impl.h +m4/wcslen.m4 + +Depends-on: +wchar + +configure.ac: +gl_FUNC_WCSLEN +gl_WCHAR_MODULE_INDICATOR([wcslen]) + +Makefile.am: + +Include: + + +License: +LGPL + +Maintainer: +Bruno Haible diff --git a/tests/test-wchar-c++.cc b/tests/test-wchar-c++.cc index b82c3d944..e12fe9cd6 100644 --- a/tests/test-wchar-c++.cc +++ b/tests/test-wchar-c++.cc @@ -100,6 +100,10 @@ SIGNATURE_CHECK (GNULIB_NAMESPACE::wmemset, wchar_t *, (wchar_t *, wchar_t, size_t)); #endif +#if GNULIB_TEST_WCSLEN +SIGNATURE_CHECK (GNULIB_NAMESPACE::wcslen, size_t, (const wchar_t *)); +#endif + int main () -- 2.11.0