Changeset 17b2aac in mainline

Timestamp:

2008-08-12T11:09:16Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4bf40f6

Parents:

34a74ab

Message:

Fix handling of relative paths in task_spawn().

Location:

uspace/lib/libc

Files:

• generic/task.c (modified) (4 diffs)
• generic/vfs/vfs.c (modified) (1 diff)
• include/vfs/vfs.h (modified) (1 diff)

uspace/lib/libc/generic/task.c

@@ -42 +42 @@
 #include <async.h>
 #include <errno.h>
+#include <vfs/vfs.h>
 
 task_id_t task_get_id(void)
@@ -131 +132 @@
         ipcarg_t retval;
 
+        char *pa;
+        size_t pa_len;
+
+        pa = absolutize(path, &pa_len);
+        if (!pa)
+                return 0;
+
         /* Spawn a program loader */    
         phone_id = task_spawn_loader();
-        if (phone_id < 0) return 0;
+        if (phone_id < 0)
+                return 0;
 
         /*
@@ -140 +149 @@
          */
         rc = async_req_0_0(phone_id, LOADER_HELLO);
-        if (rc != EOK) return 0;
+        if (rc != EOK)
+                return 0;
 
         /* Send program pathname */
         req = async_send_0(phone_id, LOADER_SET_PATHNAME, &answer);
-        rc = ipc_data_write_start(phone_id, (void *)path, strlen(path));
+        rc = ipc_data_write_start(phone_id, (void *)pa, pa_len);
         if (rc != EOK) {
                 async_wait_for(req, NULL);
@@ -151 +161 @@
 
         async_wait_for(req, &retval);
-        if (retval != EOK) goto error;
+        if (retval != EOK)
+                goto error;
 
         /* Send arguments */
         rc = loader_set_args(phone_id, argv);
-        if (rc != EOK) goto error;
+        if (rc != EOK)
+                goto error;
 
         /* Request loader to start the program */       
         rc = async_req_0_0(phone_id, LOADER_RUN);
-        if (rc != EOK) goto error;
+        if (rc != EOK)
+                goto error;
 
         /* Success */

uspace/lib/libc/generic/vfs/vfs.c

@@ -60 +60 @@
 size_t cwd_len = 0; 
 
-static char *absolutize(const char *path, size_t *retlen)
+char *absolutize(const char *path, size_t *retlen)
 {
         char *ncwd_path;

uspace/lib/libc/include/vfs/vfs.h

@@ -36 +36 @@
 #define LIBC_VFS_H_
 
+#include <sys/types.h>
+
+extern char *absolutize(const char *, size_t *);
+
 extern int mount(const char *, const char *, const char *);