Changes in uspace/lib/libc/generic/loader.c [622cdbe:99272a3] in mainline

File:

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

uspace/lib/libc/generic/loader.c

@@ -90 +90 @@
         ipc_call_t answer;
         aid_t req = async_send_0(ldr->phone_id, LOADER_GET_TASKID, &answer);
-        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;
-        }
-        
-        ipcarg_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);
+        int rc = ipc_data_read_start(ldr->phone_id, task_id, sizeof(task_id_t));
         if (rc != EOK) {
                 async_wait_for(req, NULL);
@@ -158 +123 @@
         ipc_call_t answer;
         aid_t req = async_send_0(ldr->phone_id, LOADER_SET_PATHNAME, &answer);
-        int rc = async_data_write_start(ldr->phone_id, (void *) pa, pa_len);
+        int rc = ipc_data_write_start(ldr->phone_id, (void *) pa, pa_len);
         if (rc != EOK) {
                 async_wait_for(req, NULL);
@@ -213 +178 @@
         ipc_call_t answer;
         aid_t req = async_send_0(ldr->phone_id, LOADER_SET_ARGS, &answer);
-        ipcarg_t rc = async_data_write_start(ldr->phone_id, (void *) arg_buf, buffer_size);
+        ipcarg_t rc = ipc_data_write_start(ldr->phone_id, (void *) arg_buf, buffer_size);
         if (rc != EOK) {
                 async_wait_for(req, NULL);
@@ -267 +232 @@
         ipc_call_t answer;
         aid_t req = async_send_0(ldr->phone_id, LOADER_SET_FILES, &answer);
-        ipcarg_t rc = async_data_write_start(ldr->phone_id, (void *) files_buf,
+        ipcarg_t rc = ipc_data_write_start(ldr->phone_id, (void *) files_buf,
             count * sizeof(fdi_node_t));
         if (rc != EOK) {