Changeset 56fa418 in mainline for uspace/lib/libc

Timestamp:

2009-04-05T15:50:53Z (16 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

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

Children:

0175246

Parents:

726ef849

Message:

Make Czech layout work partially in bdsh.

Location:

uspace/lib/libc

Files:

• Makefile.toolchain (modified) (1 diff)
• generic/console.c (modified) (3 diffs)
• generic/io/io.c (modified) (2 diffs)
• include/console.h (modified) (2 diffs)

uspace/lib/libc/Makefile.toolchain

@@ -27 +27 @@
 #
 
-CFLAGS = -fno-builtin -Wall -Werror-implicit-function-declaration -Wmissing-prototypes -O3 -nostdlib -nostdinc -imacros $(LIBC_PREFIX)/../../../config.h -I$(LIBC_PREFIX)/include -pipe -g
+CFLAGS = -fno-builtin -Wall -Werror-implicit-function-declaration\
+    -fexec-charset=UTF-8 -fwide-exec-charset=UTF-32 -finput-charset=UTF-8\
+    -Wmissing-prototypes -O3 -nostdlib -nostdinc -imacros\
+    $(LIBC_PREFIX)/../../../config.h -I$(LIBC_PREFIX)/include -pipe -g
 LFLAGS = -M -N $(SOFTINT_PREFIX)/libsoftint.a
 AFLAGS =

uspace/lib/libc/generic/console.c

@@ -58 +58 @@
 
 static ssize_t cons_write(const char *buf, size_t nbyte);
-static void cons_putchar(int c);
+static void cons_putchar(wchar_t c);
 
 static void cbuffer_flush(void);
@@ -120 +120 @@
 }
 
-void console_putchar(int c)
-{
-        cbuffer_putc(c);
+void console_putchar(wchar_t c)
+{
+//      cbuffer_putc(c);
+        cbuffer_flush();
+        cons_putchar(c);
 }
 
@@ -163 +165 @@
 
 /** Write one character to the console via IPC. */
-static void cons_putchar(int c)
+static void cons_putchar(wchar_t c)
 {
         int cons_phone = console_phone_get(true);

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

@@ -37 +37 @@
 #include <stdio.h>
 #include <io/io.h>
+#include <string.h>
+#include <errno.h>
 
 const static char nl = '\n';
@@ -88 +90 @@
 int putchar(int c)
 {
-        unsigned char ch = c;
-        if (write_stdout((void *) &ch, 1) == 1)
+        char buf[STR_BOUNDS(1)];
+        size_t offs;
+
+        offs = 0;
+        if (chr_encode(c, buf, &offs, STR_BOUNDS(1)) != EOK)
+                return EOF;
+
+        if (write_stdout((void *) buf, offs) == offs)
                 return c;
-        
+
         return EOF;
 }

uspace/lib/libc/include/console.h

@@ -38 +38 @@
 #include <console/style.h>
 #include <console/color.h>
+#include <sys/types.h>
 #include <bool.h>
 
@@ -48 +49 @@
 extern void console_clear(void);
 extern void console_goto(int, int);
-extern void console_putchar(int);
+extern void console_putchar(wchar_t);
 extern ssize_t console_write(const char *buf, size_t nbyte);
 extern void console_putstr(const char *s);