Implement wmempcpy()

5 files changed, 67 insertions, 0 deletions

diff --git a/libc/debian/changelog b/libc/debian/changelog
index 97f919f..8c081a4 100644
--- a/libc/debian/changelog
+++ b/libc/debian/changelog
@@ -10,6 +10,7 @@ libc (2.10-11) UNRELEASED; urgency=low
   * Add TEMP_FAILURE_RETRY to unistd.h (_GNU_SOURCE)
   * Implement memrchr()
   * Implement rawmemchr()
+  * Implement wmempcpy()
   * Define __CONCAT and __STRING in sys/cdefs.h
 
  -- Igor Pashev <pashev.igor@gmail.com>  Sat, 16 Feb 2013 23:09:40 +0000
diff --git a/libc/debian/libc1-illumos-i386.symbols b/libc/debian/libc1-illumos-i386.symbols
index 50f2e15..16c2f37 100644
--- a/libc/debian/libc1-illumos-i386.symbols
+++ b/libc/debian/libc1-illumos-i386.symbols
@@ -2478,6 +2478,7 @@ libc.so.1 libc1-illumos-i386 #MINVER#
  wmemchr@SUNW_1.18 2.10-1
  wmemcmp@SUNW_1.18 2.10-1
  wmemcpy@SUNW_1.18 2.10-1
+ wmempcpy@DYSON_1 2.10-11
  wmemmove@SUNW_1.18 2.10-1
  wmemset@SUNW_1.18 2.10-1
  wordexp@SUNW_0.8 2.10-1
diff --git a/libc/debian/libc1.symbols.illumos-amd64 b/libc/debian/libc1.symbols.illumos-amd64
index 2568e12..08eadd6 100644
--- a/libc/debian/libc1.symbols.illumos-amd64
+++ b/libc/debian/libc1.symbols.illumos-amd64
@@ -2358,6 +2358,7 @@ libc.so.1 libc1 #MINVER#
  wmemchr@SUNW_1.18 2.10-1
  wmemcmp@SUNW_1.18 2.10-1
  wmemcpy@SUNW_1.18 2.10-1
+ wmempcpy@DYSON_1 2.10-11
  wmemmove@SUNW_1.18 2.10-1
  wmemset@SUNW_1.18 2.10-1
  wordexp@SUNW_0.8 2.10-1
diff --git a/libc/debian/patches/libc-add-wmempcpy.patch b/libc/debian/patches/libc-add-wmempcpy.patch
new file mode 100644
index 0000000..99684fd
--- /dev/null
+++ b/libc/debian/patches/libc-add-wmempcpy.patch
@@ -0,0 +1,63 @@
+Index: libc/usr/src/head/wchar.h
+===================================================================
+--- libc.orig/usr/src/head/wchar.h	2012-10-08 00:25:37.000000000 +0000
++++ libc/usr/src/head/wchar.h	2013-03-08 01:38:27.402528598 +0000
+@@ -190,6 +190,10 @@
+ 
+ #endif /* __STDC__ */
+ 
++#if defined(__EXTENSIONS__) || defined(_GNU_SOURCE)
++extern wchar_t *wmempcpy(wchar_t *, const wchar_t *, size_t);
++#endif
++
+ #ifdef	__cplusplus
+ }
+ #endif
+Index: libc/usr/src/lib/libc/port/mapfile-vers
+===================================================================
+--- libc.orig/usr/src/lib/libc/port/mapfile-vers	2013-03-07 16:49:22.030855670 +0000
++++ libc/usr/src/lib/libc/port/mapfile-vers	2013-03-08 01:39:07.046108962 +0000
+@@ -103,6 +103,7 @@
+         program_invocation_name;
+         program_invocation_short_name;
+         rawmemchr;
++        wmempcpy;
+ } ILLUMOS_0.3;
+ 
+ SYMBOL_VERSION ILLUMOS_0.3 {	# Illumos additions
+Index: libc/usr/src/lib/libc/amd64/Makefile
+===================================================================
+--- libc.orig/usr/src/lib/libc/amd64/Makefile	2013-03-07 16:49:22.026209778 +0000
++++ libc/usr/src/lib/libc/amd64/Makefile	2013-03-08 01:39:45.545204165 +0000
+@@ -671,6 +671,7 @@
+ 	wmemcmp.o		\
+ 	wmemcpy.o		\
+ 	wmemmove.o		\
++	wmempcpy.o		\
+ 	wmemset.o		\
+ 	wscasecmp.o		\
+ 	wscat.o			\
+Index: libc/usr/src/lib/libc/i386/Makefile.com
+===================================================================
+--- libc.orig/usr/src/lib/libc/i386/Makefile.com	2013-03-07 16:49:22.035261818 +0000
++++ libc/usr/src/lib/libc/i386/Makefile.com	2013-03-08 01:39:59.705698527 +0000
+@@ -712,6 +712,7 @@
+ 	wmemchr.o		\
+ 	wmemcmp.o		\
+ 	wmemcpy.o		\
++	wmempcpy.o		\
+ 	wmemmove.o		\
+ 	wmemset.o		\
+ 	wscasecmp.o		\
+Index: libc/usr/src/lib/libc/port/i18n/wmempcpy.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ libc/usr/src/lib/libc/port/i18n/wmempcpy.c	2013-03-08 01:46:38.200502332 +0000
+@@ -0,0 +1,7 @@
++#include <wchar.h>
++
++wchar_t *wmempcpy (wchar_t *dest, const wchar_t *src, size_t n)
++{
++    return wmemcpy(dest, src, n) + n;
++}
++
diff --git a/libc/debian/patches/series b/libc/debian/patches/series
index 78079c5..966cc3a 100644
--- a/libc/debian/patches/series
+++ b/libc/debian/patches/series
@@ -69,4 +69,5 @@ stdlib-includes-alloca.patch
 add-TEMP_FAILURE_RETRY.patch
 add-memrchr.patch
 add-rawmemchr.patch
+libc-add-wmempcpy.patch
 rpcinfo-MAX.patch