Changeset db4d6de in mainline for uspace/srv/loader/main.c

Timestamp:

2009-11-28T16:30:43Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

c4702804

Parents:

ba8f8cb (diff), 67392fa (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/srv/loader/main.c (modified) (4 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;
@@ -115 +118 @@
 }
 
+/** 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.
@@ -313 +344 @@
         elf_create_pcb(&prog_info, &pcb);
         
+        pcb.cwd = cwd;
+        
         pcb.argc = argc;
         pcb.argv = argv;
@@ -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: