Changeset 04803bf in mainline for uspace/app/getterm/getterm.c

Timestamp:

2011-03-21T22:00:17Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

143932e3

Parents:

b50b5af2 (diff), 7308e84 (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 (needs fixes).

File:

• uspace/app/getterm/getterm.c (moved) (moved from uspace/app/getvc/getvc.c ) (2 diffs)

uspace/app/getterm/getterm.c

@@ -27 +27 @@
  */
 
-/** @addtogroup getvc GetVC
+/** @addtogroup getterm GetTerm
  * @brief Console initialization task.
  * @{
@@ -36 +36 @@
 
 #include <sys/types.h>
+#include <fcntl.h>
 #include <unistd.h>
 #include <stdio.h>
 #include <task.h>
+#include <str_error.h>
+#include <errno.h>
 #include "version.h"
+#include "welcome.h"
+
+#define APP_NAME  "getterm"
 
 static void usage(void)
 {
-        printf("Usage: getvc <device> <path>\n");
+        printf("Usage: %s <terminal> [-w] <command> [<arguments...>]\n", APP_NAME);
 }
 
-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);
-}
-
-static task_id_t spawn(char *fname)
-{
-        char *argv[2];
+        *stream = NULL;
         
-        argv[0] = fname;
-        argv[1] = NULL;
+        int oldfd = open(path, flags);
+        if (oldfd < 0)
+                return;
         
-        task_id_t id = task_spawn(fname, argv);
+        if (oldfd != fd) {
+                if (dup2(oldfd, fd) != fd)
+                        return;
+                
+                if (close(oldfd))
+                        return;
+        }
         
-        if (id == 0)
-                printf("Error spawning %s\n", fname);
-        
-        return id;
+        *stream = fdopen(fd, mode);
 }
 
 int main(int argc, char *argv[])
 {
+        int rc;
         task_exit_t texit;
         int retval;
+        task_id_t id;
+        char *fname, *term;
+        char **cmd_args;
+        bool print_wmsg;
 
-        if (argc < 3) {
+        argv++;
+        argc--;
+        if (argc < 1) {
                 usage();
                 return -1;
         }
+
+        if (str_cmp(*argv, "-w") == 0) {
+                print_wmsg = true;
+                argv++;
+                argc--;
+        } else {
+                print_wmsg = false;
+        }
+
+        if (argc < 2) {
+                usage();
+                return -1;
+        }
+
+        term = *argv++;
+        fname = *argv;
+        cmd_args = argv;
         
-        closeall();
+        reopen(&stdin, 0, term, O_RDONLY, "r");
+        reopen(&stdout, 1, term, O_WRONLY, "w");
+        reopen(&stderr, 2, term, 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;
         
-        version_print(argv[1]);
-        task_id_t id = spawn(argv[2]);
-        task_wait(id, &texit, &retval);
+        if (stdout == NULL)
+                return -3;
         
+        if (stderr == NULL)
+                return -4;
+        
+        version_print(term);
+        if (print_wmsg)
+                welcome_msg_print();
+
+        rc = task_spawnv(&id, fname, (const char * const *) cmd_args);
+        if (rc != EOK) {
+                printf("%s: Error spawning %s (%s)\n", APP_NAME, fname,
+                    str_error(rc));
+                return -5;
+        }
+
+        rc = task_wait(id, &texit, &retval);
+        if (rc != EOK) {
+                printf("%s: Error waiting for %s (%s)\n", APP_NAME, fname,
+                    str_error(rc));
+                return -6;
+        }
+
         return 0;
 }