New module 'mbssep'.

diff --git a/ChangeLog b/ChangeLog
index b35271054838e299f32c4e07219bc8e99a507825..b04a86c08992874bba8ce68452eb53c2495cad09 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2007-02-05  Bruno Haible  <bruno@clisp.org>
+
+       New module mbssep.
+       * modules/mbssep: New file.
+       * lib/mbssep.c: New file.
+       * lib/string_.h (strsep): Add a conditional link warning.
+       (mbssep): New declaration.
+       * m4/mbssep.m4: New file.
+       * m4/string_h.m4 (gl_STRING_MODULE_INDICATOR_DEFAULTS): Initialize
+       GNULIB_MBSSEP.
+       * modules/string (string.h): Also substitute GNULIB_MBSSEP.
+       * MODULES.html.sh (Internationalization functions): Add mbssep.
+
 2007-02-05  Paolo Bonzini  <bonzini@gnu.org>
 
        * lib/acl.h: Include sys/types.h before sys/acl.h.

diff --git a/MODULES.html.sh b/MODULES.html.sh
index 22779e2c21225efe1579d9d278c95b9d38e2c7b7..114e3026d5b0828cbf5fb5b5180942afe62d9bc0 100755 (executable)
--- a/MODULES.html.sh
+++ b/MODULES.html.sh
@@ -2168,6 +2168,7 @@ func_all_modules ()
   func_module mbscspn
   func_module mbspbrk
   func_module mbsspn
+  func_module mbssep
   func_module mbstok_r
   func_module mbswidth
   func_module memcasecmp

diff --git a/lib/mbssep.c b/lib/mbssep.c
new file mode 100644 (file)
index 0000000..e83a539
--- /dev/null
+++ b/lib/mbssep.c
@@ -0,0 +1,66 @@
+/* Tokenizing a string.
+   Copyright (C) 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
+
+char *
+mbssep (char **stringp, const char *delim)
+{
+#if HAVE_MBRTOWC
+  if (MB_CUR_MAX > 1)
+    {
+      char *start = *stringp;
+      char *ptr;
+
+      if (start == NULL)
+       return NULL;
+
+      /* No need to optimize the cases of 0 or 1 delimiters specially,
+        since mbspbrk already optimizes them.  */
+
+      ptr = mbspbrk (start, delim);
+
+      if (ptr == NULL)
+       {
+         *stringp = NULL;
+         return start;
+       }
+      else
+       {
+         mbui_iterator_t iter;
+
+         mbui_init (iter, ptr);
+         if (!mbui_avail (iter))
+           abort ();
+         mbui_advance (iter);
+         *ptr = '\0';
+         *stringp = (char *) mbui_cur_ptr (iter);
+         return start;
+       }
+    }
+  else
+#endif
+    return strsep (stringp, delim);
+}

diff --git a/lib/string_.h b/lib/string_.h
index f26a1da620c97de6c9cbea30f48e4b51ae725a8d..113bfb48069f7539e51eab98eada5791f9a37018 100644 (file)
--- a/lib/string_.h
+++ b/lib/string_.h
@@ -270,6 +270,12 @@ extern char *strpbrk (char const *__s, char const *__accept);
 # if ! @HAVE_STRSEP@
 extern char *strsep (char **restrict __stringp, char const *restrict __delim);
 # endif
+# if defined GNULIB_POSIXCHECK
+#  undef strsep
+#  define strsep(s,d) \
+     (GL_LINK_WARNING ("strsep cannot work correctly on character strings in multibyte locales - use mbssep if you care about internationalization"), \
+      strsep (s, d))
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef strsep
 # define strsep strsep_is_unportable__use_gnulib_module_strsep_for_portability
@@ -415,6 +421,24 @@ extern char * mbspbrk (const char *string, const char *accept);
 extern size_t mbsspn (const char *string, const char *reject);
 #endif
 
