Changeset b19e892 in mainline for uspace/lib/posix

Timestamp:

2017-04-02T10:39:13Z (9 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/lib/posix

Files:

• include/posix/fcntl.h (modified) (1 diff)
• source/fcntl.c (modified) (1 diff)
• source/stdlib.c (modified) (1 diff)
• source/unistd.c (modified) (1 diff)

uspace/lib/posix/include/posix/fcntl.h

@@ -41 +41 @@
 
 #include "sys/types.h"
-#include "libc/fcntl.h"
 #include "errno.h"
+
+#undef O_CREAT
+#undef O_EXCL
+#undef O_TRUNC
+#undef O_APPEND
+#undef O_RDONLY
+#undef O_RDWR
+#undef O_WRONLY
+#define O_CREAT   1
+#define O_EXCL    2
+#define O_TRUNC   4
+#define O_APPEND  8
+#define O_RDONLY  16
+#define O_RDWR    32
+#define O_WRONLY  64
 
 /* Mask for file access modes. */

uspace/lib/posix/source/fcntl.c

@@ -100 +100 @@
  *
  * @param pathname Path to the file.
- * @param flags Access mode flags.
+ * @param posix_flags Access mode flags.
  */
-int posix_open(const char *pathname, int flags, ...)
+int posix_open(const char *pathname, int posix_flags, ...)
 {
-        mode_t mode = 0;
-        if ((flags & O_CREAT) > 0) {
+        int rc;
+        mode_t posix_mode = 0;
+        if (posix_flags & O_CREAT) {
                 va_list args;
-                va_start(args, flags);
-                mode = va_arg(args, mode_t);
+                va_start(args, posix_flags);
+                posix_mode = va_arg(args, mode_t);
                 va_end(args);
+                (void) posix_mode;
         }
 
-        return negerrno(open, pathname, flags, mode);
+        if (((posix_flags & (O_RDONLY | O_WRONLY | O_RDWR)) == 0) ||
+            ((posix_flags & (O_RDONLY | O_WRONLY)) == (O_RDONLY | O_WRONLY)) ||
+            ((posix_flags & (O_RDONLY | O_RDWR)) == (O_RDONLY | O_RDWR)) ||
+            ((posix_flags & (O_WRONLY | O_RDWR)) == (O_WRONLY | O_RDWR))) {
+                errno = EINVAL;
+                return -1;
+        }
+
+        int flags = WALK_REGULAR;
+        if (posix_flags & O_CREAT) {
+                if (posix_flags & O_EXCL)
+                        flags |= WALK_MUST_CREATE;
+                else
+                        flags |= WALK_MAY_CREATE;
+        }
+
+        int mode =
+            ((posix_flags & O_RDWR) ? MODE_READ | MODE_WRITE : 0) |
+            ((posix_flags & O_RDONLY) ? MODE_READ : 0) |
+            ((posix_flags & O_WRONLY) ? MODE_WRITE : 0) |
+            ((posix_flags & O_APPEND) ? MODE_APPEND : 0);
+
+        int file = rcerrno(vfs_lookup, pathname, flags);
+        if (file < 0)
+                return -1;
+
+        rc = rcerrno(vfs_open, file, mode);
+        if (rc != EOK) {
+                close (file);
+                return -1;
+        }
+
+        if (posix_flags & O_TRUNC) {
+                if (posix_flags & (O_RDWR | O_WRONLY)) {
+                        rc = rcerrno(vfs_resize, file, 0);
+                        if (rc != EOK) {
+                                close(file);
+                                return -1;
+                        }
+                }
+        }
+
+        return file;
 }
 
 /** @}
  */
+

uspace/lib/posix/source/stdlib.c

@@ -431 +431 @@
                 }
                 
-                fd = open(tmpl, O_RDWR | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR);
+                fd = posix_open(tmpl, O_RDWR | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR);
                 
                 if (fd == -1) {

uspace/lib/posix/source/unistd.c

@@ -335 +335 @@
                  * Check file existence by attempting to open it.
                  */
-                int fd = negerrno(open, path, O_RDONLY);
-                if (fd < 0) {
-                        /* errno was set by open() */
+                int fd = posix_open(path, O_RDONLY);
+                if (fd < 0)
                         return -1;
-                }
                 close(fd);
                 return 0;