Changeset b19e892 in mainline for uspace/srv/vfs/vfs_ops.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/srv/vfs/vfs_ops.c (modified) (4 diffs)

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