Changes in kernel/generic/src/console/kconsole.c [690ad20:fdfb24e] in mainline

File:

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

kernel/generic/src/console/kconsole.c

@@ -39 +39 @@
  */
 
+#include <assert.h>
+#include <console/kconsole.h>
+#include <console/console.h>
+#include <console/chardev.h>
+#include <console/cmd.h>
+#include <console/prompt.h>
+#include <stdio.h>
+#include <panic.h>
+#include <typedefs.h>
 #include <adt/list.h>
 #include <arch.h>
-#include <assert.h>
-#include <console/chardev.h>
-#include <console/cmd.h>
-#include <console/console.h>
-#include <console/kconsole.h>
-#include <console/prompt.h>
+#include <macros.h>
 #include <debug.h>
+#include <halt.h>
+#include <str.h>
+#include <sysinfo/sysinfo.h>
+#include <symtab.h>
 #include <errno.h>
-#include <halt.h>
-#include <macros.h>
-#include <panic.h>
-#include <stdio.h>
+#include <putchar.h>
 #include <stdlib.h>
-#include <str.h>
-#include <symtab.h>
-#include <sysinfo/sysinfo.h>
-#include <typedefs.h>
 
 /** Simple kernel console.
@@ -157 +158 @@
 
 /** Print count times a character */
-_NO_TRACE static void print_cc(char ch, size_t count)
-{
-        // FIXME: only lock once
-
-        for (size_t i = 0; i < count; i++)
-                putstr(&ch, 1);
+_NO_TRACE static void print_cc(char32_t ch, size_t count)
+{
+        size_t i;
+        for (i = 0; i < count; i++)
+                putuchar(ch);
 }
 
@@ -347 +347 @@
                 if (ch == '\n') {
                         /* Enter */
-                        putstr("\n", 1);
+                        putuchar(ch);
                         break;
                 }
@@ -358 +358 @@
                         if (wstr_remove(current, position - 1)) {
                                 position--;
-                                putstr("\b", 1);
+                                putuchar('\b');
                                 printf("%ls ", current + position);
                                 print_cc('\b', wstr_length(current) - position + 1);
@@ -368 +368 @@
                         /* Tab completion */
 
-                        size_t i = position;
-                        while (current[i] && !isspace(current[i]))
-                                i++;
-
-                        char32_t stash = current[i];
-                        current[i] = 0;
-                        printf("%ls", &current[position]);
-                        current[i] = stash;
-                        position = i;
+                        /* Move to the end of the word */
+                        for (; (current[position] != 0) && (!isspace(current[position]));
+                            position++)
+                                putuchar(current[position]);
 
                         /*
@@ -435 +430 @@
                          */
                         size_t off = 0;
-                        for (size_t i = 0; (ch = str_decode(tmp, &off, STR_NO_LIMIT)); i++)
+                        size_t i = 0;
+                        while ((ch = str_decode(tmp, &off, STR_NO_LIMIT)) != 0) {
                                 if (!wstr_linsert(current, ch, position + i, MAX_CMDLINE))
                                         break;
+
+                                i++;
+                        }
 
                         if (found > 1) {
@@ -467 +466 @@
                         /* Left */
                         if (position > 0) {
-                                putstr("\b", 1);
+                                putuchar('\b');
                                 position--;
                         }
@@ -476 +475 @@
                         /* Right */
                         if (position < wstr_length(current)) {
-                                printf("%lc", current[position]);
+                                putuchar(current[position]);
                                 position++;
                         }