Changeset f77c1c9 in mainline for uspace/app/getterm/getterm.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/app/getterm/getterm.c (modified) (1 diff)

uspace/app/getterm/getterm.c

@@ -65 +65 @@
         *stream = NULL;
         
-        int oldfd = vfs_lookup_open(path, WALK_REGULAR, mode);
-        if (oldfd < 0)
+        int oldfd;
+        int rc = vfs_lookup_open(path, WALK_REGULAR, mode, &oldfd);
+        if (rc != EOK)
                 return;
         
         if (oldfd != fd) {
-                if (vfs_clone(oldfd, fd, false) != fd)
+                int newfd;
+                if (vfs_clone(oldfd, fd, false, &newfd) != EOK)
                         return;
                 
+                assert(newfd == fd);
+
                 if (vfs_put(oldfd))
                         return;