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

Timestamp:

2010-07-25T10:11:13Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

377cce8

Parents:

24a2517 (diff), a2da43c (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 with mainline.

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>
+
+#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 +76 @@
 static task_id_t spawn(int argc, char *argv[])
 {
-        char **args = (char *) calloc(argc + 1, sizeof(char *));
+        const char **args = (const char **) calloc(argc + 1, sizeof(char *));
         if (!args) {
                 printf("No memory available\n");
@@ -84 +88 @@
         args[argc] = NULL;
         
-        task_id_t id = task_spawn(argv[0], args);
+        int err;
+        task_id_t id = task_spawn(argv[0], args, &err);
         
         free(args);
         
         if (id == 0)
-                printf("Error spawning %s\n", argv[0]);
+                printf("%s: Error spawning %s (%s)\n", NAME, argv[0],
+                    str_error(err));
         
         return id;