Changes in uspace/lib/c/generic/task.c [0485135:d9fae235] in mainline

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>
@@ -69 +68 @@
  *
  * This is really just a convenience wrapper over the more complicated
- * loader API. Arguments are passed as a null-terminated array of strings.
+ * loader API.
  *
- * @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.
+ * @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      Zero on success or negative error code.
+ * @return ID of the newly created task or zero on error.
+ *
  */
-int task_spawnv(task_id_t *id, const char *path, const char *const args[])
+task_id_t task_spawn(const char *path, const char *const args[], int *err)
 {
-        loader_t *ldr;
-        task_id_t task_id;
-        int rc;
-
         /* Connect to a program loader. */
-        ldr = loader_connect();
-        if (ldr == NULL)
-                return EREFUSED;
+        loader_t *ldr = loader_connect();
+        if (ldr == NULL) {
+                if (err != NULL)
+                        *err = EREFUSED;
+                
+                return 0;
+        }
         
         /* Get task ID. */
-        rc = loader_get_task_id(ldr, &task_id);
+        task_id_t task_id;
+        int rc = loader_get_task_id(ldr, &task_id);
         if (rc != EOK)
                 goto error;
@@ -148 +149 @@
         free(ldr);
         
-        if (id != NULL)
-                *id = task_id;
+        if (err != NULL)
+                *err = EOK;
         
-        return EOK;
+        return task_id;
         
 error:
@@ -157 +158 @@
         loader_abort(ldr);
         free(ldr);
-        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;
+        
+        if (err != NULL)
+                *err = rc;
+        
+        return 0;
 }