Changeset 54d4b9e in mainline for uspace/lib/c/generic/task.c

Timestamp:

2011-06-17T17:53:05Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

dec55ce

Parents:

8d12065 (diff), 98caf49 (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/lib/c/generic/task.c (modified) (3 diffs)

uspace/lib/c/generic/task.c

@@ -101 +101 @@
 int task_spawnv(task_id_t *id, const char *path, const char *const args[])
 {
-        /* Connect to a program loader. */
-        loader_t *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);
-        if (rc != EOK)
-                goto error;
-        
-        /* Send spawner's current working directory. */
-        rc = loader_set_cwd(ldr);
-        if (rc != EOK)
-                goto error;
-        
-        /* Send program pathname. */
-        rc = loader_set_pathname(ldr, path);
-        if (rc != EOK)
-                goto error;
-        
-        /* Send arguments. */
-        rc = loader_set_args(ldr, args);
-        if (rc != EOK)
-                goto error;
-        
         /* Send default files */
         fdi_node_t *files[4];
@@ -150 +124 @@
         files[3] = NULL;
         
+        return task_spawnvf(id, path, args, files);
+}
+
+/** 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 array of strings.
+ * Files are passed as null-terminated array of pointers to fdi_node_t.
+ *
+ * @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 files Standard files to use.
+ *
+ * @return Zero on success or negative error code.
+ *
+ */
+int task_spawnvf(task_id_t *id, const char *path, const char *const args[],
+    fdi_node_t *const files[])
+{
+        /* Connect to a program loader. */
+        loader_t *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);
+        if (rc != EOK)
+                goto error;
+        
+        /* Send spawner's current working directory. */
+        rc = loader_set_cwd(ldr);
+        if (rc != EOK)
+                goto error;
+        
+        /* Send program pathname. */
+        rc = loader_set_pathname(ldr, path);
+        if (rc != EOK)
+                goto error;
+        
+        /* Send arguments. */
+        rc = loader_set_args(ldr, args);
+        if (rc != EOK)
+                goto error;
+        
+        /* Send files */
         rc = loader_set_files(ldr, files);
         if (rc != EOK)
@@ -169 +190 @@
         
         return EOK;
-        
 error:
         /* Error exit */