Changeset b19e892 in mainline for uspace/lib/c/generic/io/io.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/lib/c/generic/io/io.c (modified) (9 diffs)

uspace/lib/c/generic/io/io.c

@@ -35 +35 @@
 #include <stdio.h>
 #include <unistd.h>
-#include <fcntl.h>
 #include <assert.h>
 #include <str.h>
@@ -115 +114 @@
                 int stdinfd = vfs_clone(infd, -1, false);
                 assert(stdinfd == 0);
-                _vfs_open(stdinfd, MODE_READ);
+                vfs_open(stdinfd, MODE_READ);
                 stdin = fdopen(stdinfd, "r");
         } else {
@@ -128 +127 @@
                 while (stdoutfd < 1)
                         stdoutfd = vfs_clone(outfd, -1, false);
-                _vfs_open(stdoutfd, MODE_APPEND);
+                vfs_open(stdoutfd, MODE_APPEND);
                 stdout = fdopen(stdoutfd, "a");
         } else {
@@ -141 +140 @@
                 while (stderrfd < 2)
                         stderrfd = vfs_clone(errfd, -1, false);
-                _vfs_open(stderrfd, MODE_APPEND);
+                vfs_open(stderrfd, MODE_APPEND);
                 stderr = fdopen(stderrfd, "a");
         } else {
@@ -157 +156 @@
 }
 
-static bool parse_mode(const char *mode, int *flags)
+static bool parse_mode(const char *fmode, int *mode, bool *create, bool *truncate)
 {
         /* Parse mode except first character. */
-        const char *mp = mode;
+        const char *mp = fmode;
         if (*mp++ == 0) {
                 errno = EINVAL;
@@ -180 +179 @@
                 return false;
         }
-        
-        /* Parse first character of mode and determine flags for open(). */
-        switch (mode[0]) {
+
+        *create = false;
+        *truncate = false;
+        
+        /* Parse first character of fmode and determine mode for vfs_open(). */
+        switch (fmode[0]) {
         case 'r':
-                *flags = plus ? O_RDWR : O_RDONLY;
+                *mode = plus ? MODE_READ | MODE_WRITE : MODE_READ;
                 break;
         case 'w':
-                *flags = (O_TRUNC | O_CREAT) | (plus ? O_RDWR : O_WRONLY);
+                *mode = plus ? MODE_READ | MODE_WRITE : MODE_WRITE;
+                *create = true;
+                if (!plus)
+                        *truncate = true;
                 break;
         case 'a':
@@ -195 +200 @@
                         return false;
                 }
-                *flags = (O_APPEND | O_CREAT) | (plus ? O_RDWR : O_WRONLY);
+
+                *mode = MODE_APPEND | (plus ? MODE_READ | MODE_WRITE : MODE_WRITE);
+                *create = true;
                 break;
         default:
@@ -269 +276 @@
  *
  */
-FILE *fopen(const char *path, const char *mode)
-{
-        int flags;
-        if (!parse_mode(mode, &flags))
+FILE *fopen(const char *path, const char *fmode)
+{
+        int mode;
+        bool create;
+        bool truncate;
+
+        if (!parse_mode(fmode, &mode, &create, &truncate))
                 return NULL;
         
@@ -281 +291 @@
                 return NULL;
         }
-        
-        stream->fd = open(path, flags, 0666);
-        if (stream->fd < 0) {
-                /* errno was set by open() */
+
+        int flags = WALK_REGULAR;
+        if (create)
+                flags |= WALK_MAY_CREATE;
+        int file = vfs_lookup(path, flags);
+        if (file < 0) {
+                errno = file;
                 free(stream);
                 return NULL;
         }
-        
+
+        int rc = vfs_open(file, mode);
+        if (rc != EOK) {
+                errno = rc;
+                close(file);
+                free(stream);
+                return NULL;
+        }
+        
+        if (truncate) {
+                rc = vfs_resize(file, 0);
+                if (rc != EOK) {
+                        errno = rc;
+                        close(file);
+                        free(stream);
+                        return NULL;
+                }
+        }
+
+        stream->fd = file;
         stream->pos = 0;
         stream->error = false;