Changeset 132ab5d1 in mainline for uspace/app/getterm/getterm.c

Timestamp:

2018-01-30T03:20:45Z (8 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

5a6cc679

Parents:

8bfb163 (diff), 6a5d05b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge commit '6a5d05bd2551e64111bea4f9332dd7448c26ce84' into forwardport

Separate return value from error code in gen_irq_code*().

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;