X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fwcsrtombs.c;h=ebbca78f6553266843902675cc9668cb57b27049;hb=6815bc73969d38c2226cf6e3366c1e4f4f756ba0;hp=be88e31c627294eb244906ea6ca0b1d7bbb39f8b;hpb=d60f3b0c6b0f93a601acd1cfd3923f94ca05abb0;p=gnulib.git

diff --git a/lib/wcsrtombs.c b/lib/wcsrtombs.c
index be88e31c6..ebbca78f6 100644
--- a/lib/wcsrtombs.c
+++ b/lib/wcsrtombs.c
@@ -37,7 +37,7 @@ rpl_wcsrtombs (char *dest, const wchar_t **srcp, size_t len, mbstate_t *ps)
     {
       const wchar_t *temp_src = *srcp;
 
-      return wcsrtombs (NULL, &temp_src, len, ps);
+      return wcsrtombs (NULL, &temp_src, (size_t)-1, ps);
     }
   else
 # endif
@@ -51,78 +51,6 @@ rpl_wcsrtombs (char *dest, const wchar_t **srcp, size_t len, mbstate_t *ps)
 # include <stdlib.h>
 # include <string.h>
 
-size_t
-wcsrtombs (char *dest, const wchar_t **srcp, size_t len, mbstate_t *ps)
-{
-  if (ps == NULL)
-    ps = &_gl_wcsrtombs_state;
-  {
-    const wchar_t *src = *srcp;
-    size_t cur_max = MB_CUR_MAX;
-    char buf[64];
-
-    if (!(cur_max <= sizeof (buf)))
-      abort ();
-
-    if (dest != NULL)
-      {
-        char *destptr = dest;
-
-        for (; len > 0; src++)
-          {
-            wchar_t wc = *src;
-            size_t ret = wcrtomb (len >= cur_max ? destptr : buf, wc, ps);
-
-            if (ret == (size_t)(-1))
-              goto bad_input;
-            if (!(ret <= cur_max))
-              abort ();
-            if (len < ret)
-              break;
-            if (len < cur_max)
-              memcpy (destptr, buf, ret);
-            if (wc == 0)
-              {
-                src = NULL;
-                /* Here mbsinit (ps).  */
-                break;
-              }
-            destptr += ret;
-            len -= ret;
-          }
-        *srcp = src;
-        return destptr - dest;
-      }
-    else
-      {
-        /* Ignore dest and len, don't store *srcp at the end, and
-           don't clobber *ps.  */
-        mbstate_t state = *ps;
-        size_t totalcount = 0;
-
-        for (;; src++)
-          {
-            wchar_t wc = *src;
-            size_t ret = wcrtomb (buf, wc, &state);
-
-            if (ret == (size_t)(-1))
-              goto bad_input2;
-            if (wc == 0)
-              {
-                /* Here mbsinit (&state).  */
-                break;
-              }
-            totalcount += ret;
-          }
-        return totalcount;
-      }
-
-   bad_input:
-    *srcp = src;
-   bad_input2:
-    errno = EILSEQ;
-    return (size_t)(-1);
-  }
-}
+# include "wcsrtombs-impl.h"
 
 #endif