remove wide printf dependency on ugly hack in vfprintf

commit d42269d7c85308abdbf8cee38b1a1097249eb38b appropriated the
stream error flag temporarily to let the printf family of functions
suppress further output attempts after encountering a write error.
since the wide printf code relies on (narrow) vfprintf to print
padding and numeric conversions, a hack was put in vfprintf not to
clear the initial error status unless the stream is narrow oriented.
this was okay, because calling vfprintf on a wide-oriented stream
(outside of internal use by the implementation) produces undefined
behavior. however, it was highly non-obvious to anyone reading the
wide printf code, where the calls to fprintf without first checking
for error status appeared erroneous.

this patch removes all direct use of fprintf from the wide printf
core, except in the numeric conversions case where it was already
checked before starting processing of the directive that the error
status is not set. the other calls, which were performing padding, are
replaced by a new pad() helper function, which performs the check and
abstracts out the mechanism of writing the padding.

direct use of the error flag is also replaced by ferror, which is
defined as a macro in stdio_impl.h, expanding directly to the flag
check with no call or locking overhead.

diff --git a/src/stdio/vfprintf.c b/src/stdio/vfprintf.c
index 2dbdb5e..7b84808 100644 (file)
--- a/src/stdio/vfprintf.c
+++ b/src/stdio/vfprintf.c
@@ -677,7 +677,7 @@ int vfprintf(FILE *restrict f, const char *restrict fmt, va_list ap)
 
        FLOCK(f);
        olderr = f->flags & F_ERR;
-       if (f->mode < 1) f->flags &= ~F_ERR;
+       f->flags &= ~F_ERR;
        if (!f->buf_size) {
                saved_buf = f->buf;
                f->buf = internal_buf;

diff --git a/src/stdio/vfwprintf.c b/src/stdio/vfwprintf.c
index 119fdff..1878411 100644 (file)
--- a/src/stdio/vfwprintf.c
+++ b/src/stdio/vfwprintf.c
@@ -125,7 +125,13 @@ static void pop_arg(union arg *arg, int type, va_list *ap)
 
 static void out(FILE *f, const wchar_t *s, size_t l)
 {
-       while (l-- && !(f->flags & F_ERR)) fputwc(*s++, f);
+       while (l-- && !ferror(f)) fputwc(*s++, f);
+}
+
+static void pad(FILE *f, int n, int fl)
+{
+       if ((fl & LEFT_ADJ) || !n || ferror(f)) return;
+       fprintf(f, "%*s", n, "");
 }
 
 static int getint(wchar_t **s) {
@@ -264,9 +270,9 @@ static int wprintf_core(FILE *f, const wchar_t *fmt, va_list *ap, union arg *nl_
                case 'c':
                case 'C':
                        if (w<1) w=1;
-                       if (w>1 && !(fl&LEFT_ADJ)) fprintf(f, "%*s", w-1, "");
+                       pad(f, w-1, fl);
                        out(f, &(wchar_t){t=='C' ? arg.i : btowc(arg.i)}, 1);
-                       if (w>1 && (fl&LEFT_ADJ)) fprintf(f, "%*s", w-1, "");
+                       pad(f, w-1, fl^LEFT_ADJ);
                        l = w;
                        continue;
                case 'S':
@@ -275,9 +281,9 @@ static int wprintf_core(FILE *f, const wchar_t *fmt, va_list *ap, union arg *nl_
                        if (p<0 && *z) goto overflow;
                        p = z-a;
                        if (w<p) w=p;
-                       if (!(fl&LEFT_ADJ)) fprintf(f, "%*s", w-p, "");
+                       pad(f, w-p, fl);
                        out(f, a, p);
-                       if ((fl&LEFT_ADJ)) fprintf(f, "%*s", w-p, "");
+                       pad(f, w-p, fl^LEFT_ADJ);
                        l=w;
                        continue;
                case 'm':
@@ -290,14 +296,14 @@ static int wprintf_core(FILE *f, const wchar_t *fmt, va_list *ap, union arg *nl_
                        if (p<0 && *bs) goto overflow;
                        p=l;
                        if (w<p) w=p;
-                       if (!(fl&LEFT_ADJ)) fprintf(f, "%*s", w-p, "");
+                       pad(f, w-p, fl);
                        bs = arg.p;
                        while (l--) {
                                i=mbtowc(&wc, bs, MB_LEN_MAX);
                                bs+=i;
                                out(f, &wc, 1);
                        }
-                       if ((fl&LEFT_ADJ)) fprintf(f, "%*s", w-p, "");
+                       pad(f, w-p, fl^LEFT_ADJ);
                        l=w;
                        continue;
                }
@@ -358,7 +364,7 @@ int vfwprintf(FILE *restrict f, const wchar_t *restrict fmt, va_list ap)
        olderr = f->flags & F_ERR;
        f->flags &= ~F_ERR;
        ret = wprintf_core(f, fmt, &ap2, nl_arg, nl_type);
-       if (f->flags & F_ERR) ret = -1;
+       if (ferror(f)) ret = -1;
        f->flags |= olderr;
        FUNLOCK(f);
        va_end(ap2);