New module 'mbspbrk'.

diff --git a/ChangeLog b/ChangeLog
index 1da2d79c7e7bba61fe0df56fe53fa6ea66705ff5..f9e08697391f76f03829deee54ce4521cb3c6d3f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2007-02-04  Bruno Haible  <bruno@clisp.org>
+
+       New module mbspbrk.
+       * modules/mbspbrk: New file.
+       * lib/mbspbrk.c: New file.
+       * lib/string_.h (strpbrk): Add a conditional link warning.
+       (mbspbrk): New declaration.
+       * m4/mbspbrk.m4: New file.
+       * m4/string_h.m4 (gl_STRING_MODULE_INDICATOR_DEFAULTS): Initialize
+       GNULIB_MBSPBRK.
+       * modules/string (string.h): Also substitute GNULIB_MBSPBRK.
+       * MODULES.html.sh (Internationalization functions): Add mbspbrk.
+
 2007-02-04  Bruno Haible  <bruno@clisp.org>
 
        New module mbscspn.

diff --git a/MODULES.html.sh b/MODULES.html.sh
index 5cf44b97e4bf0b28afbde995bb049ca1eccf935b..ca14d60588a76427e8f123981fd2088333913bf8 100755 (executable)
--- a/MODULES.html.sh
+++ b/MODULES.html.sh
@@ -2166,6 +2166,7 @@ func_all_modules ()
   func_module mbscasecmp
   func_module mbscasestr
   func_module mbscspn
+  func_module mbspbrk
   func_module mbswidth
   func_module memcasecmp
   func_module memcoll

diff --git a/lib/mbspbrk.c b/lib/mbspbrk.c
new file mode 100644 (file)
index 0000000..cc73186
--- /dev/null
+++ b/lib/mbspbrk.c
@@ -0,0 +1,68 @@
+/* Searching a string for a character among a given set of characters.
+   Copyright (C) 1999, 2002, 2006-2007 Free Software Foundation, Inc.
+   Written by Bruno Haible <bruno@clisp.org>, 2007.
+
+   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 2, 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, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+#include <config.h>
+
+/* Specification.  */
+#include <string.h>
+
+#if HAVE_MBRTOWC
+# include "mbuiter.h"
+#endif
+
+/* Find the first occurrence in the character string STRING of any character
+   in the character string ACCEPT.  Return the pointer to it, or NULL if none
+   exists.  */
+char *
+mbspbrk (const char *string, const char *accept)
+{
+  /* Optimize two cases.  */
+  if (accept[0] == '\0')
+    return NULL;
+  if (accept[1] == '\0')
+    return mbschr (string, accept[0]);
+  /* General case.  */
+#if HAVE_MBRTOWC
+  if (MB_CUR_MAX > 1)
+    {
+      mbui_iterator_t iter;
+
+      for (mbui_init (iter, string); mbui_avail (iter); mbui_advance (iter))
+       {
+         if (mb_len (mbui_cur (iter)) == 1)
+           {
+             if (mbschr (accept, (unsigned char) * mbui_cur_ptr (iter)))
+               return (char *) mbui_cur_ptr (iter);
+           }
+         else
+           {
+             mbui_iterator_t aiter;
+
+             for (mbui_init (aiter, accept);
+                  mbui_avail (aiter);
+                  mbui_advance (aiter))
+               if (mb_equal (mbui_cur (aiter), mbui_cur (iter)))
+                 return (char *) mbui_cur_ptr (iter);
+           }
+       }
+      return NULL;
+    }
+  else
+#endif
+    return strpbrk (string, accept);
+}

diff --git a/lib/string_.h b/lib/string_.h
index 50ab672e10b216b96d00b86c58bc8c304718cbae..f25a99d433e47ba26c3e144957e2c0f1009d4aa0 100644 (file)
--- a/lib/string_.h
+++ b/lib/string_.h
@@ -217,6 +217,16 @@ extern size_t strnlen (char const *__string, size_t __maxlen);
 # if ! @HAVE_STRPBRK@
 extern char *strpbrk (char const *__s, char const *__accept);
 # endif
+# if defined GNULIB_POSIXCHECK
+/* strpbrk() assumes the second argument is a list of single-byte characters.
+   Even in this simple case, it does not work with multibyte strings if the
+   locale encoding is GB18030 and one of the characters to be searched is a
+   digit.  */
+#  undef strpbrk
+#  define strpbrk(s,a) \
+     (GL_LINK_WARNING ("strpbrk cannot work correctly on character strings in multibyte locales - use mbspbrk if you care about internationalization"), \
+      strpbrk (s, a))
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef strpbrk
 # define strpbrk strpbrk_is_unportable__use_gnulib_module_strpbrk_for_portability
