Changes in kernel/generic/src/printf/vprintf.c [690ad20:163e34c] in mainline

File:

• kernel/generic/src/printf/vprintf.c (modified) (3 diffs)

kernel/generic/src/printf/vprintf.c

@@ -37 +37 @@
 #include <print.h>
 #include <printf_core.h>
+#include <putchar.h>
 #include <str.h>
 #include <synch/spinlock.h>
@@ -43 +44 @@
 static errno_t vprintf_str_write(const char *str, size_t size, void *data)
 {
-        putstr(str, size);
+        size_t offset = 0;
+
+        while (offset < size)
+                putuchar(str_decode(str, &offset, size));
+
         return EOK;
 }
@@ -49 +54 @@
 int puts(const char *str)
 {
-        size_t n = str_size(str);
-        putstr(str, n);
-        return n;
+        size_t offset = 0;
+        size_t chars = 0;
+        char32_t uc;
+
+        console_lock();
+
+        while ((uc = str_decode(str, &offset, STR_NO_LIMIT)) != 0) {
+                putuchar(uc);
+                chars++;
+        }
+
+        putuchar('\n');
+
+        console_unlock();
+        return chars;
 }