Changeset ec7f8b1 in mainline for uspace/app/bdsh/input.c

Timestamp:

2011-08-21T15:35:03Z (13 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

bb74dabe

Parents:

c4a8e4a (diff), 5935c079 (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 mainline changes.

File:

• uspace/app/bdsh/input.c (modified) (3 diffs)

uspace/app/bdsh/input.c

@@ -67 +67 @@
 int process_input(cliuser_t *usr)
 {
+        token_t *tokens = calloc(WORD_MAX, sizeof(token_t));
+        if (tokens == NULL)
+                return ENOMEM;
+        
         char *cmd[WORD_MAX];
-        token_t tokens_space[WORD_MAX];
-        token_t *tokens = tokens_space;
         int rc = 0;
         tokenizer_t tok;
@@ -77 +79 @@
         char *redir_to = NULL;
 
-        if (NULL == usr->line)
+        if (usr->line == NULL) {
+                free(tokens);
                 return CL_EFAIL;
+        }
 
         rc = tok_init(&tok, usr->line, tokens, WORD_MAX);
@@ -209 +213 @@
         }
         tok_fini(&tok);
+        free(tokens);
 
         return rc;