Changeset 4f3aa76 in mainline for kernel/generic/src/console/kconsole.c

Timestamp:

2018-11-09T22:03:24Z (5 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

ba9a150

Parents:

b389f95

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-11-08 01:26:04)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-11-09 22:03:24)

Message:

Remove nfmalloc()

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;
@@ -325 +331 @@
 }
 
-NO_TRACE static wchar_t *clever_readline(const char *prompt, indev_t *indev)
+NO_TRACE static wchar_t *clever_readline(const char *prompt, indev_t *indev,
+    char *tmp)
 {
         printf("%s> ", prompt);
@@ -332 +339 @@
         wchar_t *current = history[history_pos];
         current[0] = 0;
-        char *tmp = nfmalloc(STR_BOUNDS(MAX_CMDLINE));
 
         while (true) {
@@ -534 +540 @@
         }
 
-        free(tmp);
         return current;
 }
@@ -809 +814 @@
                 printf("Type \"exit\" to leave the console.\n");
 
-        char *cmdline = nfmalloc(STR_BOUNDS(MAX_CMDLINE));
+        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;
+        }
+
         while (true) {
-                wchar_t *tmp = clever_readline((char *) prompt, stdin);
+                wchar_t *tmp = clever_readline((char *) prompt, stdin, buffer);
                 size_t len = wstr_length(tmp);
                 if (!len)
@@ -827 +841 @@
                 (void) cmd_info->func(cmd_info->argv);
         }
+        free(buffer);
         free(cmdline);
 }