Changes in kernel/generic/src/console/kconsole.c [4f3aa76:bab75df6] in mainline

File:

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

kernel/generic/src/console/kconsole.c

@@ -219 +219 @@
         const char *hint;
         const char *help;
+        char *output = nfmalloc(MAX_CMDLINE);
         size_t hints_to_show = MAX_TAB_HINTS - 1;
         size_t total_hints_shown = 0;
         bool continue_showing_hints = true;
-
-        char *output = malloc(MAX_CMDLINE);
-        if (!output) {
-                // TODO: fix the function so that it does not need allocation
-                printf("Can't complete command, out of memory.\n");
-                return 0;
-        }
 
         output[0] = 0;
@@ -331 +325 @@
 }
 
-NO_TRACE static wchar_t *clever_readline(const char *prompt, indev_t *indev,
-    char *tmp)
+NO_TRACE static wchar_t *clever_readline(const char *prompt, indev_t *indev)
 {
         printf("%s> ", prompt);
@@ -339 +332 @@
         wchar_t *current = history[history_pos];
         current[0] = 0;
+        char *tmp = nfmalloc(STR_BOUNDS(MAX_CMDLINE));
 
         while (true) {
@@ -540 +534 @@
         }
 
+        free(tmp);
         return current;
 }
@@ -814 +809 @@
                 printf("Type \"exit\" to leave the console.\n");
 
-        char *buffer = malloc(STR_BOUNDS(MAX_CMDLINE));
-        char *cmdline = malloc(STR_BOUNDS(MAX_CMDLINE));
-        if (!buffer || !cmdline) {
-                // TODO: fix the function so that it does not need allocations
-                printf("Can't start console, out of memory.\n");
-                free(buffer);
-                free(cmdline);
-                return;
-        }
-
+        char *cmdline = nfmalloc(STR_BOUNDS(MAX_CMDLINE));
         while (true) {
-                wchar_t *tmp = clever_readline((char *) prompt, stdin, buffer);
+                wchar_t *tmp = clever_readline((char *) prompt, stdin);
                 size_t len = wstr_length(tmp);
                 if (!len)
@@ -841 +827 @@
                 (void) cmd_info->func(cmd_info->argv);
         }
-        free(buffer);
         free(cmdline);
 }