Changeset 28a5ebd in mainline for kernel/generic/src/console/kconsole.c

Timestamp:

2020-06-18T15:39:50Z (4 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

ce52c333

Parents:

4f663f3e

Message:

Use char32_t instead of wchat_t to represent UTF-32 strings

The intention of the native HelenOS string API has been always to
support Unicode in the UTF-8 and UTF-32 encodings as the sole character
representations and ignore the obsolete mess of older single-byte and
multibyte character encodings. Before C11, the wchar_t type has been
slightly misused for the purpose of the UTF-32 strings. The newer
char32_t type is obviously a much more suitable option. The standard
defines char32_t as uint_least32_t, thus we can take the liberty to fix
it to uint32_t.

To maintain compatilibity with the C Standard, the putwchar(wchar_t)
functions has been replaced by our custom putuchar(char32_t) functions
where appropriate.

File:

• kernel/generic/src/console/kconsole.c (modified) (11 diffs)

kernel/generic/src/console/kconsole.c

@@ -86 +86 @@
 LIST_INITIALIZE(cmd_list);      /**< Command list. */
 
-static wchar_t history[KCONSOLE_HISTORY][MAX_CMDLINE] = { };
+static char32_t history[KCONSOLE_HISTORY][MAX_CMDLINE] = { };
 static size_t history_pos = 0;
 
@@ -156 +156 @@
 
 /** Print count times a character */
-_NO_TRACE static void print_cc(wchar_t ch, size_t count)
+_NO_TRACE static void print_cc(char32_t ch, size_t count)
 {
         size_t i;
         for (i = 0; i < count; i++)
-                putwchar(ch);
+                putuchar(ch);
 }
 
@@ -290 +290 @@
 }
 
-_NO_TRACE static cmd_info_t *parse_cmd(const wchar_t *cmdline)
+_NO_TRACE static cmd_info_t *parse_cmd(const char32_t *cmdline)
 {
         size_t start = 0;
@@ -331 +331 @@
 }
 
-_NO_TRACE static wchar_t *clever_readline(const char *prompt, indev_t *indev,
+_NO_TRACE static char32_t *clever_readline(const char *prompt, indev_t *indev,
     char *tmp)
 {
@@ -337 +337 @@
 
         size_t position = 0;
-        wchar_t *current = history[history_pos];
+        char32_t *current = history[history_pos];
         current[0] = 0;
 
         while (true) {
-                wchar_t ch = indev_pop_character(indev);
+                char32_t ch = indev_pop_character(indev);
 
                 if (ch == '\n') {
                         /* Enter */
-                        putwchar(ch);
+                        putuchar(ch);
                         break;
                 }
@@ -356 +356 @@
                         if (wstr_remove(current, position - 1)) {
                                 position--;
-                                putwchar('\b');
+                                putuchar('\b');
                                 printf("%ls ", current + position);
                                 print_cc('\b', wstr_length(current) - position + 1);
@@ -369 +369 @@
                         for (; (current[position] != 0) && (!isspace(current[position]));
                             position++)
-                                putwchar(current[position]);
+                                putuchar(current[position]);
 
                         /*
@@ -464 +464 @@
                         /* Left */
                         if (position > 0) {
-                                putwchar('\b');
+                                putuchar('\b');
                                 position--;
                         }
@@ -473 +473 @@
                         /* Right */
                         if (position < wstr_length(current)) {
-                                putwchar(current[position]);
+                                putuchar(current[position]);
                                 position++;
                         }
@@ -646 +646 @@
         size_t offset = *start;
         size_t prev = *start;
-        wchar_t ch;
+        char32_t ch;
 
         while ((ch = str_decode(cmdline, &offset, size)) != 0) {
@@ -825 +825 @@
 
         while (true) {
-                wchar_t *tmp = clever_readline((char *) prompt, stdin, buffer);
+                char32_t *tmp = clever_readline((char *) prompt, stdin, buffer);
                 size_t len = wstr_length(tmp);
                 if (!len)