From b9a6d36d0c6fdde73a891e98ad7651f120ef49b0 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 5 Feb 2011 12:25:13 +0100 Subject: [PATCH] New module 'wmemchr'. * modules/wmemchr: New file. * lib/wchar.in.h (wmemchr): New declaration. * lib/wmemchr.c: New file. * lib/wmemchr-impl.h: New file, from libutf8 with modifications. * m4/wmemchr.m4: New file. * m4/wchar_h.m4 (gl_WCHAR_H_DEFAULTS): Initialize GNULIB_WMEMCHR, HAVE_WMEMCHR. * modules/wchar (Makefile.am): Substitute GNULIB_WMEMCHR, HAVE_WMEMCHR. * tests/test-wchar-c++.cc: Test the declaration of wmemchr. * doc/posix-functions/wmemchr.texi: Mention the new module. --- ChangeLog | 14 ++++++++++++++ doc/posix-functions/wmemchr.texi | 8 ++++---- lib/wchar.in.h | 16 ++++++++++++++++ lib/wmemchr-impl.h | 27 +++++++++++++++++++++++++++ lib/wmemchr.c | 23 +++++++++++++++++++++++ m4/wchar_h.m4 | 4 +++- m4/wmemchr.m4 | 10 ++++++++++ modules/wchar | 2 ++ modules/wmemchr | 25 +++++++++++++++++++++++++ tests/test-wchar-c++.cc | 5 +++++ 10 files changed, 129 insertions(+), 5 deletions(-) create mode 100644 lib/wmemchr-impl.h create mode 100644 lib/wmemchr.c create mode 100644 m4/wmemchr.m4 create mode 100644 modules/wmemchr diff --git a/ChangeLog b/ChangeLog index 19eaf5571..082e7c84f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2011-02-05 Bruno Haible + + New module 'wmemchr'. + * modules/wmemchr: New file. + * lib/wchar.in.h (wmemchr): New declaration. + * lib/wmemchr.c: New file. + * lib/wmemchr-impl.h: New file, from libutf8 with modifications. + * m4/wmemchr.m4: New file. + * m4/wchar_h.m4 (gl_WCHAR_H_DEFAULTS): Initialize GNULIB_WMEMCHR, + HAVE_WMEMCHR. + * modules/wchar (Makefile.am): Substitute GNULIB_WMEMCHR, HAVE_WMEMCHR. + * tests/test-wchar-c++.cc: Test the declaration of wmemchr. + * doc/posix-functions/wmemchr.texi: Mention the new module. + 2011-02-04 Eric Blake fdopendir: detect FreeBSD bug diff --git a/doc/posix-functions/wmemchr.texi b/doc/posix-functions/wmemchr.texi index 3e85559d6..ea8ca543a 100644 --- a/doc/posix-functions/wmemchr.texi +++ b/doc/posix-functions/wmemchr.texi @@ -4,18 +4,18 @@ POSIX specification:@* @url{http://www.opengroup.org/onlinepubs/9699919799/functions/wmemchr.html} -Gnulib module: --- +Gnulib module: wmemchr Portability problems fixed by Gnulib: @itemize +@item +This function is missing on some platforms: +HP-UX 11.00, IRIX 6.5, Solaris 2.6, Interix 3.5. @end itemize Portability problems not fixed by Gnulib: @itemize @item -This function is missing on some platforms: -HP-UX 11.00, IRIX 6.5, Solaris 2.6, Interix 3.5. -@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 df413384b..54f439b2d 100644 --- a/lib/wchar.in.h +++ b/lib/wchar.in.h @@ -428,6 +428,22 @@ _GL_WARN_ON_USE (wcwidth, "wcwidth is unportable - " #endif +/* Search N wide characters of S for C. */ +#if @GNULIB_WMEMCHR@ +# if !@HAVE_WMEMCHR@ +_GL_FUNCDECL_SYS (wmemchr, wchar_t *, (const wchar_t *s, wchar_t c, size_t n)); +# endif +_GL_CXXALIAS_SYS (wmemchr, wchar_t *, (const wchar_t *s, wchar_t c, size_t n)); +_GL_CXXALIASWARN (wmemchr); +#elif defined GNULIB_POSIXCHECK +# undef wmemchr +# if HAVE_RAW_DECL_WMEMCHR +_GL_WARN_ON_USE (wmemchr, "wmemchr is unportable - " + "use gnulib module wmemchr for portability"); +# endif +#endif + + #endif /* _GL_WCHAR_H */ #endif /* _GL_WCHAR_H */ #endif diff --git a/lib/wmemchr-impl.h b/lib/wmemchr-impl.h new file mode 100644 index 000000000..92fd7fd83 --- /dev/null +++ b/lib/wmemchr-impl.h @@ -0,0 +1,27 @@ +/* Search wide character array for a wide character. + 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 * +wmemchr (const wchar_t *s, wchar_t c, size_t n) +{ + for (; n > 0; s++, n--) + { + if (*s == c) + return (wchar_t *) s; + } + return NULL; +} diff --git a/lib/wmemchr.c b/lib/wmemchr.c new file mode 100644 index 000000000..53c891c45 --- /dev/null +++ b/lib/wmemchr.c @@ -0,0 +1,23 @@ +/* Search wide character array for a wide character. + 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 "wmemchr-impl.h" diff --git a/m4/wchar_h.m4 b/m4/wchar_h.m4 index e8adf8924..b43756dbc 100644 --- a/m4/wchar_h.m4 +++ b/m4/wchar_h.m4 @@ -7,7 +7,7 @@ dnl with or without modifications, as long as this notice is preserved. dnl Written by Eric Blake. -# wchar_h.m4 serial 37 +# wchar_h.m4 serial 38 AC_DEFUN([gl_WCHAR_H], [ @@ -143,6 +143,7 @@ AC_DEFUN([gl_WCHAR_H_DEFAULTS], GNULIB_WCSRTOMBS=0; AC_SUBST([GNULIB_WCSRTOMBS]) GNULIB_WCSNRTOMBS=0; AC_SUBST([GNULIB_WCSNRTOMBS]) GNULIB_WCWIDTH=0; AC_SUBST([GNULIB_WCWIDTH]) + GNULIB_WMEMCHR=0; AC_SUBST([GNULIB_WMEMCHR]) dnl Assume proper GNU behavior unless another module says otherwise. HAVE_BTOWC=1; AC_SUBST([HAVE_BTOWC]) HAVE_MBSINIT=1; AC_SUBST([HAVE_MBSINIT]) @@ -153,6 +154,7 @@ AC_DEFUN([gl_WCHAR_H_DEFAULTS], HAVE_WCRTOMB=1; AC_SUBST([HAVE_WCRTOMB]) HAVE_WCSRTOMBS=1; AC_SUBST([HAVE_WCSRTOMBS]) HAVE_WCSNRTOMBS=1; AC_SUBST([HAVE_WCSNRTOMBS]) + HAVE_WMEMCHR=1; AC_SUBST([HAVE_WMEMCHR]) 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/wmemchr.m4 b/m4/wmemchr.m4 new file mode 100644 index 000000000..9a52b34f2 --- /dev/null +++ b/m4/wmemchr.m4 @@ -0,0 +1,10 @@ +# wmemchr.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_WMEMCHR], +[ + AC_REPLACE_FUNCS([wmemchr]) +]) diff --git a/modules/wchar b/modules/wchar index f67737d9d..a918ead7e 100644 --- a/modules/wchar +++ b/modules/wchar @@ -41,6 +41,7 @@ wchar.h: wchar.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) -e 's|@''GNULIB_WCSRTOMBS''@|$(GNULIB_WCSRTOMBS)|g' \ -e 's|@''GNULIB_WCSNRTOMBS''@|$(GNULIB_WCSNRTOMBS)|g' \ -e 's|@''GNULIB_WCWIDTH''@|$(GNULIB_WCWIDTH)|g' \ + -e 's|@''GNULIB_WMEMCHR''@|$(GNULIB_WMEMCHR)|g' \ -e 's|@''HAVE_WINT_T''@|$(HAVE_WINT_T)|g' \ -e 's|@''HAVE_BTOWC''@|$(HAVE_BTOWC)|g' \ -e 's|@''HAVE_MBSINIT''@|$(HAVE_MBSINIT)|g' \ @@ -51,6 +52,7 @@ wchar.h: wchar.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) -e 's|@''HAVE_WCRTOMB''@|$(HAVE_WCRTOMB)|g' \ -e 's|@''HAVE_WCSRTOMBS''@|$(HAVE_WCSRTOMBS)|g' \ -e 's|@''HAVE_WCSNRTOMBS''@|$(HAVE_WCSNRTOMBS)|g' \ + -e 's|@''HAVE_WMEMCHR''@|$(HAVE_WMEMCHR)|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/wmemchr b/modules/wmemchr new file mode 100644 index 000000000..e50e62d7f --- /dev/null +++ b/modules/wmemchr @@ -0,0 +1,25 @@ +Description: +wmemchr() function: search wide character array for a wide character. + +Files: +lib/wmemchr.c +lib/wmemchr-impl.h +m4/wmemchr.m4 + +Depends-on: +wchar + +configure.ac: +gl_FUNC_WMEMCHR +gl_WCHAR_MODULE_INDICATOR([wmemchr]) + +Makefile.am: + +Include: + + +License: +LGPL + +Maintainer: +Bruno Haible diff --git a/tests/test-wchar-c++.cc b/tests/test-wchar-c++.cc index 502de296e..31be40257 100644 --- a/tests/test-wchar-c++.cc +++ b/tests/test-wchar-c++.cc @@ -75,6 +75,11 @@ SIGNATURE_CHECK (GNULIB_NAMESPACE::wcsnrtombs, size_t, SIGNATURE_CHECK (GNULIB_NAMESPACE::wcwidth, int, (wchar_t)); #endif +#if GNULIB_TEST_WMEMCHR +SIGNATURE_CHECK (GNULIB_NAMESPACE::wmemchr, wchar_t *, + (const wchar_t *, wchar_t, size_t)); +#endif + int main () -- 2.11.0