Switch to the OpenBSD wcsto* functions.
This replaces a partial set of non-functional functions with a complete
set of functions, all of which actually work.
This requires us to implement mbsnrtowcs and wcsnrtombs which completes
the set of what we need for libc++.
The mbsnrtowcs is basically a copy & paste of wcsnrtombs, but I'm going
to go straight to looking at using the OpenBSD UTF-8 implementation rather
than keep polishing our home-grown turd.
(This patch also opportunistically switches us over to upstream btowc,
mbrlen, and wctob, since they're all trivially expressed in terms of
other functions.)
Change-Id: I0f81443840de0f1aa73b96f0b51988976793a323
diff --git a/libc/Android.mk b/libc/Android.mk
index 864287a..0fee71a 100644
--- a/libc/Android.mk
+++ b/libc/Android.mk
@@ -336,9 +336,21 @@
upstream-openbsd/lib/libc/gen/time.c \
upstream-openbsd/lib/libc/gen/tolower_.c \
upstream-openbsd/lib/libc/gen/toupper_.c \
+ upstream-openbsd/lib/libc/locale/btowc.c \
+ upstream-openbsd/lib/libc/locale/mbrlen.c \
+ upstream-openbsd/lib/libc/locale/mbstowcs.c \
upstream-openbsd/lib/libc/locale/mbtowc.c \
upstream-openbsd/lib/libc/locale/wcscoll.c \
+ upstream-openbsd/lib/libc/locale/wcstod.c \
+ upstream-openbsd/lib/libc/locale/wcstof.c \
+ upstream-openbsd/lib/libc/locale/wcstol.c \
+ upstream-openbsd/lib/libc/locale/wcstold.c \
+ upstream-openbsd/lib/libc/locale/wcstoll.c \
+ upstream-openbsd/lib/libc/locale/wcstombs.c \
+ upstream-openbsd/lib/libc/locale/wcstoul.c \
+ upstream-openbsd/lib/libc/locale/wcstoull.c \
upstream-openbsd/lib/libc/locale/wcsxfrm.c \
+ upstream-openbsd/lib/libc/locale/wctob.c \
upstream-openbsd/lib/libc/stdio/asprintf.c \
upstream-openbsd/lib/libc/stdio/clrerr.c \
upstream-openbsd/lib/libc/stdio/fdopen.c \