diff options
| author | tjr <tjr@FreeBSD.org> | 2004-04-07 09:47:56 +0000 |
|---|---|---|
| committer | tjr <tjr@FreeBSD.org> | 2004-04-07 09:47:56 +0000 |
| commit | 47b6d3f343e62032508f100d95214514de623db3 (patch) | |
| tree | 11fa0f1538982249c0bab94e73e6639ddeab7213 /lib/libc/string/wcsxfrm.c | |
| parent | c3bbcd6ef65ea72fcde434bb55ca4a100f825f7c (diff) | |
| download | FreeBSD-src-47b6d3f343e62032508f100d95214514de623db3.zip FreeBSD-src-47b6d3f343e62032508f100d95214514de623db3.tar.gz | |
Prepare to handle state-dependent encodings. This mainly involves not
taking shortcuts when it comes to storing and passing around conversion
states.
Diffstat (limited to 'lib/libc/string/wcsxfrm.c')
| -rw-r--r-- | lib/libc/string/wcsxfrm.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/libc/string/wcsxfrm.c b/lib/libc/string/wcsxfrm.c index 4e988af..5e47ad9 100644 --- a/lib/libc/string/wcsxfrm.c +++ b/lib/libc/string/wcsxfrm.c @@ -97,16 +97,20 @@ wcsxfrm(wchar_t * __restrict dest, const wchar_t * __restrict src, size_t len) static char * __mbsdup(const wchar_t *ws) { + static const mbstate_t initial; + mbstate_t st; const wchar_t *wcp; size_t len; char *mbs; wcp = ws; - if ((len = wcsrtombs(NULL, &wcp, 0, NULL)) == (size_t)-1) + st = initial; + if ((len = wcsrtombs(NULL, &wcp, 0, &st)) == (size_t)-1) return (NULL); if ((mbs = malloc(len + 1)) == NULL) return (NULL); - wcsrtombs(mbs, &ws, len + 1, NULL); + st = initial; + wcsrtombs(mbs, &ws, len + 1, &st); return (mbs); } |
