Changes in uspace/lib/c/generic/io/kio.c [690ad20:694ca3d6] in mainline

File:

• uspace/lib/c/generic/io/kio.c (modified) (4 diffs)

uspace/lib/c/generic/io/kio.c

@@ -34 +34 @@
  */
 
-#include <abi/syscall.h>
 #include <stddef.h>
 #include <libc.h>
@@ -113 +112 @@
 }
 
-size_t kio_read(char *buf, size_t n, size_t at)
-{
-        return __SYSCALL3(SYS_KIO_READ, (sysarg_t) buf, n, at);
-}
-
 /** Print formatted text to kio.
  *
@@ -137 +131 @@
 }
 
-static errno_t kio_vprintf_str_write(const char *str, size_t size, void *data)
+static int kio_vprintf_str_write(const char *str, size_t size, void *data)
 {
-        size_t wr = 0;
-        return kio_write(str, size, &wr);
+        size_t wr;
+
+        wr = 0;
+        (void) kio_write(str, size, &wr);
+        return str_nlength(str, wr);
+}
+
+static int kio_vprintf_wstr_write(const char32_t *str, size_t size, void *data)
+{
+        size_t offset = 0;
+        size_t chars = 0;
+        size_t wr;
+
+        while (offset < size) {
+                char buf[STR_BOUNDS(1)];
+                size_t sz = 0;
+
+                if (chr_encode(str[chars], buf, &sz, STR_BOUNDS(1)) == EOK)
+                        kio_write(buf, sz, &wr);
+
+                chars++;
+                offset += sizeof(char32_t);
+        }
+
+        return chars;
 }
 
@@ -155 +172 @@
         printf_spec_t ps = {
                 kio_vprintf_str_write,
+                kio_vprintf_wstr_write,
                 NULL
         };