Changeset ff381a7 in mainline for uspace/app/bdsh/exec.c

Timestamp:

2015-11-02T20:54:19Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d8513177

Parents:

3feeab2 (diff), 5265eea4 (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 mainline changes.

File:

• uspace/app/bdsh/exec.c (modified) (2 diffs)

uspace/app/bdsh/exec.c

@@ -61 +61 @@
 
         fd = open(f, O_RDONLY);
-        if (fd > -1) {
+        if (fd >= 0) {
                 close(fd);
                 return 0;
@@ -113 +113 @@
         
         for (i = 0; i < 3 && files[i] != NULL; i++) {
-                if (fhandle(files[i], &file_handles[i]) == EOK) {
+                if (vfs_fhandle(files[i], &file_handles[i]) == EOK) {
                         file_handles_p[i] = &file_handles[i];
                 }