Changeset eb522e8 in mainline for uspace/app/getterm/getterm.c

Timestamp:

2011-06-01T08:43:42Z (14 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

8d6c1f1

Parents:

9e2e715 (diff), e51a514 (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:

Huuuuuge merge from development - all the work actually

File:

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

uspace/app/getterm/getterm.c

@@ -43 +43 @@
 #include <errno.h>
 #include "version.h"
+#include "welcome.h"
 
 #define APP_NAME  "getterm"
@@ -48 +49 @@
 static void usage(void)
 {
-        printf("Usage: %s <terminal> <path>\n", APP_NAME);
+        printf("Usage: %s <terminal> [-w] <command> [<arguments...>]\n", APP_NAME);
 }
 
@@ -73 +74 @@
 }
 
-static task_id_t spawn(const char *fname)
-{
-        task_id_t id;
-        int rc;
-        
-        rc = task_spawnl(&id, fname, fname, NULL);
-        if (rc != EOK) {
-                printf("%s: Error spawning %s (%s)\n", APP_NAME, fname,
-                    str_error(rc));
-                return 0;
-        }
-        
-        return id;
-}
-
 int main(int argc, char *argv[])
 {
-        if (argc < 3) {
+        int rc;
+        task_exit_t texit;
+        int retval;
+        task_id_t id;
+        char *fname, *term;
+        char **cmd_args;
+        bool print_wmsg;
+
+        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;
         
-        reopen(&stdin, 0, argv[1], O_RDONLY, "r");
-        reopen(&stdout, 1, argv[1], O_WRONLY, "w");
-        reopen(&stderr, 2, argv[1], O_WRONLY, "w");
+        reopen(&stdin, 0, term, O_RDONLY, "r");
+        reopen(&stdout, 1, term, O_WRONLY, "w");
+        reopen(&stderr, 2, term, O_WRONLY, "w");
         
         /*
@@ -114 +127 @@
                 return -4;
         
-        version_print(argv[1]);
-        task_id_t id = spawn(argv[2]);
-        
-        if (id != 0) {
-                task_exit_t texit;
-                int retval;
-                task_wait(id, &texit, &retval);
-                
-                return 0;
+        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;
         }
-        
-        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;
 }