Changeset f77c1c9 in mainline for uspace/app/bdsh/cmds/modules/cp/cp.c

Timestamp:

2017-12-08T21:03:35Z (7 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/bdsh/cmds/modules/cp/cp.c (modified) (1 diff)

uspace/app/bdsh/cmds/modules/cp/cp.c

@@ -394 +394 @@
                 printf("Copying %s to %s\n", src, dest);
 
-        fd1 = vfs_lookup_open(src, WALK_REGULAR, MODE_READ);
-        if (fd1 < 0) {
+        rc = vfs_lookup_open(src, WALK_REGULAR, MODE_READ, &fd1);
+        if (rc != EOK) {
                 printf("Unable to open source file %s\n", src);
                 return -1;
         }
 
-        fd2 = vfs_lookup_open(dest, WALK_REGULAR | WALK_MAY_CREATE, MODE_WRITE);
-        if (fd2 < 0) {
+        rc = vfs_lookup_open(dest, WALK_REGULAR | WALK_MAY_CREATE, MODE_WRITE, &fd2);
+        if (rc != EOK) {
                 printf("Unable to open destination file %s\n", dest);
                 vfs_put(fd1);