Changeset 368ee04 in mainline for uspace/lib/posix/source/unistd.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/unistd.c (modified) (13 diffs)

uspace/lib/posix/source/unistd.c

@@ -47 +47 @@
 #include "libc/stats.h"
 #include "libc/malloc.h"
+#include "libc/vfs/vfs.h"
+
+aoff64_t posix_pos[MAX_OPEN_FILES];
 
 /* Array of environment variable strings (NAME=VALUE). */
@@ -105 +108 @@
 char *posix_getcwd(char *buf, size_t size)
 {
-        char *p = getcwd(buf, size);
-
-        if (p == NULL) {
-                errno = -errno;
+        int rc = rcerrno(vfs_cwd_get, buf, size);
+        if (rc != EOK) 
                 return NULL;
-        }
-
-        return p;
+        return buf;
 }
 
@@ -122 +121 @@
 int posix_chdir(const char *path)
 {
-        return negerrno(chdir, path);
+        int rc = rcerrno(vfs_cwd_set, path);
+        if (rc != EOK)
+                return -1;
+        return 0;
 }
 
@@ -175 +177 @@
 int posix_close(int fildes)
 {
-        return negerrno(close, fildes);
+        posix_pos[fildes] = 0;
+        int rc = rcerrno(vfs_put, fildes);
+        if (rc != EOK)
+                return -1;
+        else
+                return 0;
 }
 
@@ -188 +195 @@
 ssize_t posix_read(int fildes, void *buf, size_t nbyte)
 {
-        return negerrno(read, fildes, buf, nbyte);
+        ssize_t size = rcerrno(vfs_read, fildes, &posix_pos[fildes], buf, nbyte);
+        if (size < 0)
+                return -1;
+        return size;
 }
 
@@ -201 +211 @@
 ssize_t posix_write(int fildes, const void *buf, size_t nbyte)
 {
-        return negerrno(write, fildes, buf, nbyte);
+        ssize_t size = rcerrno(vfs_write, fildes, &posix_pos[fildes], buf, nbyte);
+        if (size < 0)
+                return -1;
+        return size;
 }
 
@@ -215 +228 @@
 posix_off_t posix_lseek(int fildes, posix_off_t offset, int whence)
 {
-        return negerrno(lseek, fildes, offset, whence);
+        struct stat st;
+        int rc;
+
+        switch (whence) {
+        case SEEK_SET:
+                posix_pos[fildes] = offset;
+                break;
+        case SEEK_CUR:
+                posix_pos[fildes] += offset;
+                break;
+        case SEEK_END:
+                rc = rcerrno(vfs_stat, fildes, &st);
+                if (rc != EOK)
+                        return -1;
+                posix_pos[fildes] = st.size + offset;
+                break;
+        }
+        if (posix_pos[fildes] > INT64_MAX) {
+                /* The native width is too large for the POSIX interface. */
+                errno = ERANGE;
+                return -1;
+        }
+        return posix_pos[fildes];
 }
 
@@ -226 +261 @@
 int posix_fsync(int fildes)
 {
-        return negerrno(fsync, fildes);
+        if (rcerrno(vfs_sync, fildes) != EOK)
+                return -1;
+        else
+                return 0;
 }
 
@@ -238 +276 @@
 int posix_ftruncate(int fildes, posix_off_t length)
 {
-        return negerrno(ftruncate, fildes, (aoff64_t) length);
+        if (rcerrno(vfs_resize, fildes, (aoff64_t) length) != EOK)
+                return -1;
+        else
+                return 0;
 }
 
@@ -249 +290 @@
 int posix_rmdir(const char *path)
 {
-        return negerrno(rmdir, path);
+        if (rcerrno(vfs_unlink_path, path) != EOK)
+                return -1;
+        else
+                return 0;
 }
 
@@ -260 +304 @@
 int posix_unlink(const char *path)
 {
-        return negerrno(unlink, path);
+        if (rcerrno(vfs_unlink_path, path) != EOK)
+                return -1;
+        else
+                return 0;
 }
 
@@ -284 +331 @@
 int posix_dup2(int fildes, int fildes2)
 {
-        return negerrno(dup2, fildes, fildes2);
+        return negerrno(vfs_clone, fildes, fildes2, false);
 }
 
@@ -302 +349 @@
                  * 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);
+                posix_close(fd);
                 return 0;
         } else {