rework langinfo code for ABI compat and for use by time code

[musl] / src / stdio / vswprintf.c

diff --git a/src/stdio/vswprintf.c b/src/stdio/vswprintf.c
index 31ea187..7d237ba 100644 (file)
--- a/src/stdio/vswprintf.c
+++ b/src/stdio/vswprintf.c
@@ -1,4 +1,9 @@
 #include "stdio_impl.h"
+#include <limits.h>
+#include <string.h>
+#include <errno.h>
+#include <stdint.h>
+#include <wchar.h>
 
 struct cookie {
        wchar_t *ws;
@@ -10,7 +15,9 @@ static size_t sw_write(FILE *f, const unsigned char *s, size_t l)
        size_t l0 = l;
        int i = 0;
        struct cookie *c = f->cookie;
-       while (c->l && l && (i=mbtowc(c->ws, s, l))>=0) {
+       if (s!=f->wbase && sw_write(f, f->wbase, f->wpos-f->wbase)==-1)
+               return -1;
+       while (c->l && l && (i=mbtowc(c->ws, (void *)s, l))>=0) {
                s+=i;
                l-=i;
                c->l--;
@@ -20,7 +27,7 @@ static size_t sw_write(FILE *f, const unsigned char *s, size_t l)
        return i<0 ? i : l0;
 }
 
-int vswprintf(wchar_t *s, size_t n, const wchar_t *fmt, va_list ap)
+int vswprintf(wchar_t *restrict s, size_t n, const wchar_t *restrict fmt, va_list ap)
 {
        int r;
        FILE f;
@@ -41,6 +48,6 @@ int vswprintf(wchar_t *s, size_t n, const wchar_t *fmt, va_list ap)
                return -1;
        }
        r = vfwprintf(&f, fmt, ap);
-       __oflow(&f);
+       sw_write(&f, 0, 0);
        return r>=n ? -1 : r;
 }