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

Timestamp:

2011-08-21T11:44:59Z (13 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

25c1b2c, bd5f3b7, d1e196f7

Parents:

c22531fc (diff), 1877128 (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.

git-author:

Martin Sucha <> (2011-08-21 11:44:59)

git-committer:

Martin Decky <martin@…> (2011-08-21 11:44:59)

Message:

merge Martin Sucha's fixes and improvements

File:

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

uspace/app/bdsh/input.c

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