Changes in uspace/lib/c/generic/loader.c [d96d9bc:6afc9d7] in mainline

File:

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

uspace/lib/c/generic/loader.c

@@ -124 +124 @@
                 return ENOMEM;
         
-        if (vfs_cwd_get(cwd, MAX_PATH_LEN + 1) != EOK)
+        if (getcwd(cwd, MAX_PATH_LEN + 1) == NULL)
                 str_cpy(cwd, MAX_PATH_LEN + 1, "/");
         
@@ -147 +147 @@
 }
 
-/** Set the program to load.
+/** Set pathname of the program to load.
+ *
+ * Sets the name of the program file to load. The name can be relative
+ * to the current working directory (it will be absolutized before
+ * sending to the loader).
  *
  * @param ldr  Loader connection structure.
- * @param name Name to set for the spawned program.
- * @param file Program file.
- *
- * @return Zero on success or negative error code.
- *
- */
-int loader_set_program(loader_t *ldr, const char *name, int file)
-{
-        async_exch_t *exch = async_exchange_begin(ldr->sess);
-
-        ipc_call_t answer;
-        aid_t req = async_send_0(exch, LOADER_SET_PROGRAM, &answer);
-
-        sysarg_t rc = async_data_write_start(exch, name, str_size(name) + 1);
-        if (rc == EOK) {
-                async_exch_t *vfs_exch = vfs_exchange_begin();
-                rc = vfs_pass_handle(vfs_exch, file, exch);
-                vfs_exchange_end(vfs_exch);
-        }
-
-        async_exchange_end(exch);
-
-        if (rc != EOK) {
-                async_forget(req);
-                return (int) rc;
-        }
-
-        async_wait_for(req, &rc);
-        return (int) rc;
-}
-
-/** Set the program to load by path.
- *
- * @param ldr  Loader connection structure.
- * @param path Program path.
- *
- * @return Zero on success or negative error code.
- *
- */
-int loader_set_program_path(loader_t *ldr, const char *path)
-{
-        const char *name = str_rchr(path, '/');
-        if (name == NULL) {
-                name = path;
-        } else {
-                name++;
-        }
-        
-        int fd = vfs_lookup(path, 0);
-        if (fd < 0) {
-                return fd;
-        }
-        
-        int rc = loader_set_program(ldr, name, fd);
-        vfs_put(fd);
-        return rc;
-}
-
+ * @param path Pathname of the program file.
+ *
+ * @return Zero on success or negative error code.
+ *
+ */
+int loader_set_pathname(loader_t *ldr, const char *path)
+{
+        size_t pa_len;
+        char *pa = vfs_absolutize(path, &pa_len);
+        if (!pa)
+                return ENOMEM;
+        
+        /* Send program pathname */
+        async_exch_t *exch = async_exchange_begin(ldr->sess);
+        
+        ipc_call_t answer;
+        aid_t req = async_send_0(exch, LOADER_SET_PATHNAME, &answer);
+        sysarg_t rc = async_data_write_start(exch, (void *) pa, pa_len);
+        
+        async_exchange_end(exch);
+        free(pa);
+        
+        if (rc != EOK) {
+                async_forget(req);
+                return (int) rc;
+        }
+        
+        async_wait_for(req, &rc);
+        return (int) rc;
+}
 
 /** Set command-line arguments for the program.
@@ -268 +244 @@
 }
 
-/** Add a file to the task's inbox.
- *
- * @param ldr        Loader connection structure.
- * @param name       Identification of the file.
- * @param file       The file's descriptor.
- *
- * @return Zero on success or negative error code.
- *
- */
-int loader_add_inbox(loader_t *ldr, const char *name, int file)
-{
+/** Set preset files for the program.
+ *
+ * Sets the vector of preset files to be passed to the loaded
+ * program. By convention, the first three files represent stdin,
+ * stdout and stderr respectively.
+ *
+ * @param ldr   Loader connection structure.
+ * @param files NULL-terminated array of pointers to files.
+ *
+ * @return Zero on success or negative error code.
+ *
+ */
+int loader_set_files(loader_t *ldr, int * const files[])
+{
+        /* Send serialized files to the loader */
         async_exch_t *exch = async_exchange_begin(ldr->sess);
         async_exch_t *vfs_exch = vfs_exchange_begin();
         
-        aid_t req = async_send_0(exch, LOADER_ADD_INBOX, NULL);
-        
-        sysarg_t rc = async_data_write_start(exch, name, str_size(name) + 1);
-        if (rc == EOK) {
-                rc = vfs_pass_handle(vfs_exch, file, exch);
-        }
-        
-        async_exchange_end(vfs_exch);
-        async_exchange_end(exch);
-        
-        if (rc == EOK) {
-                async_wait_for(req, &rc);
-        } else {
-                async_forget(req);
-        }
-        
+        int i;
+        for (i = 0; files[i]; i++);
+
+        ipc_call_t answer;
+        aid_t req = async_send_1(exch, LOADER_SET_FILES, i, &answer);
+
+        sysarg_t rc = EOK;
+        
+        for (i = 0; files[i]; i++) {
+                rc = async_state_change_start(exch, VFS_PASS_HANDLE, *files[i],
+                    0, vfs_exch); 
+                if (rc != EOK)
+                        break;
+        }
+        
+        vfs_exchange_end(vfs_exch);
+        async_exchange_end(exch);
+
+        if (rc != EOK) {
+                async_forget(req);
+                return (int) rc;
+        }
+        
+        async_wait_for(req, &rc);
         return (int) rc;
 }