Implement the GNU extensions of mbsnrtowcs() and wcsnrtombs(). These are

convenient when the source string isn't null-terminated.

Implement the other conversion functions (mbstowcs(), mbsrtowcs(), wcstombs(),
wcsrtombs()) in terms of these new functions.

1 files changed, 1 insertions, 42 deletions

diff --git a/lib/libc/locale/mbsrtowcs.c b/lib/libc/locale/mbsrtowcs.c
index a90c655..1239c82 100644
--- a/lib/libc/locale/mbsrtowcs.c
+++ b/lib/libc/locale/mbsrtowcs.c
@@ -41,46 +41,5 @@ mbsrtowcs(wchar_t * __restrict dst, const char ** __restrict src, size_t len,
 
 	if (ps == NULL)
 		ps = &mbs;
-	return (__mbsrtowcs(dst, src, len, ps));
-}
-
-size_t
-__mbsrtowcs_std(wchar_t * __restrict dst, const char ** __restrict src,
-    size_t len, mbstate_t * __restrict ps)
-{
-	const char *s;
-	size_t nchr;
-	wchar_t wc;
-	int nb;
-
-	s = *src;
-	nchr = 0;
-
-	if (dst == NULL) {
-		for (;;) {
-			if ((nb = (int)__mbrtowc(&wc, s, MB_CUR_MAX, ps)) < 0)
-				/* Invalid sequence - mbrtowc() sets errno. */
-				return ((size_t)-1);
-			else if (nb == 0)
-				return (nchr);
-			s += nb;
-			nchr++;
-		}
-		/*NOTREACHED*/
-	}
-
-	while (len-- > 0) {
-		if ((nb = (int)__mbrtowc(dst, s, MB_CUR_MAX, ps)) < 0) {
-			*src = s;
-			return ((size_t)-1);
-		} else if (nb == 0) {
-			*src = NULL;
-			return (nchr);
-		}
-		s += nb;
-		nchr++;
-		dst++;
-	}
-	*src = s;
-	return (nchr);
+	return (__mbsnrtowcs(dst, src, SIZE_T_MAX, len, ps));
 }