Changeset f2b8cdc in mainline for uspace/lib/libc/generic/io/vprintf.c

Timestamp:

2009-04-04T22:04:28Z (16 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

b27eb71

Parents:

4527fb5

Message:

Copy printf with Unicode support to userspace.

File:

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

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

@@ -42 +42 @@
 static atomic_t printf_futex = FUTEX_INITIALIZER;
 
-static int vprintf_write(const char *str, size_t count, void *unused)
+static int vprintf_str_write(const char *str, size_t size, void *data)
 {
-        return write_stdout(str, count);
+        size_t offset = 0;
+        size_t prev;
+        count_t chars = 0;
+        
+        while (offset < size) {
+                prev = offset;
+                str_decode(str, &offset, size);
+                write_stdout(str + prev, offset - prev);
+                chars++;
+        }
+        
+        return chars;
 }
+
+static int vprintf_wstr_write(const wchar_t *str, size_t size, void *data)
+{
+        size_t offset = 0;
+        size_t boff;
+        count_t chars = 0;
+        char buf[4];
+        
+        while (offset < size) {
+                boff = 0;
+                chr_encode(str[chars], buf, &boff, 4);
+                write_stdout(buf, boff);
+                chars++;
+                offset += sizeof(wchar_t);
+        }
+        
+        return chars;
+}
+
 
 /** Print formatted text.
@@ -55 +85 @@
 {
         struct printf_spec ps = {
-                (int (*)(void *, size_t, void *)) vprintf_write,
+                vprintf_str_write,
+                vprintf_wstr_write,
                  NULL
         };