--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2011-02-05  Bruno Haible  <bruno@clisp.org>
+
+	New module 'wcpncpy'.
+	* modules/wcpncpy: New file.
+	* lib/wchar.in.h (wcpncpy): New declaration.
+	* lib/wcpncpy.c: New file.
+	* lib/wcpncpy-impl.h: New file, from libutf8 with modifications.
+	* m4/wcpncpy.m4: New file.
+	* m4/wchar_h.m4 (gl_WCHAR_H): Test whether wcpncpy is declared.
+	(gl_WCHAR_H_DEFAULTS): Initialize GNULIB_WCPNCPY, HAVE_WCPNCPY.
+	* modules/wchar (Makefile.am): Substitute GNULIB_WCPNCPY, HAVE_WCPNCPY.
+	* tests/test-wchar-c++.cc: Test the declaration of wcpncpy.
+	* doc/posix-functions/wcpncpy.texi: Mention the new module.
+
 2011-02-05  Bruno Haible  <bruno@clisp.org>
 
 	New module 'wcsncpy'.

--- a/doc/posix-functions/wcpncpy.texi
+++ b/doc/posix-functions/wcpncpy.texi
@@ -4,19 +4,19 @@
 
 POSIX specification:@* @url{http://www.opengroup.org/onlinepubs/9699919799/functions/wcpncpy.html}
 
-Gnulib module: ---
+Gnulib module: wcpncpy
 
 Portability problems fixed by Gnulib:
 @itemize
+@item
+This function is missing on some platforms:
+MacOS X 10.5, FreeBSD 6.0, NetBSD 5.0, OpenBSD 3.8, AIX 4.3.2, HP-UX 11,
+IRIX 6.5, OSF/1 5.1, Solaris 10, Cygwin 1.5.x, mingw, Interix 3.5, BeOS.
 @end itemize
 
 Portability problems not fixed by Gnulib:
 @itemize
 @item
-This function is missing on some platforms:
-MacOS X 10.5, FreeBSD 6.0, NetBSD 5.0, OpenBSD 3.8, AIX 4.3.2, HP-UX
-11, IRIX 6.5, OSF/1 5.1, Solaris 10, Cygwin 1.5.x, mingw, Interix 3.5, BeOS.
-@item
 On AIX and Windows platforms, @code{wchar_t} is a 16-bit type and therefore cannot
 accommodate all Unicode characters.
 @end itemize

--- a/lib/wchar.in.h
+++ b/lib/wchar.in.h
@@ -599,6 +599,25 @@
 #endif
 
 
+/* Copy no more than N characters of SRC to DEST, returning the address of
+   the last character written into DEST.  */
+#if @GNULIB_WCPNCPY@
+# if !@HAVE_WCPNCPY@
+_GL_FUNCDECL_SYS (wcpncpy, wchar_t *,
+                  (wchar_t *dest, const wchar_t *src, size_t n));
+# endif
+_GL_CXXALIAS_SYS (wcpncpy, wchar_t *,
+                  (wchar_t *dest, const wchar_t *src, size_t n));
+_GL_CXXALIASWARN (wcpncpy);
+#elif defined GNULIB_POSIXCHECK
+# undef wcpncpy
+# if HAVE_RAW_DECL_WCPNCPY
+_GL_WARN_ON_USE (wcpncpy, "wcpncpy is unportable - "
+                 "use gnulib module wcpncpy for portability");
+# endif
+#endif
+
+
 #endif /* _GL_WCHAR_H */
 #endif /* _GL_WCHAR_H */
 #endif

new file mode 100644
--- /dev/null
+++ b/lib/wcpncpy-impl.h
@@ -0,0 +1,30 @@
+/* Copy a size-bounded wide string.
+   Copyright (C) 1999, 2011 Free Software Foundation, Inc.
+   Written by Bruno Haible <bruno@clisp.org>, 1999.
+
+   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/>.  */
+
+wchar_t *
+wcpncpy (wchar_t *dest, const wchar_t *src, size_t n)
+{
+  for (; n > 0 && (*dest = *src) != (wchar_t)'\0'; src++, dest++, n--)
+    ;
+
+  /* This behavior is rarely useful, but it is here for consistency with
+     wcsncpy.  */
+  for (; n > 0; n--)
+    *dest++ = (wchar_t)'\0';
+
+  return dest-1;
+}

new file mode 100644
--- /dev/null
+++ b/lib/wcpncpy.c
@@ -0,0 +1,23 @@
+/* Copy a size-bounded wide string.
+   Copyright (C) 2011 Free Software Foundation, Inc.
+   Written by Bruno Haible <bruno@clisp.org>, 2011.
+
+   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 <wchar.h>
+
+#include "wcpncpy-impl.h"

--- a/m4/wchar_h.m4
+++ b/m4/wchar_h.m4
@@ -51,7 +51,7 @@
     ]],
     [btowc wctob mbsinit mbrtowc mbrlen mbsrtowcs mbsnrtowcs wcrtomb
      wcsrtombs wcsnrtombs wcwidth wmemchr wmemcmp wmemcpy wmemmove wmemset
-     wcslen wcsnlen wcscpy wcpcpy wcsncpy
+     wcslen wcsnlen wcscpy wcpcpy wcsncpy wcpncpy
     ])
 ])
 
@@ -156,6 +156,7 @@
   GNULIB_WCSCPY=0;     AC_SUBST([GNULIB_WCSCPY])
   GNULIB_WCPCPY=0;     AC_SUBST([GNULIB_WCPCPY])
   GNULIB_WCSNCPY=0;    AC_SUBST([GNULIB_WCSNCPY])
+  GNULIB_WCPNCPY=0;    AC_SUBST([GNULIB_WCPNCPY])
   dnl Assume proper GNU behavior unless another module says otherwise.
   HAVE_BTOWC=1;         AC_SUBST([HAVE_BTOWC])
   HAVE_MBSINIT=1;       AC_SUBST([HAVE_MBSINIT])
@@ -176,6 +177,7 @@
   HAVE_WCSCPY=1;        AC_SUBST([HAVE_WCSCPY])
   HAVE_WCPCPY=1;        AC_SUBST([HAVE_WCPCPY])
   HAVE_WCSNCPY=1;       AC_SUBST([HAVE_WCSNCPY])
+  HAVE_WCPNCPY=1;       AC_SUBST([HAVE_WCPNCPY])
   HAVE_DECL_WCTOB=1;    AC_SUBST([HAVE_DECL_WCTOB])
   HAVE_DECL_WCWIDTH=1;  AC_SUBST([HAVE_DECL_WCWIDTH])
   REPLACE_MBSTATE_T=0;  AC_SUBST([REPLACE_MBSTATE_T])

new file mode 100644
--- /dev/null
+++ b/m4/wcpncpy.m4
@@ -0,0 +1,15 @@
+# wcpncpy.m4 serial 1
+dnl Copyright (C) 2011 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+AC_DEFUN([gl_FUNC_WCPNCPY],
+[
+  AC_REQUIRE([gl_WCHAR_H_DEFAULTS])
+  AC_CHECK_FUNCS_ONCE([wcpncpy])
+  if test $ac_cv_func_wcpncpy = no; then
+    HAVE_WCPNCPY=0
+    AC_LIBOBJ([wcpncpy])
+  fi
+])

--- a/modules/wchar
+++ b/modules/wchar
@@ -51,6 +51,7 @@
 	      -e 's|@''GNULIB_WCSCPY''@|$(GNULIB_WCSCPY)|g' \
 	      -e 's|@''GNULIB_WCPCPY''@|$(GNULIB_WCPCPY)|g' \
 	      -e 's|@''GNULIB_WCSNCPY''@|$(GNULIB_WCSNCPY)|g' \
+	      -e 's|@''GNULIB_WCPNCPY''@|$(GNULIB_WCPNCPY)|g' \
 	      -e 's|@''HAVE_WINT_T''@|$(HAVE_WINT_T)|g' \
 	      -e 's|@''HAVE_BTOWC''@|$(HAVE_BTOWC)|g' \
 	      -e 's|@''HAVE_MBSINIT''@|$(HAVE_MBSINIT)|g' \
@@ -71,6 +72,7 @@
 	      -e 's|@''HAVE_WCSCPY''@|$(HAVE_WCSCPY)|g' \
 	      -e 's|@''HAVE_WCPCPY''@|$(HAVE_WCPCPY)|g' \
 	      -e 's|@''HAVE_WCSNCPY''@|$(HAVE_WCSNCPY)|g' \
+	      -e 's|@''HAVE_WCPNCPY''@|$(HAVE_WCPNCPY)|g' \
 	      -e 's|@''HAVE_DECL_WCTOB''@|$(HAVE_DECL_WCTOB)|g' \
 	      -e 's|@''HAVE_DECL_WCWIDTH''@|$(HAVE_DECL_WCWIDTH)|g' \
 	      -e 's|@''REPLACE_MBSTATE_T''@|$(REPLACE_MBSTATE_T)|g' \

new file mode 100644
--- /dev/null
+++ b/modules/wcpncpy
@@ -0,0 +1,25 @@
+Description:
+wcpncpy() function: copy a size-bounded wide string.
+
+Files:
+lib/wcpncpy.c
+lib/wcpncpy-impl.h
+m4/wcpncpy.m4
+
+Depends-on:
+wchar
+
+configure.ac:
+gl_FUNC_WCPNCPY
+gl_WCHAR_MODULE_INDICATOR([wcpncpy])
+
+Makefile.am:
+
+Include:
+<wchar.h>
+
+License:
+LGPL
+
+Maintainer:
+Bruno Haible

--- a/tests/test-wchar-c++.cc
+++ b/tests/test-wchar-c++.cc
@@ -123,6 +123,11 @@
                  (wchar_t *, const wchar_t *, size_t));
 #endif
 
+#if GNULIB_TEST_WCPNCPY
+SIGNATURE_CHECK (GNULIB_NAMESPACE::wcpncpy, wchar_t *,
+                 (wchar_t *, const wchar_t *, size_t));
+#endif
+
 
 int
 main ()