Changeset 6b1a85c in mainline for kernel/generic/src/console/kconsole.c

Timestamp:

2010-07-13T21:54:38Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4003861

Parents:

5f83634 (diff), c0e9f3f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from lp:~jakub/helenos/upa.

File:

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

kernel/generic/src/console/kconsole.c

@@ -210 +210 @@
         link_t *pos = NULL;
         const char *hint;
-        char output[MAX_CMDLINE];
+        char *output = malloc(MAX_CMDLINE, 0);
         
         output[0] = 0;
@@ -235 +235 @@
                 str_cpy(input, size, output);
         
+        free(output);
         return found;
 }
@@ -245 +246 @@
         wchar_t *current = history[history_pos];
         current[0] = 0;
+        char *tmp = malloc(STR_BOUNDS(MAX_CMDLINE), 0);
         
         while (true) {
@@ -289 +291 @@
                                 beg++;
                         
-                        char tmp[STR_BOUNDS(MAX_CMDLINE)];
                         wstr_to_str(tmp, position - beg + 1, current + beg);
                         
@@ -415 +416 @@
         }
         
+        free(tmp);
         return current;
 }
@@ -630 +632 @@
                                         cmd->argv[i].vartype = ARG_TYPE_STRING;
                                 } else {
-                                        printf("Wrong synxtax.\n");
+                                        printf("Wrong syntax.\n");
                                         error = true;
                                 }
@@ -688 +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);
@@ -694 +697 @@
                         continue;
                 
-                char cmdline[STR_BOUNDS(MAX_CMDLINE)];
                 wstr_to_str(cmdline, STR_BOUNDS(MAX_CMDLINE), tmp);
                 
@@ -706 +708 @@
                 (void) cmd_info->func(cmd_info->argv);
         }
+        free(cmdline);
 }