From 7bbf7c12548fef40a0872e32d5c6f0903c5ea147 Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Wed, 2 Jul 2014 12:09:48 -0400 Subject: fix failure of wide printf/scanf functions to set wide orientation in some cases, these functions internally call a byte-based input or output function before calling getwc/putwc, so they cannot rely on the latter to set the orientation. (cherry picked from commit 984c25b74da085c6ae6b44a87bbd5f8afc9be331) --- src/stdio/vfwprintf.c | 1 + src/stdio/vfwscanf.c | 2 ++ 2 files changed, 3 insertions(+) diff --git a/src/stdio/vfwprintf.c b/src/stdio/vfwprintf.c index 984ff7b7..c6400591 100644 --- a/src/stdio/vfwprintf.c +++ b/src/stdio/vfwprintf.c @@ -355,6 +355,7 @@ int vfwprintf(FILE *restrict f, const wchar_t *restrict fmt, va_list ap) } FLOCK(f); + f->mode |= f->mode+1; ret = wprintf_core(f, fmt, &ap2, nl_arg, nl_type); FUNLOCK(f); va_end(ap2); diff --git a/src/stdio/vfwscanf.c b/src/stdio/vfwscanf.c index f8f4b70f..ac5c2c24 100644 --- a/src/stdio/vfwscanf.c +++ b/src/stdio/vfwscanf.c @@ -104,6 +104,8 @@ int vfwscanf(FILE *restrict f, const wchar_t *restrict fmt, va_list ap) FLOCK(f); + f->mode |= f->mode+1; + for (p=fmt; *p; p++) { alloc = 0; -- cgit v1.2.1