Changeset b19e892 in mainline for uspace/srv

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().

Location:

uspace/srv

Files:

• devman/driver.c (modified) (1 diff)
• devman/match.c (modified) (2 diffs)
• hid/input/ctl/kbdev.c (modified) (1 diff)
• hid/input/port/adb.c (modified) (1 diff)
• hid/input/proto/mousedev.c (modified) (1 diff)
• loader/main.c (modified) (1 diff)
• vfs/vfs_ipc.c (modified) (1 diff)
• vfs/vfs_ops.c (modified) (4 diffs)

uspace/srv/devman/driver.c

@@ -33 +33 @@
 #include <dirent.h>
 #include <errno.h>
-#include <fcntl.h>
 #include <io/log.h>
 #include <vfs/vfs.h>

uspace/srv/devman/match.c

@@ -32 +32 @@
 
 #include <errno.h>
-#include <fcntl.h>
 #include <io/log.h>
 #include <str.h>
@@ -203 +202 @@
         struct stat st;
         
-        fd = open(conf_path, O_RDONLY);
+        fd = vfs_lookup_open(conf_path, WALK_REGULAR, MODE_READ);
         if (fd < 0) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Unable to open `%s' for reading: %s.",

uspace/srv/hid/input/ctl/kbdev.c

@@ -39 +39 @@
 #include <stdbool.h>
 #include <errno.h>
-#include <fcntl.h>
 #include <io/console.h>
 #include <io/keycode.h>

uspace/srv/hid/input/port/adb.c

@@ -38 +38 @@
 #include <async.h>
 #include <vfs/vfs.h>
-#include <fcntl.h>
 #include <errno.h>
 #include <loc.h>

uspace/srv/hid/input/proto/mousedev.c

@@ -37 +37 @@
 
 #include <stdio.h>
-#include <fcntl.h>
 #include <vfs/vfs_sess.h>
 #include <malloc.h>

uspace/srv/loader/main.c

@@ -48 +48 @@
 #include <unistd.h>
 #include <stdbool.h>
-#include <fcntl.h>
 #include <sys/types.h>
 #include <ipc/services.h>

uspace/srv/vfs/vfs_ipc.c

@@ -99 +99 @@
 {
         int fd = IPC_GET_ARG1(*request);
-        int flags = IPC_GET_ARG2(*request);
-
-        int rc = vfs_op_open(fd, flags);
+        int mode = IPC_GET_ARG2(*request);
+
+        int rc = vfs_op_open(fd, mode);
         async_answer_0(rid, rc);
 }

uspace/srv/vfs/vfs_ops.c

@@ -49 +49 @@
 #include <unistd.h>
 #include <ctype.h>
-#include <fcntl.h>
 #include <assert.h>
 #include <vfs/canonify.h>
@@ -274 +273 @@
 }
 
-int vfs_op_open(int fd, int flags)
-{
-        if (flags == 0)
+int vfs_op_open(int fd, int mode)
+{
+        if (mode == 0)
                 return EINVAL;
 
@@ -283 +282 @@
                 return EBADF;
         
-        if ((flags & ~file->permissions) != 0) {
+        if ((mode & ~file->permissions) != 0) {
                 vfs_file_put(file);
                 return EPERM;
@@ -293 +292 @@
         }
         
-        file->open_read = (flags & MODE_READ) != 0;
-        file->open_write = (flags & (MODE_WRITE | MODE_APPEND)) != 0;
-        file->append = (flags & MODE_APPEND) != 0;
+        file->open_read = (mode & MODE_READ) != 0;
+        file->open_write = (mode & (MODE_WRITE | MODE_APPEND)) != 0;
+        file->append = (mode & MODE_APPEND) != 0;
         
         if (!file->open_read && !file->open_write) {