fix printf regression with alt-form octal, zero flag, and field width

[musl] / src / stdio / fgetwc.c

diff --git a/src/stdio/fgetwc.c b/src/stdio/fgetwc.c
index 6f9f9ec..e455cfe 100644 (file)
--- a/src/stdio/fgetwc.c
+++ b/src/stdio/fgetwc.c
@@ -1,6 +1,9 @@
 #include "stdio_impl.h"
+#include "locale_impl.h"
+#include <wchar.h>
+#include <errno.h>
 
-wint_t __fgetwc_unlocked(FILE *f)
+static wint_t __fgetwc_unlocked_internal(FILE *f)
 {
        mbstate_t st = { 0 };
        wchar_t wc;
@@ -8,8 +11,6 @@ wint_t __fgetwc_unlocked(FILE *f)
        unsigned char b;
        size_t l;
 
-       f->mode |= f->mode+1;
-
        /* Convert character from buffer if possible */
        if (f->rpos < f->rend) {
                l = mbrtowc(&wc, (void *)f->rpos, f->rend - f->rpos, &st);
@@ -37,6 +38,16 @@ wint_t __fgetwc_unlocked(FILE *f)
        return wc;
 }
 
+wint_t __fgetwc_unlocked(FILE *f)
+{
+       locale_t *ploc = &CURRENT_LOCALE, loc = *ploc;
+       if (f->mode <= 0) fwide(f, 1);
+       *ploc = f->locale;
+       wchar_t wc = __fgetwc_unlocked_internal(f);
+       *ploc = loc;
+       return wc;
+}
+
 wint_t fgetwc(FILE *f)
 {
        wint_t c;