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

Timestamp:

2017-12-08T21:03:35Z (8 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

c19a5a59

Parents:

c1694b6b

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2017-12-07 19:44:55)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2017-12-08 21:03:35)

Message:

Return VFS handles separately from error codes.

File:

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

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

@@ -108 +108 @@
          * This will probably be removed later.
          */
-         
         int infd = inbox_get("stdin");
         if (infd >= 0) {
-                int stdinfd = vfs_clone(infd, -1, false);
+                int stdinfd = -1;
+                (void) vfs_clone(infd, -1, false, &stdinfd);
                 assert(stdinfd == 0);
                 vfs_open(stdinfd, MODE_READ);
@@ -122 +122 @@
         int outfd = inbox_get("stdout");
         if (outfd >= 0) {
-                int stdoutfd = vfs_clone(outfd, -1, false);
+                int stdoutfd = -1;
+                (void) vfs_clone(outfd, -1, false, &stdoutfd);
                 assert(stdoutfd <= 1);
                 while (stdoutfd < 1)
-                        stdoutfd = vfs_clone(outfd, -1, false);
+                        (void) vfs_clone(outfd, -1, false, &stdoutfd);
                 vfs_open(stdoutfd, MODE_APPEND);
                 stdout = fdopen(stdoutfd, "a");
@@ -135 +136 @@
         int errfd = inbox_get("stderr");
         if (errfd >= 0) {
-                int stderrfd = vfs_clone(errfd, -1, false);
+                int stderrfd = -1;
+                (void) vfs_clone(errfd, -1, false, &stderrfd);
                 assert(stderrfd <= 2);
                 while (stderrfd < 2)
-                        stderrfd = vfs_clone(errfd, -1, false);
+                        (void) vfs_clone(errfd, -1, false, &stderrfd);
                 vfs_open(stderrfd, MODE_APPEND);
                 stderr = fdopen(stderrfd, "a");
@@ -294 +296 @@
         if (create)
                 flags |= WALK_MAY_CREATE;
-        int file = vfs_lookup(path, flags);
-        if (file < 0) {
-                errno = file;
+        int file;
+        int rc = vfs_lookup(path, flags, &file);
+        if (rc != EOK) {
+                errno = rc;
                 free(stream);
                 return NULL;
         }
 
-        int rc = vfs_open(file, mode);
+        rc = vfs_open(file, mode);
         if (rc != EOK) {
                 errno = rc;
@@ -373 +376 @@
         list_remove(&stream->link);
         
-        if (rc != 0) {
-                /* errno was set by close() */
+        if (rc != EOK) {
+                errno = rc;
                 return EOF;
         }