Changes in uspace/app/bdsh/input.c [9d58539:3e6a98c5] in mainline

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;
         }