Changeset 04803bf in mainline for uspace/lib/c/generic/loader.c

Timestamp:

2011-03-21T22:00:17Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

143932e3

Parents:

b50b5af2 (diff), 7308e84 (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 (needs fixes).

File:

• uspace/lib/c/generic/loader.c (moved) (moved from uspace/lib/libc/generic/loader.c ) (11 diffs)

uspace/lib/c/generic/loader.c

@@ -33 +33 @@
  */
 
-#include <ipc/ipc.h>
 #include <ipc/loader.h>
 #include <ipc/services.h>
+#include <ipc/ns.h>
 #include <libc.h>
 #include <task.h>
-#include <string.h>
+#include <str.h>
 #include <stdlib.h>
 #include <async.h>
@@ -63 +63 @@
 loader_t *loader_connect(void)
 {
-        int phone_id = ipc_connect_me_to_blocking(PHONE_NS, SERVICE_LOAD, 0, 0);
+        int phone_id = service_connect_blocking(SERVICE_LOAD, 0, 0);
         if (phone_id < 0)
                 return NULL;
@@ -90 +90 @@
         ipc_call_t answer;
         aid_t req = async_send_0(ldr->phone_id, LOADER_GET_TASKID, &answer);
-        int rc = ipc_data_read_start(ldr->phone_id, task_id, sizeof(task_id_t));
-        if (rc != EOK) {
-                async_wait_for(req, NULL);
-                return rc;
-        }
-        
-        ipcarg_t retval;
+        int rc = async_data_read_start(ldr->phone_id, task_id, sizeof(task_id_t));
+        if (rc != EOK) {
+                async_wait_for(req, NULL);
+                return rc;
+        }
+        
+        sysarg_t retval;
+        async_wait_for(req, &retval);
+        return (int) retval;
+}
+
+/** Set current working directory for the loaded task.
+ *
+ * Sets the current working directory for the loaded task.
+ *
+ * @param ldr  Loader connection structure.
+ *
+ * @return Zero on success or negative error code.
+ *
+ */
+int loader_set_cwd(loader_t *ldr)
+{
+        char *cwd;
+        size_t len;
+
+        cwd = (char *) malloc(MAX_PATH_LEN + 1);
+        if (!cwd)
+                return ENOMEM;
+        if (!getcwd(cwd, MAX_PATH_LEN + 1))
+                str_cpy(cwd, MAX_PATH_LEN + 1, "/"); 
+        len = str_length(cwd);
+        
+        ipc_call_t answer;
+        aid_t req = async_send_0(ldr->phone_id, LOADER_SET_CWD, &answer);
+        int rc = async_data_write_start(ldr->phone_id, cwd, len);
+        free(cwd);
+        if (rc != EOK) {
+                async_wait_for(req, NULL);
+                return rc;
+        }
+        
+        sysarg_t retval;
         async_wait_for(req, &retval);
         return (int) retval;
@@ -123 +158 @@
         ipc_call_t answer;
         aid_t req = async_send_0(ldr->phone_id, LOADER_SET_PATHNAME, &answer);
-        int rc = ipc_data_write_start(ldr->phone_id, (void *) pa, pa_len);
-        if (rc != EOK) {
+        int rc = async_data_write_start(ldr->phone_id, (void *) pa, pa_len);
+        if (rc != EOK) {
+                free(pa);
                 async_wait_for(req, NULL);
                 return rc;
@@ -131 +167 @@
         free(pa);
         
-        ipcarg_t retval;
+        sysarg_t retval;
         async_wait_for(req, &retval);
         return (int) retval;
@@ -148 +184 @@
  *
  */
-int loader_set_args(loader_t *ldr, char *const argv[])
+int loader_set_args(loader_t *ldr, const char *const argv[])
 {
         /*
@@ -154 +190 @@
          * compute size of the buffer needed.
          */
-        char *const *ap = argv;
+        const char *const *ap = argv;
         size_t buffer_size = 0;
         while (*ap != NULL) {
@@ -178 +214 @@
         ipc_call_t answer;
         aid_t req = async_send_0(ldr->phone_id, LOADER_SET_ARGS, &answer);
-        ipcarg_t rc = ipc_data_write_start(ldr->phone_id, (void *) arg_buf, buffer_size);
+        sysarg_t rc = async_data_write_start(ldr->phone_id, (void *) arg_buf, buffer_size);
         if (rc != EOK) {
                 async_wait_for(req, NULL);
@@ -232 +268 @@
         ipc_call_t answer;
         aid_t req = async_send_0(ldr->phone_id, LOADER_SET_FILES, &answer);
-        ipcarg_t rc = ipc_data_write_start(ldr->phone_id, (void *) files_buf,
+        sysarg_t rc = async_data_write_start(ldr->phone_id, (void *) files_buf,
             count * sizeof(fdi_node_t));
         if (rc != EOK) {
@@ -284 +320 @@
                 return rc;
         
-        ipc_hangup(ldr->phone_id);
+        async_hangup(ldr->phone_id);
         ldr->phone_id = 0;
         return EOK;
@@ -302 +338 @@
 void loader_abort(loader_t *ldr)
 {
-        ipc_hangup(ldr->phone_id);
+        async_hangup(ldr->phone_id);
         ldr->phone_id = 0;
 }