Changeset d52b0044 in mainline

Timestamp:

2010-11-14T16:16:11Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

4deb8b5

Parents:

9e2e715

Message:

Update copyright year in getterm. Allow getterm to pass arguments to the command being executed.

Location:

uspace/app/getterm

Files:

• getterm.c (modified) (3 diffs)
• version.c (modified) (1 diff)

uspace/app/getterm/getterm.c

@@ -48 +48 @@
 static void usage(void)
 {
-        printf("Usage: %s <terminal> <path>\n", APP_NAME);
+        printf("Usage: %s <terminal> <command> [<arguments...>]\n", APP_NAME);
 }
 
@@ -73 +73 @@
 }
 
-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[])
 {
+        int rc;
+        task_exit_t texit;
+        int retval;
+        task_id_t id;
+        char *fname;
+
         if (argc < 3) {
                 usage();
@@ -115 +106 @@
         
         version_print(argv[1]);
-        task_id_t id = spawn(argv[2]);
+        fname = argv[2];
         
-        if (id != 0) {
-                task_exit_t texit;
-                int retval;
-                task_wait(id, &texit, &retval);
-                
-                return 0;
+        rc = task_spawnv(&id, fname, (const char * const *) &argv[2]);
+        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;
 }
 

uspace/app/getterm/version.c

@@ -61 +61 @@
         printf("HelenOS release %s (%s)%s%s\n", release, name, revision, timestamp);
         printf("Running on %s (%s)\n", arch, term);
-        printf("Copyright (c) 2001-2009 HelenOS project\n\n");
+        printf("Copyright (c) 2001-2010 HelenOS project\n\n");
 }