Changeset 46c20c8 in mainline for uspace/app/redir/redir.c

Timestamp:

2010-11-26T20:08:10Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

45df59a

Parents:

fb150d78 (diff), ffdd2b9 (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.

File:

• uspace/app/redir/redir.c (modified) (3 diffs)

uspace/app/redir/redir.c

@@ -39 +39 @@
 #include <fcntl.h>
 #include <unistd.h>
-#include <string.h>
+#include <str.h>
 #include <stdio.h>
 #include <task.h>
+#include <str_error.h>
+#include <errno.h>
+
+#define NAME  "redir"
 
 static void usage(void)
 {
-        printf("Usage: redir [-i <stdin>] [-o <stdout>] [-e <stderr>] -- <cmd> [args ...]\n");
+        printf("Usage: %s [-i <stdin>] [-o <stdout>] [-e <stderr>] -- <cmd> [args ...]\n",
+            NAME);
 }
 
@@ -72 +77 @@
 static task_id_t spawn(int argc, char *argv[])
 {
-        char **args = (char *) calloc(argc + 1, sizeof(char *));
+        const char **args;
+        task_id_t id = 0;
+        int rc;
+
+        args = (const char **) calloc(argc + 1, sizeof(char *));
         if (!args) {
                 printf("No memory available\n");
@@ -84 +93 @@
         args[argc] = NULL;
         
-        task_id_t id = task_spawn(argv[0], args);
+        rc = task_spawnv(&id, argv[0], args);
         
         free(args);
         
-        if (id == 0)
-                printf("Error spawning %s\n", argv[0]);
+        if (rc != EOK) {
+                printf("%s: Error spawning %s (%s)\n", NAME, argv[0],
+                    str_error(rc));
+        }
         
         return id;