Changeset 00aece0 in mainline for uspace/app/bdsh/input.c

Timestamp:

2012-02-18T16:47:38Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4449c6c

Parents:

bd5f3b7 (diff), f943dd3 (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)
 {
-        char *cmd[WORD_MAX];
         token_t *tokens = calloc(WORD_MAX, sizeof(token_t));
         if (tokens == NULL)
                 return ENOMEM;
+        
+        char *cmd[WORD_MAX];
         int rc = 0;
         tokenizer_t tok;
@@ -78 +79 @@
         char *redir_to = NULL;
 
-        if (NULL == usr->line) {
+        if (usr->line == NULL) {
                 free(tokens);
                 return CL_EFAIL;
@@ -195 +196 @@
                 new_iostate.stdout = to;
         }
-        
+
         rc = run_command(cmd, usr, &new_iostate);