--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-08-16  Bruno Haible  <bruno@clisp.org>
+
+	* modules/strnlen1: New file.
+	* MODULES.html.sh (String handling): Add strnlen1.
+
 2005-08-16  Bruno Haible  <bruno@clisp.org>
 
 	* modules/mbfile: New file.

--- a/MODULES.html.sh
+++ b/MODULES.html.sh
@@ -1520,6 +1520,7 @@
   func_module strchrnul
   func_module strdup
   func_module strnlen
+  func_module strnlen1
   func_module strndup
   func_module strsep
   #func_module fstrcmp

--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,8 @@
+2005-08-16  Bruno Haible  <bruno@clisp.org>
+
+	* strnlen1.h: New file.
+	* strnlen1.c: New file.
+
 2005-08-16  Bruno Haible  <bruno@clisp.org>
 
 	* mbfile.h: New file.

new file mode 100644
--- /dev/null
+++ b/lib/strnlen1.c
@@ -0,0 +1,39 @@
+/* Find the length of STRING + 1, but scan at most MAXLEN bytes.
+   Copyright (C) 2005 Free Software Foundation, Inc.
+
+   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.  */
+
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+/* Specification.  */
+#include "strnlen1.h"
+
+#include <string.h>
+
+/* Find the length of STRING + 1, but scan at most MAXLEN bytes.
+   If no '\0' terminator is found in that many characters, return MAXLEN.  */
+/* This is the same as strnlen (string, maxlen - 1) + 1.  */
+size_t
+strnlen1 (const char *string, size_t maxlen)
+{
+  const char *end = memchr (string, '\0', maxlen);
+  if (end != NULL)
+    return end - string + 1;
+  else
+    return maxlen;
+}

new file mode 100644
--- /dev/null
+++ b/lib/strnlen1.h
@@ -0,0 +1,41 @@
+/* Find the length of STRING + 1, but scan at most MAXLEN bytes.
+   Copyright (C) 2005 Free Software Foundation, Inc.
+
+   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.  */
+
+#ifndef _STRNLEN1_H
+#define _STRNLEN1_H
+
+#include <stddef.h>
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/* Find the length of STRING + 1, but scan at most MAXLEN bytes.
+   If no '\0' terminator is found in that many characters, return MAXLEN.  */
+/* This is the same as strnlen (string, maxlen - 1) + 1.  */
+extern size_t strnlen1 (const char *string, size_t maxlen);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif /* _STRNLEN1_H */

new file mode 100644
--- /dev/null
+++ b/modules/strnlen1
@@ -0,0 +1,24 @@
+Description:
+Quick string length estimation.
+
+Files:
+lib/strnlen1.h
+lib/strnlen1.c
+
+Depends-on:
+memchr
+
+configure.ac:
+
+Makefile.am:
+lib_SOURCES += strnlen1.h strnlen1.c
+
+Include:
+"strnlen1.h"
+
+License:
+LGPL
+
+Maintainer:
+Bruno Haible
+