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, 67 deletions

diff --git a/lib/libc/locale/wcsrtombs.c b/lib/libc/locale/wcsrtombs.c
index a03f0d3..f3b38b7 100644
--- a/lib/libc/locale/wcsrtombs.c
+++ b/lib/libc/locale/wcsrtombs.c
@@ -41,71 +41,5 @@ wcsrtombs(char * __restrict dst, const wchar_t ** __restrict src, size_t len,
 
 	if (ps == NULL)
 		ps = &mbs;
-	return (__wcsrtombs(dst, src, len, ps));
-}
-
-size_t
-__wcsrtombs_std(char * __restrict dst, const wchar_t ** __restrict src,
-    size_t len, mbstate_t * __restrict ps)
-{
-	mbstate_t mbsbak;
-	char buf[MB_LEN_MAX];
-	const wchar_t *s;
-	size_t nbytes;
-	int nb;
-
-	s = *src;
-	nbytes = 0;
-
-	if (dst == NULL) {
-		for (;;) {
-			if ((nb = (int)__wcrtomb(buf, *s, ps)) < 0)
-				/* Invalid character - wcrtomb() sets errno. */
-				return ((size_t)-1);
-			else if (*s == L'\0')
-				return (nbytes + nb - 1);
-			s++;
-			nbytes += nb;
-		}
-		/*NOTREACHED*/
-	}
-
-	while (len > 0) {
-		if (len > (size_t)MB_CUR_MAX) {
-			/* Enough space to translate in-place. */
-			if ((nb = (int)__wcrtomb(dst, *s, ps)) < 0) {
-				*src = s;
-				return ((size_t)-1);
-			}
-		} else {
-			/*
-			 * May not be enough space; use temp. buffer.
-			 *
-			 * We need to save a copy of the conversion state
-			 * here so we can restore it if the multibyte
-			 * character is too long for the buffer.
-			 */
-			mbsbak = *ps;
-			if ((nb = (int)__wcrtomb(buf, *s, ps)) < 0) {
-				*src = s;
-				return ((size_t)-1);
-			}
-			if (nb > (int)len) {
-				/* MB sequence for character won't fit. */
-				*ps = mbsbak;
-				break;
-			}
-			memcpy(dst, buf, nb);
-		}
-		if (*s == L'\0') {
-			*src = NULL;
-			return (nbytes + nb - 1);
-		}
-		s++;
-		dst += nb;
-		len -= nb;
-		nbytes += nb;
-	}
-	*src = s;
-	return (nbytes);
+	return (__wcsnrtombs(dst, src, SIZE_T_MAX, len, ps));
 }