+#if @GNULIB_MBSSEP@
+/* Search the next delimiter (multibyte character listed in the character
+   string DELIM) starting at the character string *STRINGP.
+   If one is found, overwrite it with a NUL, and advance *STRINGP to point
+   to the next multibyte character after it.  Otherwise, set *STRINGP to NULL.
+   If *STRINGP was already NULL, nothing happens.
+   Return the old value of *STRINGP.
+
+   This is a variant of mbstok_r() that supports empty fields.
+
+   Caveat: It modifies the original string.
+   Caveat: These functions cannot be used on constant strings.
+   Caveat: The identity of the delimiting character is lost.
+
+   See also mbstok_r().  */
+extern char * mbssep (char **stringp, const char *delim);
+#endif
+
 #if @GNULIB_MBSTOK_R@
 /* Parse the character string STRING into tokens separated by characters in
    the character string DELIM.
@@ -429,7 +453,9 @@ extern size_t mbsspn (const char *string, const char *reject);
 
    Caveat: It modifies the original string.
    Caveat: These functions cannot be used on constant strings.
-   Caveat: The identity of the delimiting character is lost.  */
+   Caveat: The identity of the delimiting character is lost.
+
+   See also mbssep().  */
 extern char * mbstok_r (char *string, const char *delim, char **save_ptr);
 #endif
 

diff --git a/m4/mbssep.m4 b/m4/mbssep.m4
new file mode 100644 (file)
index 0000000..1a44aba
--- /dev/null
+++ b/m4/mbssep.m4
@@ -0,0 +1,16 @@
+# mbssep.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_MBSSEP],
+[
+  gl_PREREQ_MBSSEP
+])
+
+# Prerequisites of lib/mbssep.c.
+AC_DEFUN([gl_PREREQ_MBSSEP], [
+  AC_REQUIRE([gl_FUNC_MBRTOWC])
+  :
+])

diff --git a/m4/string_h.m4 b/m4/string_h.m4
index 14ed54ad54b9d3238667bbcb4ff719d8d7c1f5ef..80e95e1bb25be66987be9e50f05e2f0d2e43cdbd 100644 (file)
--- a/m4/string_h.m4
+++ b/m4/string_h.m4
@@ -75,5 +75,6 @@ AC_DEFUN([gl_STRING_MODULE_INDICATOR_DEFAULTS],
   GNULIB_MBSCSPN=0;     AC_SUBST([GNULIB_MBSCSPN])
   GNULIB_MBSPBRK=0;     AC_SUBST([GNULIB_MBSPBRK])
   GNULIB_MBSSPN=0;      AC_SUBST([GNULIB_MBSSPN])
+  GNULIB_MBSSEP=0;      AC_SUBST([GNULIB_MBSSEP])
   GNULIB_MBSTOK_R=0;    AC_SUBST([GNULIB_MBSTOK_R])
 ])

diff --git a/modules/mbssep b/modules/mbssep
new file mode 100644 (file)
index 0000000..2e50c98
--- /dev/null
+++ b/modules/mbssep
@@ -0,0 +1,30 @@
+Description:
+mbssep() function: split string into tokens, thread safe.
+
+Files:
+lib/mbssep.c
+m4/mbssep.m4
+m4/mbrtowc.m4
+
+Depends-on:
+mbuiter
+string
+mbspbrk
+strsep
+
+configure.ac:
+gl_FUNC_MBSSEP
+gl_STRING_MODULE_INDICATOR([mbssep])
+
+Makefile.am:
+lib_SOURCES += mbssep.c
+
+Include:
+<string.h>
+
+License:
+LGPL
+
+Maintainer:
+Bruno Haible
+

diff --git a/modules/string b/modules/string
index 4e1229c8e98c43df341a578e7a27501dda833e98..abfc9ea180047b6be914a410b61f6fcfb867d9ce 100644 (file)
--- a/modules/string
+++ b/modules/string
@@ -29,6 +29,7 @@ string.h: string_.h
              -e 's|@''GNULIB_MBSCSPN''@|$(GNULIB_MBSCSPN)|g' \
              -e 's|@''GNULIB_MBSPBRK''@|$(GNULIB_MBSPBRK)|g' \
              -e 's|@''GNULIB_MBSSPN''@|$(GNULIB_MBSSPN)|g' \
+             -e 's|@''GNULIB_MBSSEP''@|$(GNULIB_MBSSEP)|g' \
              -e 's|@''GNULIB_MBSTOK_R''@|$(GNULIB_MBSTOK_R)|g' \
              -e 's|@''GNULIB_MEMMEM''@|$(GNULIB_MEMMEM)|g' \
              -e 's|@''GNULIB_MEMPCPY''@|$(GNULIB_MEMPCPY)|g' \