Changeset 368ee04 in mainline for uspace/lib/posix/source/fcntl.c

Timestamp:

2017-04-05T18:10:39Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

93ad8166

Parents:

39f892a9 (diff), 2166728 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from lp:~jakub/helenos/vfs-2.5-cherrypick

This merge cherry-picks some of the changesets from Jiri Zarevucky's:

lp:~zarevucky-jiri/helenos/vfs-2.5

and then continues independently, yet sometime in a similar vein.

Roughly speaking, Jiri's branch is merged entirely up to its revision
1926 and then cherry-picked on and off until its revision 1965. Among
these changes are:

• relativization of the API,
• client-side roots,
• server-side mounts,
• inbox for passing arbitrary files from parent to child,
• some streamlining and cleanup.

Additional changes include:

• addressing issues introduced by the above changes,
• client-side I/O cursors (file positions),
• all HelenOS file system APIs begin with the vfs_ prefix and can be used after including vfs/vfs.h,
• removal of some POSIX-ish headers and definitions,
• additional cleanup.

File:

• uspace/lib/posix/source/fcntl.c (modified) (1 diff)

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;
+        posix_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, posix_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) {
+                vfs_put(file);
+                return -1;
+        }
+
+        if (posix_flags & O_TRUNC) {
+                if (posix_flags & (O_RDWR | O_WRONLY)) {
+                        rc = rcerrno(vfs_resize, file, 0);
+                        if (rc != EOK) {
+                                vfs_put(file);
+                                return -1;
+                        }
+                }
+        }
+
+        return file;
 }
 
 /** @}
  */
+