Changeset 15d0046 in mainline for uspace/app/bdsh/exec.c

Timestamp:

2014-09-12T13:22:33Z (10 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

9b20126

Parents:

8db09e4 (diff), 105d8d6 (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/bdsh/exec.c (modified) (3 diffs)

uspace/app/bdsh/exec.c

@@ -97 +97 @@
 {
         task_id_t tid;
+        task_wait_t twait;
         task_exit_t texit;
         char *tmp;
@@ -121 +122 @@
         file_handles_p[i] = NULL;
 
-        rc = task_spawnvf(&tid, tmp, (const char **) argv, file_handles_p);
+        rc = task_spawnvf(&tid, &twait, tmp, (const char **) argv, file_handles_p);
         free(tmp);
 
@@ -130 +131 @@
         }
         
-        rc = task_wait(tid, &texit, &retval);
+        rc = task_wait(&twait, &texit, &retval);
         if (rc != EOK) {
                 printf("%s: Failed waiting for command (%s)\n", progname,