Changeset 3781092 in mainline for uspace/app/bdsh

Timestamp:

2011-09-09T18:22:33Z (15 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

40a2af3

Parents:

980671e7 (diff), 5da7199 (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:

• Makefile (modified) (1 diff)
• cmds/builtins/batch/batch.c (added)
• cmds/builtins/batch/batch.h (added)
• cmds/builtins/batch/batch_def.h (added)
• cmds/builtins/batch/entry.h (added)
• cmds/builtins/builtins.h (modified) (1 diff)
• cmds/modules/cat/cat.c (modified) (1 diff)
• cmds/modules/rm/rm.c (modified) (2 diffs)
• exec.c (modified) (1 diff)
• input.c (modified) (1 diff)

uspace/app/bdsh/Makefile

@@ -51 +51 @@
         cmds/modules/unmount/unmount.c \
         cmds/modules/kcon/kcon.c \
+        cmds/builtins/batch/batch.c \
         cmds/builtins/exit/exit.c \
         cmds/builtins/cd/cd.c \

uspace/app/bdsh/cmds/builtins/builtins.h

@@ -4 +4 @@
 #include "config.h"
 
+#include "batch/entry.h"
 #include "cd/entry.h"
 #include "exit/entry.h"
 
 builtin_t builtins[] = {
+#include "batch/batch_def.h"
 #include "cd/cd_def.h"
 #include "exit/exit_def.h"

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

@@ -103 +103 @@
 {
         console_set_pos(console, 0, console_rows-1);
-        console_set_color(console, COLOR_BLUE, COLOR_WHITE, 0);
+        console_set_color(console, COLOR_WHITE, COLOR_BLUE, 0);
         
         printf("ENTER/SPACE/PAGE DOWN - next page, "

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

@@ -95 +95 @@
         if (NULL != rm->cwd)
                 free(rm->cwd);
-
-        return;
 }
 
@@ -129 +127 @@
                 }
         }
+
+        closedir(dirp);
         
         return ret;

uspace/app/bdsh/exec.c

@@ -134 +134 @@
                 printf("%s: Failed waiting for command (%s)\n", progname,
                     str_error(rc));
+                return 1;
         } else if (texit != TASK_EXIT_NORMAL) {
                 printf("%s: Command failed (unexpectedly terminated)\n", progname);
+                return 1;
         } else if (retval != 0) {
                 printf("%s: Command failed (exit code %d)\n",
                     progname, retval);
+                return 1;
         }
 

uspace/app/bdsh/input.c

@@ -196 +196 @@
                 new_iostate.stdout = to;
         }
-        
+
         rc = run_command(cmd, usr, &new_iostate);