Changeset 6ea9a1d in mainline for uspace/app/bdsh/cmds

Timestamp:

2011-06-11T22:32:24Z (14 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

36ab7c7

Parents:

ae45201

Message:

Allow shell builtins to be redirected too

Location:

uspace/app/bdsh/cmds

Files:

• builtin_cmds.c (modified) (2 diffs)
• cmds.h (modified) (2 diffs)
• mod_cmds.c (modified) (1 diff)

uspace/app/bdsh/cmds/builtin_cmds.c

@@ -38 +38 @@
 #include "cmds.h"
 #include "builtin_aliases.h"
+#include "scli.h"
 
 extern volatile unsigned int cli_interactive;
@@ -101 +102 @@
 }
 
-int run_builtin(int builtin, char *argv[], cliuser_t *usr)
+int run_builtin(int builtin, char *argv[], cliuser_t *usr, iostate_t *new_iostate)
 {
+        int rc;
         builtin_t *cmd = builtins;
 
         cmd += builtin;
+        
+        iostate_t *old_iostate = get_iostate();
+        set_iostate(new_iostate);
+        
+        if (NULL != cmd->entry) {
+                rc = ((int)cmd->entry(argv, usr));
+        }
+        else {
+                rc = CL_ENOENT;
+        }
+        
+        set_iostate(old_iostate);
 
-        if (NULL != cmd->entry)
-                return((int)cmd->entry(argv, usr));
-
-        return CL_ENOENT;
+        return rc;
 }

uspace/app/bdsh/cmds/cmds.h

@@ -59 +59 @@
 extern char *alias_for_module(const char *);
 extern int help_module(int, unsigned int);
-extern int run_module(int, char *[]);
+extern int run_module(int, char *[], iostate_t *);
 
 /* Prototypes for builtin launchers */
@@ -67 +67 @@
 extern char *alias_for_builtin(const char *);
 extern int help_builtin(int, unsigned int);
-extern int run_builtin(int, char *[], cliuser_t *);
+extern int run_builtin(int, char *[], cliuser_t *, iostate_t *);
 
 #endif

uspace/app/bdsh/cmds/mod_cmds.c

@@ -124 +124 @@
 /* Invokes the module entry point modules[module], passing argv[] as an argument
  * stack. */
-int run_module(int module, char *argv[])
+int run_module(int module, char *argv[], iostate_t *new_iostate)
 {
+        int rc;
         module_t *mod = modules;
 
         mod += module;
+        
+        iostate_t *old_iostate = get_iostate();
+        set_iostate(new_iostate);
 
-        if (NULL != mod->entry)
-                return ((int)mod->entry(argv));
+        if (NULL != mod->entry) {
+                rc = ((int)mod->entry(argv));
+        }
+        else {
+                rc = CL_ENOENT;
+        }
+        
+        set_iostate(old_iostate);
 
-        return CL_ENOENT;
+        return rc;
 }