Changeset 1787e527 in mainline for uspace/srv/loader/main.c

Timestamp:

2009-11-16T21:22:54Z (14 years ago)

Author:

Lenka Trochtova <trochtova.lenka@…>

Branches:

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

Children:

5ebdf94

Parents:

fcbd1be (diff), 9c70ed6 (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:

merged with head (unstable)

File:

• uspace/srv/loader/main.c (modified) (11 diffs)

uspace/srv/loader/main.c

@@ -72 +72 @@
 static pcb_t pcb;
 
+/** Current working directory */
+static char *cwd = NULL;
+
 /** Number of arguments */
 static int argc = 0;
@@ -102 +105 @@
         task_id = task_get_id();
         
-        if (!ipc_data_read_receive(&callid, &len)) {
+        if (!async_data_read_receive(&callid, &len)) {
                 ipc_answer_0(callid, EINVAL);
                 ipc_answer_0(rid, EINVAL);
@@ -111 +114 @@
                 len = sizeof(task_id);
         
-        ipc_data_read_finalize(callid, &task_id, len);
+        async_data_read_finalize(callid, &task_id, len);
         ipc_answer_0(rid, EOK);
 }
 
+/** Receive a call setting the current working directory.
+ *
+ * @param rid
+ * @param request
+ */
+static void ldr_set_cwd(ipc_callid_t rid, ipc_call_t *request)
+{
+        ipc_callid_t callid;
+        size_t len;
+        
+        if (!async_data_write_receive(&callid, &len)) {
+                ipc_answer_0(callid, EINVAL);
+                ipc_answer_0(rid, EINVAL);
+                return;
+        }
+        
+        cwd = malloc(len + 1);
+        if (!cwd) {
+                ipc_answer_0(callid, ENOMEM);
+                ipc_answer_0(rid, ENOMEM);
+                return;
+        }
+        
+        async_data_write_finalize(callid, cwd, len);
+        cwd[len] = '\0';
+        
+        ipc_answer_0(rid, EOK);
+}
 
 /** Receive a call setting pathname of the program to execute.
@@ -127 +158 @@
         char *name_buf;
         
-        if (!ipc_data_write_receive(&callid, &len)) {
+        if (!async_data_write_receive(&callid, &len)) {
                 ipc_answer_0(callid, EINVAL);
                 ipc_answer_0(rid, EINVAL);
@@ -140 +171 @@
         }
         
-        ipc_data_write_finalize(callid, name_buf, len);
+        async_data_write_finalize(callid, name_buf, len);
         ipc_answer_0(rid, EOK);
         
@@ -164 +195 @@
         int n;
         
-        if (!ipc_data_write_receive(&callid, &buf_size)) {
+        if (!async_data_write_receive(&callid, &buf_size)) {
                 ipc_answer_0(callid, EINVAL);
                 ipc_answer_0(rid, EINVAL);
@@ -187 +218 @@
         }
         
-        ipc_data_write_finalize(callid, arg_buf, buf_size);
+        async_data_write_finalize(callid, arg_buf, buf_size);
         
         arg_buf[buf_size] = '\0';
@@ -239 +270 @@
         ipc_callid_t callid;
         size_t buf_size;
-        if (!ipc_data_write_receive(&callid, &buf_size)) {
+        if (!async_data_write_receive(&callid, &buf_size)) {
                 ipc_answer_0(callid, EINVAL);
                 ipc_answer_0(rid, EINVAL);
@@ -268 +299 @@
         }
         
-        ipc_data_write_finalize(callid, fil_buf, buf_size);
+        async_data_write_finalize(callid, fil_buf, buf_size);
         
         int count = buf_size / sizeof(fdi_node_t);
@@ -312 +343 @@
         
         elf_create_pcb(&prog_info, &pcb);
+        
+        pcb.cwd = cwd;
         
         pcb.argc = argc;
@@ -406 +439 @@
                 case LOADER_GET_TASKID:
                         ldr_get_taskid(callid, &call);
+                        continue;
+                case LOADER_SET_CWD:
+                        ldr_set_cwd(callid, &call);
                         continue;
                 case LOADER_SET_PATHNAME: