--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2007-06-10  Bruno Haible  <bruno@clisp.org>
 
+	* modules/unistr/u8-mbsnlen: New file.
+	* lib/unistr/u8-mbsnlen.c: New file.
+
 	* lib/unistr.h (u8_mbsnlen, u16_mbsnlen, u32_mbsnlen): New
 	declarations.
 

new file mode 100644
--- /dev/null
+++ b/lib/unistr/u8-mbsnlen.c
@@ -0,0 +1,41 @@
+/* Count characters in UTF-8 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 Library 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
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library 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 "unistr.h"
+
+size_t
+u8_mbsnlen (const uint8_t *s, size_t n)
+{
+  size_t characters;
+
+  characters = 0;
+  while (n > 0)
+    {
+      int count = u8_mblen (s, n);
+      if (count <= 0)
+	count = 1;
+      s += count;
+      n -= count;
+      characters++;
+    }
+  return characters;
+}

new file mode 100644
--- /dev/null
+++ b/modules/unistr/u8-mbsnlen
@@ -0,0 +1,24 @@
+Description:
+Count characters in UTF-8 string.
+
+Files:
+lib/unistr/u8-mbsnlen.c
+
+Depends-on:
+unistr/base
+unistr/u8-mblen
+
+configure.ac:
+
+Makefile.am:
+lib_SOURCES += unistr/u8-mbsnlen.c
+
+Include:
+"unistr.h"
+
+License:
+LGPL
+
+Maintainer:
+Bruno Haible
+