@@ -372,6 +382,15 @@ extern char * mbscasestr (const char *haystack, const char *needle);
 extern size_t mbscspn (const char *string, const char *accept);
 #endif
 
+#if @GNULIB_MBSPBRK@
+/* Find the first occurrence in the character string STRING of any character
+   in the character string ACCEPT.  Return the pointer to it, or NULL if none
+   exists.
+   Unlike strpbrk(), this function works correctly in multibyte locales.  */
+# define mbspbrk rpl_mbspbrk /* avoid collision with HP-UX function */
+extern char * mbspbrk (const char *string, const char *accept);
+#endif
+
 
 #ifdef __cplusplus
 }

diff --git a/m4/mbspbrk.m4 b/m4/mbspbrk.m4
new file mode 100644 (file)
index 0000000..c4700a0
--- /dev/null
+++ b/m4/mbspbrk.m4
@@ -0,0 +1,16 @@
+# mbspbrk.m4 serial 1
+dnl Copyright (C) 2007 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_MBSPBRK],
+[
+  gl_PREREQ_MBSPBRK
+])
+
+# Prerequisites of lib/mbspbrk.c.
+AC_DEFUN([gl_PREREQ_MBSPBRK], [
+  AC_REQUIRE([gl_FUNC_MBRTOWC])
+  :
+])

diff --git a/m4/string_h.m4 b/m4/string_h.m4
index ed06b9d19a067d84614839d7814c12379cddc4c5..bdcf23552bb5cd43a56ce5f06f8bf64ab1cec2ac 100644 (file)
--- a/m4/string_h.m4
+++ b/m4/string_h.m4
@@ -73,4 +73,5 @@ AC_DEFUN([gl_STRING_MODULE_INDICATOR_DEFAULTS],
   GNULIB_MBSCASECMP=0;  AC_SUBST([GNULIB_MBSCASECMP])
   GNULIB_MBSCASESTR=0;  AC_SUBST([GNULIB_MBSCASESTR])
   GNULIB_MBSCSPN=0;     AC_SUBST([GNULIB_MBSCSPN])
+  GNULIB_MBSPBRK=0;     AC_SUBST([GNULIB_MBSPBRK])
 ])

diff --git a/modules/mbspbrk b/modules/mbspbrk
new file mode 100644 (file)
index 0000000..79c9afd
--- /dev/null
+++ b/modules/mbspbrk
@@ -0,0 +1,30 @@
+Description:
+mbspbrk() function: search a string for any of a set of characters.
+
+Files:
+lib/mbspbrk.c
+m4/mbspbrk.m4
+m4/mbrtowc.m4
+
+Depends-on:
+mbuiter
+string
+mbschr
+strpbrk
+
+configure.ac:
+gl_FUNC_MBSPBRK
+gl_STRING_MODULE_INDICATOR([mbspbrk])
+
+Makefile.am:
+lib_SOURCES += mbspbrk.c
+
+Include:
+<string.h>
+
+License:
+LGPL
+
+Maintainer:
+Bruno Haible
+

diff --git a/modules/string b/modules/string
index 561eaef9402c35807525092be114f95780babd19..fe9e61a3114ec124239ec1a08cb097bc3f20355c 100644 (file)
--- a/modules/string
+++ b/modules/string
@@ -27,6 +27,7 @@ string.h: string_.h
              -e 's|@''GNULIB_MBSCASECMP''@|$(GNULIB_MBSCASECMP)|g' \
              -e 's|@''GNULIB_MBSCASESTR''@|$(GNULIB_MBSCASESTR)|g' \
              -e 's|@''GNULIB_MBSCSPN''@|$(GNULIB_MBSCSPN)|g' \
+             -e 's|@''GNULIB_MBSPBRK''@|$(GNULIB_MBSPBRK)|g' \
              -e 's|@''GNULIB_MEMMEM''@|$(GNULIB_MEMMEM)|g' \
              -e 's|@''GNULIB_MEMPCPY''@|$(GNULIB_MEMPCPY)|g' \
              -e 's|@''GNULIB_MEMRCHR''@|$(GNULIB_MEMRCHR)|g' \