Changeset 04803bf in mainline for uspace/app/bdsh/exec.c

Timestamp:

2011-03-21T22:00:17Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

143932e3

Parents:

b50b5af2 (diff), 7308e84 (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 (needs fixes).

File:

• uspace/app/bdsh/exec.c (modified) (2 diffs)

uspace/app/bdsh/exec.c

@@ -38 +38 @@
 #include <stdlib.h>
 #include <unistd.h>
-#include <string.h>
+#include <str.h>
 #include <fcntl.h>
+#include <str_error.h>
+#include <errno.h>
 
 #include "config.h"
@@ -115 +117 @@
         task_exit_t texit;
         char *tmp;
-        int retval;
+        int rc, retval;
 
         tmp = str_dup(find_command(cmd));
         free(found);
 
-        tid = task_spawn((const char *)tmp, argv);
+        rc = task_spawnv(&tid, tmp, (const char **) argv);
         free(tmp);
 
-        if (tid == 0) {
-                cli_error(CL_EEXEC, "Cannot spawn `%s'.", cmd);
+        if (rc != 0) {
+                cli_error(CL_EEXEC, "%s: Cannot spawn `%s' (%s)", progname, cmd,
+                    str_error(rc));
                 return 1;
         }
         
-        task_wait(tid, &texit, &retval);
-        if (texit != TASK_EXIT_NORMAL) {
-                printf("Command failed (unexpectedly terminated).\n");
+        rc = task_wait(tid, &texit, &retval);
+        if (rc != EOK) {
+                printf("%s: Failed waiting for command (%s)\n", progname,
+                    str_error(rc));
+        } else if (texit != TASK_EXIT_NORMAL) {
+                printf("%s: Command failed (unexpectedly terminated)\n", progname);
         } else if (retval != 0) {
-                printf("Command failed (return value %d).\n", retval);
+                printf("%s: Command failed (exit code %d)\n",
+                    progname, retval);
         }