X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fwcsnrtombs.c;h=a92207c3d9016c7498816bac954862fa57e193ae;hb=f09be9e0ac9122c6cdba13ba1ccb8280f2181faa;hp=0e0750b34cef26f06131e99cf13c0c8235507e20;hpb=d60f3b0c6b0f93a601acd1cfd3923f94ca05abb0;p=gnulib.git diff --git a/lib/wcsnrtombs.c b/lib/wcsnrtombs.c index 0e0750b34..a92207c3d 100644 --- a/lib/wcsnrtombs.c +++ b/lib/wcsnrtombs.c @@ -27,76 +27,4 @@ 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); - } -} +#include "wcsnrtombs-impl.h"