2 files changed, 68 insertions, 0 deletions
diff --git a/gnulib b/gnulib
deleted file mode 160000
-Subproject 443bc5ffcf7429e557f4a371b0661abe98ddbc1
diff --git a/gnulib/lib/mbscspn.c b/gnulib/lib/mbscspn.c
new file mode 100644
index 0000000..68ac1c7
--- /dev/null
+++ b/gnulib/lib/mbscspn.c
@@ -0,0 +1,68 @@
+/* Searching a string for a character among a given set of characters.
+   Copyright (C) 1999, 2002, 2006-2011 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 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 <string.h>
+
+#include "mbuiter.h"
+
+/* Find the first occurrence in the character string STRING of any character
+   in the character string ACCEPT.  Return the number of bytes from the
+   beginning of the string to this occurrence, or to the end of the string
+   if none exists.  */
+size_t
+mbscspn (const char *string, const char *accept)
+{
+  /* Optimize two cases.  */
+  if (accept[0] == '\0')
+    return strlen (string);
+  if (accept[1] == '\0')
+    {
+      const char *ptr = mbschr (string, accept[0]);
+      return (ptr != NULL ? ptr - string : strlen (string));
+    }
+  /* General case.  */
+  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, * mbui_cur_ptr (iter)))
+                goto found;
+            }
+          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)))
+                  goto found;
+            }
+        }
+     found:
+      return mbui_cur_ptr (iter) - string;
+    }
+  else
+    return strcspn (string, accept);
+}