Changeset 6ea9a1d in mainline for uspace/app/bdsh/input.c

Timestamp:

2011-06-11T22:32:24Z (13 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

File:

• uspace/app/bdsh/input.c (modified) (4 diffs)

uspace/app/bdsh/input.c

@@ -58 +58 @@
 
 /* Private helpers */
-static int run_command(char **, cliuser_t *, FILE **);
+static int run_command(char **, cliuser_t *, iostate_t *);
 static void print_pipe_usage(void);
 
@@ -140 +140 @@
         }
         
-        FILE *files[4];
-        files[0] = stdin;
-        files[1] = stdout;
-        files[2] = stderr;
-        files[3] = 0;
+        iostate_t new_iostate = {
+                .stdin = stdin,
+                .stdout = stdout,
+                .stderr = stderr
+        };
+        
+        FILE *from = NULL;
+        FILE *to = NULL;
         
         if (redir_from) {
-                FILE *from = fopen(redir_from, "r");
+                from = fopen(redir_from, "r");
                 if (from == NULL) {
                         printf("Cannot open file %s\n", redir_from);
                         rc = errno;
-                        goto finit;
+                        goto finit_with_files;
                 }
-                files[0] = from;
-        }
+                new_iostate.stdin = from;
+        }
+        
         
         if (redir_to) {
-                FILE *to = fopen(redir_to, "w");
+                to = fopen(redir_to, "w");
                 if (to == NULL) {
                         printf("Cannot open file %s\n", redir_to);
                         rc = errno;
-                        goto finit;
+                        goto finit_with_files;
                 }
-                files[1] = to;
-        }
-        
-        rc = run_command(cmd, usr, files);
+                new_iostate.stdout = to;
+        }
+        
+        rc = run_command(cmd, usr, &new_iostate);
+        
+finit_with_files:
+        if (from != NULL) {
+                fclose(from);
+        }
+        if (to != NULL) {
+                fclose(to);
+        }
         
 finit:
@@ -188 +200 @@
 }
 
-int run_command(char **cmd, cliuser_t *usr, FILE *files[])
+int run_command(char **cmd, cliuser_t *usr, iostate_t *new_iostate)
 {
         int id = 0;
@@ -199 +211 @@
         /* Is it a builtin command ? */
         if ((id = (is_builtin(cmd[0]))) > -1) {
-                return run_builtin(id, cmd, usr);
+                return run_builtin(id, cmd, usr, new_iostate);
         }
         
         /* Is it a module ? */
         if ((id = (is_module(cmd[0]))) > -1) {
-                return run_module(id, cmd);
+                return run_module(id, cmd, new_iostate);
         }
 
         /* See what try_exec thinks of it */
-        return try_exec(cmd[0], cmd, files);
+        return try_exec(cmd[0], cmd, new_iostate);
 }