diff options
| author | tjr <tjr@FreeBSD.org> | 2004-04-07 09:55:05 +0000 |
|---|---|---|
| committer | tjr <tjr@FreeBSD.org> | 2004-04-07 09:55:05 +0000 |
| commit | 1c584f59a55cb440f0487854db33b28a08898f82 (patch) | |
| tree | 12c84b3433d9dfe7221d8772b9282c58a3f99811 /lib/libc/stdio/vswscanf.c | |
| parent | 226e976dd71faa4ff636611c2de2ce44dcce5ba9 (diff) | |
| download | FreeBSD-src-1c584f59a55cb440f0487854db33b28a08898f82.zip FreeBSD-src-1c584f59a55cb440f0487854db33b28a08898f82.tar.gz | |
Prepare to handle trivial state-dependent encodings. Full support for
state-dependent encodings with locking shifts will come later if there
is demand for it.
Diffstat (limited to 'lib/libc/stdio/vswscanf.c')
| -rw-r--r-- | lib/libc/stdio/vswscanf.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/libc/stdio/vswscanf.c b/lib/libc/stdio/vswscanf.c index 128e1a4..7b17e2f 100644 --- a/lib/libc/stdio/vswscanf.c +++ b/lib/libc/stdio/vswscanf.c @@ -64,6 +64,8 @@ int vswscanf(const wchar_t * __restrict str, const wchar_t * __restrict fmt, va_list ap) { + static const mbstate_t initial; + mbstate_t mbs; FILE f; struct __sFILEX ext; char *mbstr; @@ -76,7 +78,8 @@ vswscanf(const wchar_t * __restrict str, const wchar_t * __restrict fmt, */ if ((mbstr = malloc(wcslen(str) * MB_CUR_MAX + 1)) == NULL) return (EOF); - if ((mlen = wcsrtombs(mbstr, &str, SIZE_T_MAX, NULL)) == (size_t)-1) { + mbs = initial; + if ((mlen = wcsrtombs(mbstr, &str, SIZE_T_MAX, &mbs)) == (size_t)-1) { free(mbstr); return (EOF); } |
