Changeset 0b749a3 in mainline for uspace/lib/c/generic/task.c

Timestamp:

2010-11-22T15:39:53Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

0eddb76, aae339e9

Parents:

9a1d8ab (diff), 8cd1aa5e (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 development/ changes

File:

• uspace/lib/c/generic/task.c (modified) (4 diffs)

uspace/lib/c/generic/task.c

@@ -39 +39 @@
 #include <errno.h>
 #include <loader/loader.h>
+#include <stdarg.h>
 #include <str.h>
 #include <ipc/ns.h>
@@ -68 +69 @@
  *
  * This is really just a convenience wrapper over the more complicated
- * loader API.
- *
- * @param path Pathname of the binary to execute.
- * @param argv Command-line arguments.
- * @param err  If not NULL, the error value is stored here.
- *
- * @return ID of the newly created task or zero on error.
- *
- */
-task_id_t task_spawn(const char *path, const char *const args[], int *err)
-{
+ * loader API. Arguments are passed as a null-terminated array of strings.
+ *
+ * @param id    If not NULL, the ID of the task is stored here on success.
+ * @param path  Pathname of the binary to execute.
+ * @param argv  Command-line arguments.
+ *
+ * @return      Zero on success or negative error code.
+ */
+int task_spawnv(task_id_t *id, const char *path, const char *const args[])
+{
+        loader_t *ldr;
+        task_id_t task_id;
+        int rc;
+
         /* Connect to a program loader. */
-        loader_t *ldr = loader_connect();
-        if (ldr == NULL) {
-                if (err != NULL)
-                        *err = EREFUSED;
-                
-                return 0;
-        }
+        ldr = loader_connect();
+        if (ldr == NULL)
+                return EREFUSED;
         
         /* Get task ID. */
-        task_id_t task_id;
-        int rc = loader_get_task_id(ldr, &task_id);
+        rc = loader_get_task_id(ldr, &task_id);
         if (rc != EOK)
                 goto error;
@@ -149 +148 @@
         free(ldr);
         
-        if (err != NULL)
-                *err = EOK;
-        
-        return task_id;
+        if (id != NULL)
+                *id = task_id;
+        
+        return EOK;
         
 error:
@@ -158 +157 @@
         loader_abort(ldr);
         free(ldr);
-        
-        if (err != NULL)
-                *err = rc;
-        
-        return 0;
+        return rc;
+}
+
+/** Create a new task by running an executable from the filesystem.
+ *
+ * This is really just a convenience wrapper over the more complicated
+ * loader API. Arguments are passed as a null-terminated list of arguments.
+ *
+ * @param id    If not NULL, the ID of the task is stored here on success.
+ * @param path  Pathname of the binary to execute.
+ * @param ...   Command-line arguments.
+ *
+ * @return      Zero on success or negative error code.
+ */
+int task_spawnl(task_id_t *task_id, const char *path, ...)
+{
+        va_list ap;
+        int rc, cnt;
+        const char *arg;
+        const char **arglist;
+
+        /* Count the number of arguments. */
+        cnt = 0;
+        va_start(ap, path);
+        do {
+                arg = va_arg(ap, const char *);
+                cnt++;
+        } while (arg != NULL);
+        va_end(ap);
+
+        /* Allocate argument list. */
+        arglist = malloc(cnt * sizeof(const char *));
+        if (arglist == NULL)
+                return ENOMEM;
+
+        /* Fill in arguments. */
+        cnt = 0;
+        va_start(ap, path);
+        do {
+                arg = va_arg(ap, const char *);
+                arglist[cnt++] = arg;
+        } while (arg != NULL);
+        va_end(ap);
+
+        /* Spawn task. */
+        rc = task_spawnv(task_id, path, arglist);
+
+        /* Free argument list. */
+        free(arglist);
+        return rc;
 }