fix TCS* definitions in mips termios.h

[musl] / src / stdio / vfwprintf.c

diff --git a/src/stdio/vfwprintf.c b/src/stdio/vfwprintf.c
index ebdff00..f9f1ecf 100644 (file)
--- a/src/stdio/vfwprintf.c
+++ b/src/stdio/vfwprintf.c
@@ -288,26 +288,29 @@ static int wprintf_core(FILE *f, const wchar_t *fmt, va_list *ap, union arg *nl_
                        z = wmemchr(a, 0, p);
                        if (z) p=z-a;
                        if (w<p) w=p;
-                       if (!(fl&LEFT_ADJ)) fprintf(f, "%.*s", w-p, "");
+                       if (!(fl&LEFT_ADJ)) fprintf(f, "%*s", w-p, "");
                        out(f, a, p);
-                       if ((fl&LEFT_ADJ)) fprintf(f, "%.*s", w-p, "");
+                       if ((fl&LEFT_ADJ)) fprintf(f, "%*s", w-p, "");
                        l=w;
                        continue;
+               case 'm':
+                       arg.p = strerror(errno);
                case 's':
+                       if (!arg.p) arg.p = "(null)";
                        bs = arg.p;
                        if (p<0) p = INT_MAX;
                        for (i=l=0; l<p && (i=mbtowc(&wc, bs, MB_LEN_MAX))>0; bs+=i, l++);
                        if (i<0) return -1;
                        p=l;
                        if (w<p) w=p;
-                       if (!(fl&LEFT_ADJ)) fprintf(f, "%.*s", w-p, "");
+                       if (!(fl&LEFT_ADJ)) fprintf(f, "%*s", w-p, "");
                        bs = arg.p;
                        while (l--) {
                                i=mbtowc(&wc, bs, MB_LEN_MAX);
                                bs+=i;
                                fputwc(wc, f);
                        }
-                       if ((fl&LEFT_ADJ)) fprintf(f, "%.*s", w-p, "");
+                       if ((fl&LEFT_ADJ)) fprintf(f, "%*s", w-p, "");
                        l=w;
                        continue;
                }
@@ -356,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);