diff options
| author |   Ulrich Drepper <drepper@redhat.com> | 2000-01-19 07:29:43 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2000-01-19 07:29:43 +0000 |
| commit | 6a07e1f8df9bee9a7d8bd87f27d796bd671a5109 (patch) | |
| tree | 3e4d935fe8a8662db3048b9abf32332888322ba7 /wcsmbs/mbrtowc.c | |
| parent | Update. (diff) | |
| download | glibc-6a07e1f8df9bee9a7d8bd87f27d796bd671a5109.tar.gz glibc-6a07e1f8df9bee9a7d8bd87f27d796bd671a5109.tar.bz2 glibc-6a07e1f8df9bee9a7d8bd87f27d796bd671a5109.zip | |
Update.
* wcsmbs/mbrtowc.c: Create temporary state object if no output is
written.
* wcsmbs/mbsrtowcs.c: Likewise.
* wcsmbs/wcrtomb.c: Likewise.
* wcsmbs/wcsrtombs.c: Likewise.
* wcsmbs/wcrtomb.c: Compute result correctly for successful call
with s == NULL.
Diffstat (limited to 'wcsmbs/mbrtowc.c')
| -rw-r--r-- | wcsmbs/mbrtowc.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/wcsmbs/mbrtowc.c b/wcsmbs/mbrtowc.c index cb0aa32bbc..2aeb67c154 100644 --- a/wcsmbs/mbrtowc.c +++ b/wcsmbs/mbrtowc.c @@ -34,6 +34,7 @@ static mbstate_t state; size_t __mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps) { + mbstate_t temp_state; wchar_t buf[1]; struct __gconv_step_data data; int status; @@ -57,6 +58,8 @@ __mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps) data.__outbuf = (char *) buf; s = ""; n = 1; + temp_state = *data.__statep; + data.__statep = &temp_state; } /* Make sure we use the correct function. */ |