Changeset 622cdbe in mainline for uspace/lib/libc

Timestamp:

2009-10-15T17:45:16Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

d8ef374

Parents:

81342f7

Message:

Inherit the current working directory from the spawner to the spawnee task.

Location:

uspace/lib/libc

Files:

• generic/libc.c (modified) (1 diff)
• generic/loader.c (modified) (1 diff)
• generic/task.c (modified) (2 diffs)
• include/ipc/loader.h (modified) (1 diff)
• include/loader/loader.h (modified) (1 diff)
• include/loader/pcb.h (modified) (1 diff)

uspace/lib/libc/generic/libc.c

@@ -80 +80 @@
                 __stdio_init(0, NULL);
         } else {
+                (void) chdir(__pcb->cwd);
                 argc = __pcb->argc;
                 argv = __pcb->argv;

uspace/lib/libc/generic/loader.c

@@ -101 +101 @@
 }
 
+/** 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;
+        }
+        
+        ipcarg_t retval;
+        async_wait_for(req, &retval);
+        return (int) retval;
+}
+
 /** Set pathname of the program to load.
  *

uspace/lib/libc/generic/task.c

@@ -89 +89 @@
                 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);
@@ -98 +103 @@
         if (rc != EOK)
                 goto error;
-        
         
         /* Send default files */

uspace/lib/libc/include/ipc/loader.h

@@ -41 +41 @@
         LOADER_HELLO = IPC_FIRST_USER_METHOD,
         LOADER_GET_TASKID,
+        LOADER_SET_CWD,
         LOADER_SET_PATHNAME,
         LOADER_SET_ARGS,

uspace/lib/libc/include/loader/loader.h

@@ -49 +49 @@
 extern loader_t *loader_connect(void);
 extern int loader_get_task_id(loader_t *, task_id_t *);
+extern int loader_set_cwd(loader_t *);
 extern int loader_set_pathname(loader_t *, const char *);
 extern int loader_set_args(loader_t *, char *const[]);

uspace/lib/libc/include/loader/pcb.h

@@ -52 +52 @@
         /** Program entry point. */
         entry_point_t entry;
+
+        /** Current working directory. */
+        char *cwd;
         
         /** Number of command-line arguments. */