Changeset 5e718d9 in mainline for uspace/app/bdsh

Timestamp:

2012-08-21T10:04:16Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

67edca6

Parents:

0da6c04 (diff), 6a97f2e (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 with upstream (lp:~wtachi/helenos/bithenge)

Location:

uspace/app/bdsh

Files:

• Makefile (modified) (1 diff)
• cmds/modules/bdd/bdd.c (modified) (1 diff)
• cmds/modules/cmp/cmp.c (added)
• cmds/modules/cmp/cmp.h (added)
• cmds/modules/cmp/cmp_def.h (added)
• cmds/modules/cmp/entry.h (added)
• cmds/modules/modules.h (modified) (2 diffs)
• input.c (modified) (4 diffs)

uspace/app/bdsh/Makefile

@@ -53 +53 @@
         cmds/modules/unmount/unmount.c \
         cmds/modules/kcon/kcon.c \
+        cmds/modules/cmp/cmp.c \
         cmds/builtins/batch/batch.c \
         cmds/builtins/exit/exit.c \

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/cmds/modules/modules.h

@@ -63 +63 @@
 #include "printf/entry.h"
 #include "echo/entry.h"
+#include "cmp/entry.h"
 
 /* Each .def function fills the module_t struct with the individual name, entry
@@ -86 +87 @@
 #include "printf/printf_def.h"
 #include "echo/echo_def.h"
+#include "cmp/cmp_def.h"
 
         {NULL, NULL, NULL, NULL}

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