major stdio overhaul, using readv/writev, plus other changes

[musl] / src / stdio / vdprintf.c

diff --git a/src/stdio/vdprintf.c b/src/stdio/vdprintf.c
index bfb1b0a..faf9536 100644 (file)
--- a/src/stdio/vdprintf.c
+++ b/src/stdio/vdprintf.c
@@ -1,14 +1,19 @@
 #include "stdio_impl.h"
 
+static size_t wrap_write(FILE *f, const unsigned char *buf, size_t len)
+{
+       return __stdio_write(f, buf, len);
+}
+
 int vdprintf(int fd, const char *fmt, va_list ap)
 {
        int r;
-       char buf[BUFSIZ];
+       unsigned char buf[BUFSIZ];
        FILE f = {
-               .fd = fd, .lbf = EOF, .write = __stdio_write,
-               .buf = buf+UNGET, .buf_size = sizeof buf - UNGET
+               .fd = fd, .lbf = EOF, .write = wrap_write,
+               .buf = buf+UNGET, .buf_size = sizeof buf - UNGET,
+               .lock = -1
        };
        r = vfprintf(&f, fmt, ap);
-       __oflow(&f);
-       return r;
+       return fflush(&f) ? EOF : r;
 }