Changes in uspace/lib/c/generic/io/vprintf.c [163e34c:28a5ebd] in mainline

File:

• uspace/lib/c/generic/io/vprintf.c (modified) (3 diffs)

uspace/lib/c/generic/io/vprintf.c

@@ -35 +35 @@
 #include <stdarg.h>
 #include <stdio.h>
-#include <printf_core.h>
+#include <io/printf_core.h>
 #include <fibril_synch.h>
 #include <async.h>
@@ -42 +42 @@
 static FIBRIL_MUTEX_INITIALIZE(printf_mutex);
 
-static errno_t vprintf_str_write(const char *str, size_t size, void *stream)
+static int vprintf_str_write(const char *str, size_t size, void *stream)
 {
-        errno_t old_errno = errno;
+        size_t wr = fwrite(str, 1, size, (FILE *) stream);
+        return str_nlength(str, wr);
+}
 
-        errno = EOK;
-        size_t written = fwrite(str, 1, size, (FILE *) stream);
+static int vprintf_wstr_write(const char32_t *str, size_t size, void *stream)
+{
+        size_t offset = 0;
+        size_t chars = 0;
 
-        if (errno == EOK && written != size)
-                errno = EIO;
+        while (offset < size) {
+                if (fputuc(str[chars], (FILE *) stream) <= 0)
+                        break;
 
-        if (errno != EOK)
-                return errno;
+                chars++;
+                offset += sizeof(char32_t);
+        }
 
-        errno = old_errno;
-        return EOK;
+        return chars;
 }
 
@@ -72 +77 @@
         printf_spec_t ps = {
                 vprintf_str_write,
+                vprintf_wstr_write,
                 stream
         };