Changeset bb9ec2d in mainline for uspace/lib/c/generic/io/io.c

Timestamp:

2017-03-07T20:47:35Z (8 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

File:

• uspace/lib/c/generic/io/io.c (modified) (4 diffs)

uspace/lib/c/generic/io/io.c

@@ -45 +45 @@
 #include <vfs/vfs.h>
 #include <vfs/vfs_sess.h>
+#include <vfs/inbox.h>
 #include <ipc/loc.h>
 #include <adt/list.h>
@@ -101 +102 @@
 static LIST_INITIALIZE(files);
 
-void __stdio_init(int filc)
-{
-        if (filc > 0) {
-                stdin = fdopen(0, "r");
+void __stdio_init(void)
+{
+        /* The first three standard file descriptors are assigned for compatibility.
+         * This will probably be removed later.
+         */
+         
+        int infd = inbox_get("stdin");
+        if (infd >= 0) {
+                int stdinfd = vfs_clone(infd, false);
+                assert(stdinfd == 0);
+                _vfs_open(stdinfd, MODE_READ);
+                stdin = fdopen(stdinfd, "r");
         } else {
                 stdin = &stdin_null;
@@ -110 +119 @@
         }
         
-        if (filc > 1) {
-                stdout = fdopen(1, "w");
+        int outfd = inbox_get("stdout");
+        if (outfd >= 0) {
+                int stdoutfd = vfs_clone(outfd, false);
+                assert(stdoutfd <= 1);
+                while (stdoutfd < 1) {
+                        stdoutfd = vfs_clone(outfd, false);
+                }
+                _vfs_open(stdoutfd, MODE_APPEND);
+                stdout = fdopen(stdoutfd, "a");
         } else {
                 stdout = &stdout_kio;
@@ -117 +133 @@
         }
         
-        if (filc > 2) {
-                stderr = fdopen(2, "w");
+        int errfd = inbox_get("stderr");
+        if (errfd >= 0) {
+                int stderrfd = vfs_clone(errfd, false);
+                assert(stderrfd <= 2);
+                while (stderrfd < 2) {
+                        stderrfd = vfs_clone(errfd, false);
+                }
+                _vfs_open(stderrfd, MODE_APPEND);
+                stderr = fdopen(stderrfd, "a");
         } else {
                 stderr = &stderr_kio;