Changeset 33fee91 in mainline for uspace/app/bdsh

Timestamp:

2012-08-31T07:35:27Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

a3da2b2

Parents:

72cf064 (diff), 0d57c3e (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

Location:

uspace/app/bdsh

Files:

• cmds/modules/bdd/bdd.c (modified) (1 diff)
• errors.h (modified) (2 diffs)
• input.c (modified) (4 diffs)

uspace/app/bdsh/cmds/modules/bdd/bdd.c

@@ -38 +38 @@
 #include "cmds.h"
 
-#include <libblock.h>
+#include <block.h>
 #include <loc.h>
 #include <errno.h>

uspace/app/bdsh/errors.h

@@ -30 +30 @@
 #define ERRORS_H
 
+#include <io/verify.h>
+
 /* Various error levels */
 #define CL_EFATAL  -1
@@ -46 +48 @@
 extern volatile int cli_errno;
 
-extern void cli_error(int, const char *, ...);
+extern void cli_error(int, const char *, ...)
+    PRINTF_ATTRIBUTE(2, 3);
 
 #endif

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