diff options
| author | Jeff Johnston <jjohnstn@redhat.com> | 2003-11-06 03:46:59 +0300 |
|---|---|---|
| committer | Jeff Johnston <jjohnstn@redhat.com> | 2003-11-06 03:46:59 +0300 |
| commit | da2d12279bf5c0a9fad1b3b6598a24b090e3d6c6 (patch) | |
| tree | 1436b4f2f9e1f05c280173e9a8c25bf014840a1d /newlib | |
| parent | d417aec9089e59f0f667290ebe777ef554ac5103 (diff) | |
2003-11-05 Jeff Johnston <jjohnstn@redhat.com>
* libc/stdlib/wcsrtombs.c (_wcsrtombs_r): Numerous fixes
to make code work as specified in standard.
Diffstat (limited to 'newlib')
| -rw-r--r-- | newlib/ChangeLog | 5 | ||||
| -rw-r--r-- | newlib/libc/stdlib/wcsrtombs.c | 40 |
2 files changed, 29 insertions, 16 deletions
diff --git a/newlib/ChangeLog b/newlib/ChangeLog index fbf64ad60..e3708f280 100644 --- a/newlib/ChangeLog +++ b/newlib/ChangeLog @@ -1,3 +1,8 @@ +2003-11-05 Jeff Johnston <jjohnstn@redhat.com> + + * libc/stdlib/wcsrtombs.c (_wcsrtombs_r): Numerous fixes + to make code work as specified in standard. + 2003-10-23 Jeff Johnston <jjohnstn@redhat.com> * configure.in: Use absolute newlib basedir when forming diff --git a/newlib/libc/stdlib/wcsrtombs.c b/newlib/libc/stdlib/wcsrtombs.c index 431347866..677dfa1db 100644 --- a/newlib/libc/stdlib/wcsrtombs.c +++ b/newlib/libc/stdlib/wcsrtombs.c @@ -14,9 +14,9 @@ _DEFUN (_wcsrtombs_r, (r, dst, src, len, ps), { char *ptr = dst; char buff[10]; - int i, n; - int count; - wint_t wch; + wchar_t *pwcs; + size_t n; + int i; #ifdef MB_CAPABLE if (ps == NULL) @@ -26,11 +26,15 @@ _DEFUN (_wcsrtombs_r, (r, dst, src, len, ps), } #endif - n = (int)len; + /* If no dst pointer, treat len as maximum possible value. */ + if (dst == NULL) + len = (size_t)-1; - while (n > 0) + n = 0; + pwcs = (wchar_t *)(*src); + + while (n < len) { - wchar_t *pwcs = (wchar_t *)(*src); int count = ps->__count; wint_t wch = ps->__value.__wch; int bytes = _wctomb_r (r, buff, *pwcs, ps); @@ -40,29 +44,33 @@ _DEFUN (_wcsrtombs_r, (r, dst, src, len, ps), ps->__count = 0; return (size_t)-1; } - if (bytes <= n) + if (n <= len - bytes && bytes < len) { - for (i = 0; i < bytes; ++i) - *ptr++ = buff[i]; - - if (*pwcs == 0x00) + n += bytes; + if (dst) + { + for (i = 0; i < bytes; ++i) + *ptr++ = buff[i]; + ++(*src); + } + if (*pwcs++ == 0x00) { - *src = NULL; + if (dst) + *src = NULL; ps->__count = 0; - return (size_t)(ptr - dst - 1); + return n - 1; } - ++(*src); } else { /* not enough room, we must back up state to before _wctomb_r call */ ps->__count = count; ps->__value.__wch = wch; + len = 0; } - n -= bytes; } - return (size_t)(ptr - dst); + return n; } #ifndef _REENT_ONLY |