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)

diff --git a/src/stdio/vfwprintf.c b/src/stdio/vfwprintf.c
index 984ff7b7fc8b9c2c0157786ed7fd5d00a4230dd8..c6400591a01ac7d6e257721eb0ed19b4f3a5a556 100644 (file)
--- 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 f8f4b70fded0c7aae0acd2e7f05ec8efdc426515..ac5c2c24f7018175c4aed172a1bf43108532eacb 100644 (file)
--- 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;