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

File:

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

kernel/generic/src/printf/vprintf.c

@@ -33 +33 @@
  */
 
+#include <print.h>
+#include <printf/printf_core.h>
+#include <putchar.h>
+#include <synch/spinlock.h>
 #include <arch/asm.h>
-#include <console/console.h>
-#include <print.h>
-#include <printf_core.h>
+#include <typedefs.h>
 #include <str.h>
-#include <synch/spinlock.h>
-#include <typedefs.h>
 
-static errno_t vprintf_str_write(const char *str, size_t size, void *data)
+static int vprintf_str_write(const char *str, size_t size, void *data)
 {
-        putstr(str, size);
-        return EOK;
+        size_t offset = 0;
+        size_t chars = 0;
+
+        while (offset < size) {
+                putuchar(str_decode(str, &offset, size));
+                chars++;
+        }
+
+        return chars;
+}
+
+static int vprintf_wstr_write(const char32_t *str, size_t size, void *data)
+{
+        size_t offset = 0;
+        size_t chars = 0;
+
+        while (offset < size) {
+                putuchar(str[chars]);
+                chars++;
+                offset += sizeof(char32_t);
+        }
+
+        return chars;
 }
 
 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;
+
+        while ((uc = str_decode(str, &offset, STR_NO_LIMIT)) != 0) {
+                putuchar(uc);
+                chars++;
+        }
+
+        putuchar('\n');
+        return chars;
 }
 
@@ -58 +87 @@
         printf_spec_t ps = {
                 vprintf_str_write,
+                vprintf_wstr_write,
                 NULL
         };
 
-        console_lock();
-        int ret = printf_core(fmt, &ps, ap);
-        console_unlock();
-        return ret;
+        return printf_core(fmt, &ps, ap);
 }