Changeset b19e892 in mainline for uspace/app/bdsh/cmds

Timestamp:

2017-04-02T10:39:13Z (7 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().

Location:

uspace/app/bdsh/cmds/modules

Files:

• cat/cat.c (modified) (2 diffs)
• cmp/cmp.c (modified) (2 diffs)
• cp/cp.c (modified) (2 diffs)
• ls/ls.c (modified) (1 diff)
• mkdir/mkdir.c (modified) (1 diff)
• mkfile/mkfile.c (modified) (3 diffs)
• rm/rm.c (modified) (2 diffs)
• touch/touch.c (modified) (2 diffs)

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

@@ -33 +33 @@
 #include <getopt.h>
 #include <str.h>
-#include <fcntl.h>
 #include <io/console.h>
 #include <io/color.h>
@@ -196 +195 @@
                 blen = STR_BOUNDS(1);
         } else
-                fd = open(fname, O_RDONLY);
+                fd = vfs_lookup_open(fname, WALK_REGULAR, MODE_READ);
         
         if (fd < 0) {

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

@@ -28 +28 @@
 
 #include <errno.h>
-#include <fcntl.h>
 #include <getopt.h>
 #include <mem.h>
@@ -82 +81 @@
 
         for (int i = 0; i < 2; i++) {
-                fd[i] = open(fn[i], O_RDONLY);
+                fd[i] = vfs_lookup_open(fn[i], WALK_REGULAR, MODE_READ);
                 if (fd[i] < 0) {
-                        rc = errno;
+                        rc = fd[i];
                         printf("Unable to open %s\n", fn[i]);
                         goto end;

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);

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

@@ -36 +36 @@
 #include <unistd.h>
 #include <dirent.h>
-#include <fcntl.h>
 #include <getopt.h>
 #include <sys/types.h>

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

@@ -30 +30 @@
 #include <stdlib.h>
 #include <dirent.h>
-#include <fcntl.h>
 #include <sys/types.h>
 #include <getopt.h>

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

@@ -31 +31 @@
 #include <stdlib.h>
 #include <dirent.h>
-#include <fcntl.h>
 #include <sys/types.h>
 #include <macros.h>
@@ -38 +37 @@
 #include <str.h>
 #include <ctype.h>
+#include <vfs/vfs.h>
 
 #include "config.h"
@@ -156 +156 @@
         file_name = argv[optind];
 
-        fd = open(file_name, O_CREAT | O_EXCL | O_WRONLY, 0666);
+        fd = vfs_lookup_open(file_name, WALK_REGULAR | WALK_MUST_CREATE, MODE_WRITE);
         if (fd < 0) {
                 printf("%s: failed to create file %s.\n", cmdname, file_name);

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

@@ -31 +31 @@
 #include <stdlib.h>
 #include <unistd.h>
-#include <fcntl.h>
 #include <dirent.h>
 #include <getopt.h>
@@ -151 +150 @@
         }
 
-        fd = open(path, O_RDONLY);
+        fd = vfs_lookup(path, WALK_REGULAR);
         if (fd >= 0) {
                 close(fd);

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

@@ -35 +35 @@
 #include <stdlib.h>
 #include <unistd.h>
-#include <fcntl.h>
 #include <dirent.h>
 #include <sys/types.h>
@@ -125 +124 @@
                 if ((!no_create) ||
                     ((no_create) && (vfs_stat_path(buff, &file_stat) == EOK))) {
-                        fd = open(buff, O_RDWR | O_CREAT);
+                        fd = vfs_lookup(buff, WALK_REGULAR | WALK_MAY_CREATE);
                 }