2 files changed, 55 insertions, 0 deletions
diff --git a/gnulib b/gnulib
deleted file mode 160000
-Subproject 4fc10daa05477586fea99b6b3ca02a87d1102fa
diff --git a/gnulib/tests/test-mbspbrk.c b/gnulib/tests/test-mbspbrk.c
new file mode 100644
index 00000000..c6adbaa6
--- /dev/null
+++ b/gnulib/tests/test-mbspbrk.c
@@ -0,0 +1,55 @@
+/* Test of searching a string for a character among a given set of characters.
+   Copyright (C) 2007-2010 Free Software Foundation, Inc.
+
+   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/>.  */
+
+/* Written by Bruno Haible <bruno@clisp.org>, 2007.  */
+
+#include <config.h>
+
+#include <string.h>
+
+#include <locale.h>
+
+#include "macros.h"
+
+int
+main ()
+{
+  /* configure should already have checked that the locale is supported.  */
+  if (setlocale (LC_ALL, "") == NULL)
+    return 1;
+
+  ASSERT (mbspbrk ("Some text", "") == NULL);
+
+  {
+    const char input[] = "A long sentence";
+    ASSERT (mbspbrk (input, "aeiou") == input + 3);
+    ASSERT (mbspbrk (input, "iI") == NULL);
+  }
+
+  /* The following tests shows how mbspbrk() is different from strpbrk().  */
+
+  {
+    const char input[] = "B\303\266se B\303\274bchen"; /* "Böse Bübchen" */
+    ASSERT (mbspbrk (input, "\303\244\303\274") == input + 7); /* "äü" */
+  }
+
+  {
+    const char input[] = "B\303\266se B\303\274bchen"; /* "Böse Bübchen" */
+    ASSERT (mbspbrk (input, "\303") == NULL); /* invalid multibyte sequence */
+  }
+
+  return 0;
+}