Changeset bb9ec2d in mainline for uspace/app

Timestamp:

2017-03-07T20:47:35Z (9 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

a737667e

Parents:

e796dc8

git-author:

Jiri Zarevucky <zarevucky.jiri@…> (2017-03-07 20:47:35)

git-committer:

Jakub Jermar <jakub@…> (2017-03-07 20:47:35)

Message:

Merge from lp:~zarevucky-jiri/helenos/vfs-2.5/ revision 1941-1944

Original commit messages:

1944: Jiri Zarevucky 2013-08-06 Replace legacy file descriptor presetting with inbox.
1943: Jiri Zarevucky 2013-08-06 Do not preserve open state when passing file descriptor to another task. Allow receiver to specify, whether the descriptor is low or high.
1942: Jiri Zarevucky 2013-08-06 C style.
1941: Jiri Zarevucky 2013-08-06 Make loader accept file reference instead of a pathname.

Modifications:

• Keep version of elf_load_file() that accepts file name
• Changes required for loading dynamically linked executables
• Update to newer list_foreach

Location:

uspace/app

Files:

• bdsh/exec.c (modified) (2 diffs)
• trace/trace.c (modified) (2 diffs)

uspace/app/bdsh/exec.c

@@ -101 +101 @@
         char *tmp;
         int rc, retval, i;
-        int file_handles[3];
-        int *file_handles_p[4];
+        int file_handles[3] = { -1, -1, -1 };
         FILE *files[3];
 
@@ -113 +112 @@
         
         for (i = 0; i < 3 && files[i] != NULL; i++) {
-                if (vfs_fhandle(files[i], &file_handles[i]) == EOK) {
-                        file_handles_p[i] = &file_handles[i];
-                }
-                else {
-                        file_handles_p[i] = NULL;
-                }
+                vfs_fhandle(files[i], &file_handles[i]);
         }
-        file_handles_p[i] = NULL;
 
-        rc = task_spawnvf(&tid, &twait, tmp, (const char **) argv, file_handles_p);
+        rc = task_spawnvf(&tid, &twait, tmp, (const char **) argv,
+            file_handles[0], file_handles[1], file_handles[2]);
         free(tmp);
 

uspace/app/trace/trace.c

@@ -513 +513 @@
 
         /* Send program pathname */
-        rc = loader_set_pathname(ldr, path);
+        rc = loader_set_program_path(ldr, path);
         if (rc != EOK)
                 goto error;
@@ -523 +523 @@
 
         /* Send default files */
-        int *files[4];
         int fd_stdin;
         int fd_stdout;
         int fd_stderr;
         
-        if ((stdin != NULL) && (vfs_fhandle(stdin, &fd_stdin) == EOK))
-                files[0] = &fd_stdin;
-        else
-                files[0] = NULL;
-        
-        if ((stdout != NULL) && (vfs_fhandle(stdout, &fd_stdout) == EOK))
-                files[1] = &fd_stdout;
-        else
-                files[1] = NULL;
-        
-        if ((stderr != NULL) && (vfs_fhandle(stderr, &fd_stderr) == EOK))
-                files[2] = &fd_stderr;
-        else
-                files[2] = NULL;
-        
-        files[3] = NULL;
-        
-        rc = loader_set_files(ldr, files);
-        if (rc != EOK)
-                goto error;
-
+        if ((stdin != NULL) && (vfs_fhandle(stdin, &fd_stdin) == EOK)) {
+                rc = loader_add_inbox(ldr, "stdin", fd_stdin);
+                if (rc != EOK)
+                        goto error;
+        }
+        
+        if ((stdout != NULL) && (vfs_fhandle(stdout, &fd_stdout) == EOK)) {
+                rc = loader_add_inbox(ldr, "stdout", fd_stdout);
+                if (rc != EOK)
+                        goto error;
+        }
+        
+        if ((stderr != NULL) && (vfs_fhandle(stderr, &fd_stderr) == EOK)) {
+                rc = loader_add_inbox(ldr, "stderr", fd_stderr);
+                if (rc != EOK)
+                        goto error;
+        }
+        
         /* Load the program. */
         rc = loader_load_program(ldr);