2 files changed, 61 insertions, 0 deletions
diff --git a/gnulib b/gnulib
deleted file mode 160000
-Subproject 443bc5ffcf7429e557f4a371b0661abe98ddbc1
diff --git a/gnulib/lib/mbssep.c b/gnulib/lib/mbssep.c
new file mode 100644
index 0000000..42e791e
--- /dev/null
+++ b/gnulib/lib/mbssep.c
@@ -0,0 +1,61 @@
+/* Tokenizing a string.
+   Copyright (C) 2007-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"
+
+char *
+mbssep (char **stringp, const char *delim)
+{
+  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
+    return strsep (stringp, delim);
+}