Changeset eec616b in mainline for kernel/generic/src/printf/vprintf.c

Timestamp:

2009-03-24T14:43:25Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

8f29e336

Parents:

74c8da2c

Message:

Unicode aware printf and family functions
(this breaks some things, but will be fixed soon)

File:

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

kernel/generic/src/printf/vprintf.c

@@ -27 +27 @@
  */
 
-/** @addtogroup generic 
+/** @addtogroup generic
  * @{
  */
@@ -40 +40 @@
 #include <arch/types.h>
 #include <typedefs.h>
+#include <string.h>
 
-SPINLOCK_INITIALIZE(printf_lock);                       /**< vprintf spinlock */
+SPINLOCK_INITIALIZE(printf_lock);  /**< vprintf spinlock */
 
-static int vprintf_write(const char *str, size_t count, void *unused)
+static int vprintf_write_utf8(const char *str, size_t size, void *data)
 {
-        size_t i;
-        for (i = 0; i < count; i++)
-                putchar(str[i]);
-        return i;
+        index_t index = 0;
+        index_t chars = 0;
+        
+        while (index < size) {
+                putchar(utf8_decode(str, &index, size - 1));
+                index++;
+                chars++;
+        }
+        
+        return chars;
 }
 
-int puts(const char *s)
+static int vprintf_write_utf32(const wchar_t *str, size_t size, void *data)
 {
-        size_t i;
-        for (i = 0; s[i] != 0; i++)
-                putchar(s[i]);
-        return i;
+        index_t index = 0;
+        
+        while (index < (size / sizeof(wchar_t))) {
+                putchar(str[index]);
+                index++;
+        }
+        
+        return index;
+}
+
+int puts(const char *str)
+{
+        index_t index = 0;
+        index_t chars = 0;
+        wchar_t uc;
+        
+        while ((uc = utf8_decode(str, &index, UTF8_NO_LIMIT)) != 0) {
+                putchar(uc);
+                index++;
+                chars++;
+        }
+        
+        return chars;
 }
 
 int vprintf(const char *fmt, va_list ap)
 {
-        struct printf_spec ps = {(int(*)(void *, size_t, void *)) vprintf_write, NULL};
+        printf_spec_t ps = {
+                vprintf_write_utf8,
+                vprintf_write_utf32,
+                NULL
+        };
         
         ipl_t ipl = interrupts_disable();