Changeset 5a4fef9 in mainline for uspace/app/getvc/getvc.c

Timestamp:

2009-11-16T21:24:28Z (14 years ago)

Author:

Pavel Rimsky <pavel@…>

Branches:

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

Children:

18baf9c0

Parents:

5f678b1c (diff), 9c70ed6 (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:

merged head changes to this branch

File:

• uspace/app/getvc/getvc.c (modified) (4 diffs)

uspace/app/getvc/getvc.c

@@ -36 +36 @@
 
 #include <sys/types.h>
+#include <fcntl.h>
 #include <unistd.h>
 #include <stdio.h>
@@ -46 +47 @@
 }
 
-static void closeall(void)
+static void reopen(FILE **stream, int fd, const char *path, int flags, const char *mode)
 {
-        fclose(stdin);
-        fclose(stdout);
-        fclose(stderr);
+        if (fclose(*stream))
+                return;
         
-        close(0);
-        close(1);
-        close(2);
+        *stream = NULL;
+        
+        int oldfd = open(path, flags);
+        if (oldfd < 0)
+                return;
+        
+        if (oldfd != fd) {
+                if (dup2(oldfd, fd) != fd)
+                        return;
+                
+                if (close(oldfd))
+                        return;
+        }
+        
+        *stream = fdopen(fd, mode);
 }
 
 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)
@@ -74 +86 @@
 int main(int argc, char *argv[])
 {
-        task_exit_t texit;
-        int retval;
-
         if (argc < 3) {
                 usage();
@@ -82 +91 @@
         }
         
-        closeall();
+        reopen(&stdin, 0, argv[1], O_RDONLY, "r");
+        reopen(&stdout, 1, argv[1], O_WRONLY, "w");
+        reopen(&stderr, 2, argv[1], O_WRONLY, "w");
         
-        stdin = fopen(argv[1], "r");
-        stdout = fopen(argv[1], "w");
-        stderr = fopen(argv[1], "w");
-
         /*
-         * FIXME: fopen() should actually detect that we are opening a console
+         * FIXME: fdopen() should actually detect that we are opening a console
          * and it should set line-buffering mode automatically.
          */
         setvbuf(stdout, NULL, _IOLBF, BUFSIZ);
         
-        if ((stdin == NULL)
-            || (stdout == NULL)
-            || (stderr == NULL))
+        if (stdin == NULL)
                 return -2;
+        
+        if (stdout == NULL)
+                return -3;
+        
+        if (stderr == NULL)
+                return -4;
         
         version_print(argv[1]);
         task_id_t id = spawn(argv[2]);
-        task_wait(id, &texit, &retval);
         
-        return 0;
+        if (id != 0) {
+                task_exit_t texit;
+                int retval;
+                task_wait(id, &texit, &retval);
+                
+                return 0;
+        }
+        
+        return -5;
 }