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/vfwscanf.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/vfwscanf.c')
| -rw-r--r-- | lib/libc/stdio/vfwscanf.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/lib/libc/stdio/vfwscanf.c b/lib/libc/stdio/vfwscanf.c index 9cc67ac..ee0c85e 100644 --- a/lib/libc/stdio/vfwscanf.c +++ b/lib/libc/stdio/vfwscanf.c @@ -148,6 +148,8 @@ __vfwscanf(FILE * __restrict fp, const wchar_t * __restrict fmt, va_list ap) char *mbp; /* multibyte string pointer for %c %s %[ */ size_t nconv; /* number of bytes in mb. conversion */ char mbbuf[MB_LEN_MAX]; /* temporary mb. character buffer */ + static const mbstate_t initial; + mbstate_t mbs; /* `basefix' is used to avoid `if' tests in the integer scanner */ static short basefix[17] = @@ -379,16 +381,17 @@ literal: if (!(flags & SUPPRESS)) mbp = va_arg(ap, char *); n = 0; + mbs = initial; while (width != 0 && (wi = __fgetwc(fp)) != WEOF) { if (width >= MB_CUR_MAX && !(flags & SUPPRESS)) { - nconv = wcrtomb(mbp, wi, NULL); + nconv = wcrtomb(mbp, wi, &mbs); if (nconv == (size_t)-1) goto input_failure; } else { nconv = wcrtomb(mbbuf, wi, - NULL); + &mbs); if (nconv == (size_t)-1) goto input_failure; if (nconv > width) { @@ -443,16 +446,17 @@ literal: if (!(flags & SUPPRESS)) mbp = va_arg(ap, char *); n = 0; + mbs = initial; while ((wi = __fgetwc(fp)) != WEOF && width != 0 && INCCL(wi)) { if (width >= MB_CUR_MAX && !(flags & SUPPRESS)) { - nconv = wcrtomb(mbp, wi, NULL); + nconv = wcrtomb(mbp, wi, &mbs); if (nconv == (size_t)-1) goto input_failure; } else { nconv = wcrtomb(mbbuf, wi, - NULL); + &mbs); if (nconv == (size_t)-1) goto input_failure; if (nconv > width) @@ -503,17 +507,18 @@ literal: } else { if (!(flags & SUPPRESS)) mbp = va_arg(ap, char *); + mbs = initial; while ((wi = __fgetwc(fp)) != WEOF && width != 0 && !iswspace(wi)) { if (width >= MB_CUR_MAX && !(flags & SUPPRESS)) { - nconv = wcrtomb(mbp, wi, NULL); + nconv = wcrtomb(mbp, wi, &mbs); if (nconv == (size_t)-1) goto input_failure; } else { nconv = wcrtomb(mbbuf, wi, - NULL); + &mbs); if (nconv == (size_t)-1) goto input_failure; if (nconv > width) |
