fix idiom for setting stdio stream orientation to wide

the old idiom, f->mode |= f->mode+1, was adapted from the idiom for
setting byte orientation, f->mode |= f->mode-1, but the adaptation was
incorrect. unless the stream was alreasdy set byte-oriented, this code
incremented f->mode each time it was executed, which would eventually
lead to overflow. it could be fixed by changing it to f->mode |= 1,
but upcoming changes will require slightly more work at the time of
wide orientation, so it makes sense to just call fwide. as an
optimization in the single-character functions, fwide is only called
if the stream is not already wide-oriented.

diff --git a/src/stdio/fgetwc.c b/src/stdio/fgetwc.c
index 8626d54caa5dba9a5513da8ffaf180652443bf12..b261b44fde5697fef6e59ff91954133f8feecc74 100644 (file)
--- a/src/stdio/fgetwc.c
+++ b/src/stdio/fgetwc.c
@@ -10,7 +10,7 @@ wint_t __fgetwc_unlocked(FILE *f)
        unsigned char b;
        size_t l;
 
-       f->mode |= f->mode+1;
+       if (f->mode <= 0) fwide(f, 1);
 
        /* Convert character from buffer if possible */
        if (f->rpos < f->rend) {

diff --git a/src/stdio/fputwc.c b/src/stdio/fputwc.c
index 7b621dd2ff9a868cd08e3beeeff3f53887dc89d7..1bf165bfb850fa14d6a4a70fbed81b6ba773dc32 100644 (file)
--- a/src/stdio/fputwc.c
+++ b/src/stdio/fputwc.c
@@ -8,7 +8,7 @@ wint_t __fputwc_unlocked(wchar_t c, FILE *f)
        char mbc[MB_LEN_MAX];
        int l;
 
-       f->mode |= f->mode+1;
+       if (f->mode <= 0) fwide(f, 1);
 
        if (isascii(c)) {
                c = putc_unlocked(c, f);

diff --git a/src/stdio/fputws.c b/src/stdio/fputws.c
index 5723cbcd7a573a2879f25339be378dc817388025..317d65f136dd8bef134b00cd3dbb4b605d401ebd 100644 (file)
--- a/src/stdio/fputws.c
+++ b/src/stdio/fputws.c
@@ -8,7 +8,7 @@ int fputws(const wchar_t *restrict ws, FILE *restrict f)
 
        FLOCK(f);
 
-       f->mode |= f->mode+1;
+       fwide(f, 1);
 
        while (ws && (l = wcsrtombs((void *)buf, (void*)&ws, sizeof buf, 0))+1 > 1)
                if (__fwritex(buf, l, f) < l) {

diff --git a/src/stdio/ungetwc.c b/src/stdio/ungetwc.c
index 394f92ac9cba89474f74c00137a13cd53210e4b8..d4c7de39284a3fbf9fdacfb5dbedb26cd39a5ac7 100644 (file)
--- a/src/stdio/ungetwc.c
+++ b/src/stdio/ungetwc.c
@@ -11,7 +11,7 @@ wint_t ungetwc(wint_t c, FILE *f)
 
        FLOCK(f);
 
-       f->mode |= f->mode+1;
+       if (f->mode <= 0) fwide(f, 1);
 
        if (!f->rpos) __toread(f);
        if (!f->rpos || f->rpos < f->buf - UNGET + l || c == WEOF ||

diff --git a/src/stdio/vfwprintf.c b/src/stdio/vfwprintf.c
index deff9828e745acbe88db143ec9d3718a00f7c30d..f06d5aedb21bb3bae5d0600b1b8126db678add40 100644 (file)
--- a/src/stdio/vfwprintf.c
+++ b/src/stdio/vfwprintf.c
@@ -359,7 +359,7 @@ int vfwprintf(FILE *restrict f, const wchar_t *restrict fmt, va_list ap)
        }
 
        FLOCK(f);
-       f->mode |= f->mode+1;
+       fwide(f, 1);
        olderr = f->flags & F_ERR;
        f->flags &= ~F_ERR;
        ret = wprintf_core(f, fmt, &ap2, nl_arg, nl_type);

diff --git a/src/stdio/vfwscanf.c b/src/stdio/vfwscanf.c
index ac5c2c24f7018175c4aed172a1bf43108532eacb..223aad4f351c96bb2a2ca9f9e3e75b798546ac75 100644 (file)
--- a/src/stdio/vfwscanf.c
+++ b/src/stdio/vfwscanf.c
@@ -104,7 +104,7 @@ int vfwscanf(FILE *restrict f, const wchar_t *restrict fmt, va_list ap)
 
        FLOCK(f);
 
-       f->mode |= f->mode+1;
+       fwide(f, 1);
 
        for (p=fmt; *p; p++) {