X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fwcsnrtombs.c;h=09843013adc0061ee8eb2d63af4d60d4ce01df4c;hb=7ef6c64e210ac0979d7e8ac69bc5b5208c2405ab;hp=742b8579108a4a76c7c60135b80884377101b940;hpb=a35b7df64eb0863e3d0759691e4d041354d7030f;p=gnulib.git

diff --git a/lib/wcsnrtombs.c b/lib/wcsnrtombs.c
index 742b85791..09843013a 100644
--- a/lib/wcsnrtombs.c
+++ b/lib/wcsnrtombs.c
@@ -1,5 +1,5 @@
 /* Convert wide string to string.
-   Copyright (C) 2008 Free Software Foundation, Inc.
+   Copyright (C) 2008-2014 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2008.
 
    This program is free software: you can redistribute it and/or modify
@@ -20,85 +20,11 @@
 /* Specification.  */
 #include <wchar.h>
 
-# include <errno.h>
-# include <stdlib.h>
-# include <string.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
 
 
 extern mbstate_t _gl_wcsrtombs_state;
 
-size_t
-wcsnrtombs (char *dest, const wchar_t **srcp, size_t srclen, 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 (; srclen > 0 && len > 0; src++, srclen--)
-	  {
-	    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 (; srclen > 0; src++, srclen--)
-	  {
-	    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);
-  }
-}
-
-#endif
+#include "wcsnrtombs-impl.h"