Changes in kernel/generic/src/console/kconsole.c [4ce914d4:a7199c2] in mainline

File:

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

kernel/generic/src/console/kconsole.c

@@ -160 +160 @@
 
 /** Print count times a character */
-static void print_cc(wchar_t ch, size_t count)
+NO_TRACE static void print_cc(wchar_t ch, size_t count)
 {
         size_t i;
@@ -168 +168 @@
 
 /** Try to find a command beginning with prefix */
-static const char *cmdtab_search_one(const char *name, link_t **startpos)
+NO_TRACE static const char *cmdtab_search_one(const char *name,
+    link_t **startpos)
 {
         size_t namelen = str_length(name);
@@ -202 +203 @@
  *
  */
-static int cmdtab_compl(char *input, size_t size)
+NO_TRACE static int cmdtab_compl(char *input, size_t size)
 {
         const char *name = input;
@@ -209 +210 @@
         link_t *pos = NULL;
         const char *hint;
-        char output[MAX_CMDLINE];
+        char *output = malloc(MAX_CMDLINE, 0);
         
         output[0] = 0;
@@ -234 +235 @@
                 str_cpy(input, size, output);
         
+        free(output);
         return found;
 }
 
-static wchar_t *clever_readline(const char *prompt, indev_t *indev)
+NO_TRACE static wchar_t *clever_readline(const char *prompt, indev_t *indev)
 {
         printf("%s> ", prompt);
@@ -244 +246 @@
         wchar_t *current = history[history_pos];
         current[0] = 0;
+        char *tmp = malloc(STR_BOUNDS(MAX_CMDLINE), 0);
         
         while (true) {
@@ -288 +291 @@
                                 beg++;
                         
-                        char tmp[STR_BOUNDS(MAX_CMDLINE)];
                         wstr_to_str(tmp, position - beg + 1, current + beg);
                         
@@ -414 +416 @@
         }
         
+        free(tmp);
         return current;
 }
@@ -422 +425 @@
 }
 
-static bool parse_int_arg(const char *text, size_t len, unative_t *result)
+NO_TRACE static bool parse_int_arg(const char *text, size_t len,
+    unative_t *result)
 {
         bool isaddr = false;
@@ -507 +511 @@
  *
  */
-static bool parse_argument(const char *cmdline, size_t size, size_t *start, size_t *end)
+NO_TRACE static bool parse_argument(const char *cmdline, size_t size,
+    size_t *start, size_t *end)
 {
         ASSERT(start != NULL);
@@ -543 +548 @@
  *
  */
-static cmd_info_t *parse_cmdline(const char *cmdline, size_t size)
+NO_TRACE static cmd_info_t *parse_cmdline(const char *cmdline, size_t size)
 {
         size_t start = 0;
@@ -590 +595 @@
         size_t i;
         for (i = 0; i < cmd->argc; i++) {
+                char *buf;
+                
                 start = end;
                 if (!parse_argument(cmdline, size, &start, &end)) {
+                        if (cmd->argv[i].type == ARG_TYPE_STRING_OPTIONAL) {
+                                buf = (char *) cmd->argv[i].buffer;
+                                str_cpy(buf, cmd->argv[i].len, "");
+                                continue;
+                        }
+                        
                         printf("Too few arguments.\n");
                         spinlock_unlock(&cmd->lock);
@@ -597 +610 @@
                 }
                 
-                char *buf;
                 switch (cmd->argv[i].type) {
                 case ARG_TYPE_STRING:
+                case ARG_TYPE_STRING_OPTIONAL:
                         buf = (char *) cmd->argv[i].buffer;
                         str_ncpy(buf, cmd->argv[i].len, cmdline + start,
@@ -619 +632 @@
                                         cmd->argv[i].vartype = ARG_TYPE_STRING;
                                 } else {
-                                        printf("Wrong synxtax.\n");
+                                        printf("Wrong syntax.\n");
                                         error = true;
                                 }
@@ -677 +690 @@
                 printf("Type \"exit\" to leave the console.\n");
         
+        char *cmdline = malloc(STR_BOUNDS(MAX_CMDLINE), 0);
         while (true) {
                 wchar_t *tmp = clever_readline((char *) prompt, stdin);
@@ -683 +697 @@
                         continue;
                 
-                char cmdline[STR_BOUNDS(MAX_CMDLINE)];
                 wstr_to_str(cmdline, STR_BOUNDS(MAX_CMDLINE), tmp);
                 
@@ -695 +708 @@
                 (void) cmd_info->func(cmd_info->argv);
         }
+        free(cmdline);
 }