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

Timestamp:

2017-04-02T10:39:13Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

9c4cf0d

Parents:

80743a1

Message:

Merge open() with posix_open() and provide vfs_lookup_open() instead

vfs_lookup_open() is really just a convenience wrapper around
vfs_lookup() and vfs_open().

File:

• uspace/app/bdsh/cmds/modules/cp/cp.c (modified) (2 diffs)

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

@@ -35 +35 @@
 #include <getopt.h>
 #include <str.h>
-#include <fcntl.h>
 #include <vfs/vfs.h>
 #include <dirent.h>
@@ -383 +382 @@
                 printf("Copying %s to %s\n", src, dest);
 
-        if (-1 == (fd1 = open(src, O_RDONLY))) {
+        fd1 = vfs_lookup_open(src, WALK_REGULAR, MODE_READ);
+        if (fd1 < 0) {
                 printf("Unable to open source file %s\n", src);
                 return -1;
         }
 
-        if (-1 == (fd2 = open(dest, O_WRONLY | O_CREAT))) {
+        fd2 = vfs_lookup_open(dest, WALK_REGULAR | WALK_MAY_CREATE, MODE_WRITE);
+        if (fd2 < 0) {
                 printf("Unable to open destination file %s\n", dest);
                 close(fd1);