Changeset c7dc8ad in mainline

Timestamp:

2009-10-30T12:13:48Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

e6b73ad0

Parents:

15b8e495

Message:

proof-of-concept of stdin/stdout/stderr redirection

Files:

• boot/arch/amd64/Makefile.inc (modified) (1 diff)
• boot/arch/arm32/loader/Makefile.common (modified) (1 diff)
• boot/arch/ia64/loader/Makefile.common (modified) (1 diff)
• boot/arch/mips32/loader/Makefile.common (modified) (1 diff)
• boot/arch/ppc32/loader/Makefile.common (modified) (1 diff)
• boot/arch/sparc64/loader/Makefile.common (modified) (1 diff)
• uspace/Makefile (modified) (1 diff)
• uspace/app/getvc/getvc.c (modified) (2 diffs)
• uspace/app/redir/Makefile (added)
• uspace/app/redir/Makefile.build (added)
• uspace/app/redir/Makefile.common (added)
• uspace/app/redir/redir.c (added)

boot/arch/amd64/Makefile.inc

@@ -58 +58 @@
         $(USPACEDIR)/app/edit/edit \
         $(USPACEDIR)/app/getvc/getvc \
+        $(USPACEDIR)/app/redir/redir \
         $(USPACEDIR)/app/tetris/tetris \
         $(USPACEDIR)/app/tester/tester \

boot/arch/arm32/loader/Makefile.common

@@ -56 +56 @@
         $(USPACEDIR)/app/edit/edit \
         $(USPACEDIR)/app/getvc/getvc \
+        $(USPACEDIR)/app/redir/redir \
         $(USPACEDIR)/app/tetris/tetris \
         $(USPACEDIR)/app/tester/tester \

boot/arch/ia64/loader/Makefile.common

@@ -56 +56 @@
         $(USPACEDIR)/app/edit/edit \
         $(USPACEDIR)/app/getvc/getvc \
+        $(USPACEDIR)/app/redir/redir \
         $(USPACEDIR)/app/tetris/tetris \
         $(USPACEDIR)/app/tester/tester \

boot/arch/mips32/loader/Makefile.common

@@ -57 +57 @@
         $(USPACEDIR)/app/edit/edit \
         $(USPACEDIR)/app/getvc/getvc \
+        $(USPACEDIR)/app/redir/redir \
         $(USPACEDIR)/app/tetris/tetris \
         $(USPACEDIR)/app/tester/tester \

boot/arch/ppc32/loader/Makefile.common

@@ -55 +55 @@
         $(USPACEDIR)/app/edit/edit \
         $(USPACEDIR)/app/getvc/getvc \
+        $(USPACEDIR)/app/redir/redir \
         $(USPACEDIR)/app/tetris/tetris \
         $(USPACEDIR)/app/tester/tester \

boot/arch/sparc64/loader/Makefile.common

@@ -54 +54 @@
         $(USPACEDIR)/app/edit/edit \
         $(USPACEDIR)/app/getvc/getvc \
+        $(USPACEDIR)/app/redir/redir \
         $(USPACEDIR)/app/tetris/tetris \
         $(USPACEDIR)/app/trace/trace \

uspace/Makefile

@@ -55 +55 @@
         app/init \
         app/getvc \
+        app/redir \
         app/bdsh
 

uspace/app/getvc/getvc.c

@@ -71 +71 @@
 static task_id_t spawn(char *fname)
 {
-        char *argv[2];
+        char *args[2];
         
-        argv[0] = fname;
-        argv[1] = NULL;
+        args[0] = fname;
+        args[1] = NULL;
         
-        task_id_t id = task_spawn(fname, argv);
+        task_id_t id = task_spawn(fname, args);
         
         if (id == 0)
@@ -113 +113 @@
         task_id_t id = spawn(argv[2]);
         
-        task_exit_t texit;
-        int retval;
-        task_wait(id, &texit, &retval);
+        if (id != 0) {
+                task_exit_t texit;
+                int retval;
+                task_wait(id, &texit, &retval);
+                
+                return 0;
+        }
         
-        return 0;
+        return -5;
 }