Changeset 132ab5d1 in mainline for uspace/app/bdsh/exec.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/bdsh/exec.c (modified) (2 diffs)

uspace/app/bdsh/exec.c

@@ -58 +58 @@
         int fd;
 
-        fd = vfs_lookup_open(f, WALK_REGULAR, MODE_READ);
-        if (fd >= 0) {
+        int rc = vfs_lookup_open(f, WALK_REGULAR, MODE_READ, &fd);
+        if (rc == EOK) {
                 vfs_put(fd);
                 return 0;
@@ -98 +98 @@
         task_exit_t texit;
         char *tmp;
-        int rc, retval, i;
+        int rc;
+        int retval, i;
         int file_handles[3] = { -1, -1, -1 };
         FILE *files[3];