* libc/include/wchar.h (mbsnrtowcs): Declare.

	(_mbsnrtowcs_r): Declare.
	(wcsnrtombs): Declare.
	(_wcsnrtombs_r): Declare.
	* libc/stdlib/Makefile.am (ELIX_2_SOURCES): Add mbsnrtowcs.c
	and wcsnrtombs.c.
	* libc/stdlib/Makefile.in: Regenerate.
	* libc/stdlib/mbsnrtowcs.c: New file, implementing _mbsnrtowcs_r
	and mbsnrtowcs.  Document mbsnrtowcs and mbsrtowcs.
	* libc/stdlib/mbsrtowcs.c (_mbsrtowcs_r): Just call _mbsnrtowcs_r.
	(mbsrtowcs): Ditto.
	* libc/stdlib/wcsnrtombs.c: New file, implementing _wcsnrtombs_r
	and wcsnrtombs.  Document wcsrtombs and wcsnrtombs.
	* libc/stdlib/wcsrtombs.c (_wcsrtombs_r): Just call _wcsnrtombs_r.
	(wcsrtombs): Ditto.
	* libc/stdlib/stdlib.tex: Accommodate new documentation.

1 files changed, 4 insertions, 55 deletions

diff --git a/newlib/libc/stdlib/mbsrtowcs.c b/newlib/libc/stdlib/mbsrtowcs.c
index 2eaa0fe56..d5137d144 100644
--- a/newlib/libc/stdlib/mbsrtowcs.c
+++ b/newlib/libc/stdlib/mbsrtowcs.c
@@ -6,65 +6,14 @@
 #include <errno.h>
 
 size_t
-_DEFUN (_mbsrtowcs_r, (r, dst, src, n, ps), 
+_DEFUN (_mbsrtowcs_r, (r, dst, src, len, ps), 
 	struct _reent *r _AND
 	wchar_t *dst _AND
 	const char **src _AND
-	size_t n _AND
+	size_t len _AND
 	mbstate_t *ps)
 {
-  wchar_t *ptr = dst;
-  const char *tmp_src;
-  size_t max;
-  size_t count = 0;
-  int bytes;
-
-#ifdef _MB_CAPABLE
-  if (ps == NULL)
-    {
-      _REENT_CHECK_MISC(r);
-      ps = &(_REENT_MBSRTOWCS_STATE(r));
-    }
-#endif
-
-  if (dst == NULL)
-    {
-      /* Ignore original n value and do not alter src pointer if the
-         dst pointer is NULL.  */
-      n = (size_t)-1;
-      tmp_src = *src;
-      src = &tmp_src;
-    }      
-  
-  max = n;
-  while (n > 0)
-    {
-      bytes = _mbrtowc_r (r, ptr, *src, MB_CUR_MAX, ps);
-      if (bytes > 0)
-	{
-	  *src += bytes;
-	  ++count;
-	  ptr = (dst == NULL) ? NULL : ptr + 1;
-	  --n;
-	}
-      else if (bytes == -2)
-	{
-	  *src += MB_CUR_MAX;
-	}
-      else if (bytes == 0)
-	{
-	  *src = NULL;
-	  return count;
-	}
-      else
-	{
-	  ps->__count = 0;
-	  r->_errno = EILSEQ;
-	  return (size_t)-1;
-	}
-    }
-
-  return (size_t)max;
+  return _mbsnrtowcs_r (r, dst, src, (size_t) -1, len, ps);
 }
 
 #ifndef _REENT_ONLY
@@ -75,6 +24,6 @@ _DEFUN (mbsrtowcs, (dst, src, len, ps),
 	size_t len _AND
 	mbstate_t *ps)
 {
-  return _mbsrtowcs_r (_REENT, dst, src, len, ps);
+  return _mbsnrtowcs_r (_REENT, dst, src, (size_t) -1, len, ps);
 }
 #endif /* !_REENT_ONLY */