Changeset b40bfac in mainline for uspace/app/redir/redir.c

Timestamp:

2010-11-08T07:13:25Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

63a1e60

Parents:

d70a463 (diff), 3da12d74 (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

@@ -43 +43 @@
 #include <task.h>
 #include <str_error.h>
+#include <errno.h>
 
 #define NAME  "redir"
@@ -76 +77 @@
 static task_id_t spawn(int argc, char *argv[])
 {
-        const char **args = (const char **) calloc(argc + 1, sizeof(char *));
+        const char **args;
+        task_id_t id;
+        int rc;
+
+        args = (const char **) calloc(argc + 1, sizeof(char *));
         if (!args) {
                 printf("No memory available\n");
@@ -88 +93 @@
         args[argc] = NULL;
         
-        int err;
-        task_id_t id = task_spawn(argv[0], args, &err);
+        rc = task_spawnv(&id, argv[0], args);
         
         free(args);
         
-        if (id == 0)
+        if (rc != EOK) {
                 printf("%s: Error spawning %s (%s)\n", NAME, argv[0],
-                    str_error(err));
+                    str_error(rc));
+        }
         
         return id;