Changeset 03362fbd in mainline for uspace/app/bdsh/input.c

Timestamp:

2013-02-09T23:14:45Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

22dfd38

Parents:

b5d2e57 (diff), 005b765 (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.

Conflict resulting from bool.h → stdbool.h move and ddf structs turning opaque.
Fails to boot to shell console.

File:

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

uspace/app/bdsh/input.c

@@ -41 +41 @@
 #include <errno.h>
 #include <assert.h>
-#include <bool.h>
+#include <stdbool.h>
 #include <tinput.h>
 
@@ -67 +67 @@
 int process_input(cliuser_t *usr)
 {
-        token_t *tokens = calloc(WORD_MAX, sizeof(token_t));
-        if (tokens == NULL)
+        token_t *tokens_buf = calloc(WORD_MAX, sizeof(token_t));
+        if (tokens_buf == NULL)
                 return ENOMEM;
+        token_t *tokens = tokens_buf;
         
         char *cmd[WORD_MAX];
@@ -80 +81 @@
 
         if (usr->line == NULL) {
-                free(tokens);
+                free(tokens_buf);
                 return CL_EFAIL;
         }
@@ -213 +214 @@
         }
         tok_fini(&tok);
-        free(tokens);
+        free(tokens_buf);
 
         return rc;
@@ -268 +269 @@
         if (rc != EOK) {
                 /* Error in communication with console */
+                cli_quit = 1;
                 return;
         }