Changeset 5e718d9 in mainline for uspace/lib/c/generic/task.c

Timestamp:

2012-08-21T10:04:16Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

67edca6

Parents:

0da6c04 (diff), 6a97f2e (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 upstream (lp:~wtachi/helenos/bithenge)

File:

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

uspace/lib/c/generic/task.c

@@ -201 +201 @@
  *
  * This is really just a convenience wrapper over the more complicated
+ * loader API. Arguments are passed in a va_list.
+ *
+ * @param id   If not NULL, the ID of the task is stored here on success.
+ * @param path Pathname of the binary to execute.
+ * @param cnt  Number of arguments.
+ * @param ap   Command-line arguments.
+ *
+ * @return Zero on success or negative error code.
+ *
+ */
+int task_spawn(task_id_t *task_id, const char *path, int cnt, va_list ap)
+{
+        /* Allocate argument list. */
+        const char **arglist = malloc(cnt * sizeof(const char *));
+        if (arglist == NULL)
+                return ENOMEM;
+        
+        /* Fill in arguments. */
+        const char *arg;
+        cnt = 0;
+        do {
+                arg = va_arg(ap, const char *);
+                arglist[cnt++] = arg;
+        } while (arg != NULL);
+        
+        /* Spawn task. */
+        int rc = task_spawnv(task_id, path, arglist);
+        
+        /* Free argument list. */
+        free(arglist);
+        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.
  *
@@ -216 +252 @@
         va_list ap;
         const char *arg;
-        const char **arglist;
         int cnt = 0;
         
@@ -226 +261 @@
         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);
+        int rc = task_spawn(task_id, path, cnt, ap);
         va_end(ap);
         
-        /* Spawn task. */
-        int rc = task_spawnv(task_id, path, arglist);
-        
-        /* Free argument list. */
-        free(arglist);
         return rc;
 }