2002-09-09 Jeff Johnston <jjohnstn@redhat.com>

        * libc/include/sys/_types.h (_mbstate_t): Changed to use
        unsigned char internally.
        * libc/sys/linux/sys/_types.h: Ditto.
        * libc/include/sys/reent.h
        * libc/stdlib/mblen.c (mblen): Use function-specific state
        value from default reentrancy structure.
        * libc/stdlib/mblen_r.c (_mblen_r):  If return code from
        _mbtowc_r is less than 0, reset state __count value and
        return -1.
        * libc/stdlib/mbrlen.c (mbrlen): If the input state pointer
        is NULL, use the function-specific pointer provided in the
        default reentrancy structure.
        * libc/stdlib/mbrtowc.c: Add reentrant form of function.
        If input state pointer is NULL, use function-specific area
        provided in reentrancy structure.
        * libc/stdlib/mbsrtowcs.c: Ditto.
        * libc/stdlib/wcrtomb.c: Ditto.
        * libc/stdlib/wcsrtombs.c: Ditto.
        * libc/stdlib/mbstowcs.c: Reformat.
        * libc/stdlib/wcstombs.c: Ditto.
        * libc/stdlib/mbstowcs_r.c (_mbstowcs_r): If an error occurs,
        reset the state's __count value and return -1.
        * libc/stdlib/mbtowc.c: Ditto.
        * libc/stdlib/mbtowc_r.c (_mbtowc_r): Add restartable functionality.
        If number of bytes is used up before completing a valid multibyte
        character, return -2 and save the state.
        * libc/stdlib/wctomb_r.c (_wctomb_r): Define __state as __count
        and change some __count references to __state for clarity.

1 files changed, 53 insertions, 11 deletions

diff --git a/newlib/libc/stdlib/mbsrtowcs.c b/newlib/libc/stdlib/mbsrtowcs.c
index 256ab0d7b..08d9d0c18 100644
--- a/newlib/libc/stdlib/mbsrtowcs.c
+++ b/newlib/libc/stdlib/mbsrtowcs.c
@@ -5,20 +5,62 @@
 #include <errno.h>
 
 size_t
-mbsrtowcs(wchar_t *dst, const char **src, size_t len, mbstate_t *ps)
+_DEFUN (_mbsrtowcs_r, (r, dst, src, n, ps), 
+	struct _reent *r _AND
+	wchar_t *dst _AND
+	const char **src _AND
+	size_t n _AND
+	mbstate_t *ps)
 {
-  int retval = 0;
-  mbstate_t internal;
+  wchar_t *ptr = dst;
+  size_t max = n;
+  int bytes;
 
-  _REENT_CHECK_MISC(_REENT);
-
-  retval = _mbstowcs_r (_REENT, dst, *src, len, ps != NULL ? ps : &internal);
+#ifdef MB_CAPABLE
+  if (ps == NULL)
+    {
+      _REENT_CHECK_MISC(r);
+      ps = &(_REENT_MBSRTOWCS_STATE(r));
+    }
+#endif
 
-  if (retval == -1)
+  while (n > 0)
     {
-      _REENT->_errno = EILSEQ;
-      return (size_t)(-1);
+      bytes = _mbtowc_r (r, ptr, *src, MB_CUR_MAX, ps);
+      if (bytes > 0)
+	{
+	  *src += bytes;
+	  ++ptr;
+	  --n;
+	}
+      else if (bytes == -2)
+	{
+	  *src += MB_CUR_MAX;
+	}
+      else if (bytes == 0)
+	{
+	  *src = NULL;
+	  return (size_t)(ptr - dst);
+	}
+      else
+	{
+	  ps->__count = 0;
+	  r->_errno = EILSEQ;
+	  return (size_t)-1;
+	}
     }
-  else
-    return (size_t)retval;
+
+  return (size_t)max;
+}
+
+#ifndef _REENT_ONLY
+size_t
+_DEFUN (mbsrtowcs, (dst, src, len, ps),
+	wchar_t *dst _AND
+	const char **src _AND
+	size_t len _AND
+	mbstate_t *ps)
+{
+  return _mbsrtowcs_r (_REENT, dst, src, len, ps);
 }
+#endif /* !_REENT_ONLY */