Changes in uspace/lib/posix/source/unistd.c [59f388a:6afc9d7] in mainline

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). */
@@ -108 +105 @@
 char *posix_getcwd(char *buf, size_t size)
 {
-        int rc = rcerrno(vfs_cwd_get, buf, size);
-        if (rc != EOK) 
+        char *p = getcwd(buf, size);
+
+        if (p == NULL) {
+                errno = -errno;
                 return NULL;
-        return buf;
+        }
+
+        return p;
 }
 
@@ -121 +122 @@
 int posix_chdir(const char *path)
 {
-        int rc = rcerrno(vfs_cwd_set, path);
-        if (rc != EOK)
-                return -1;
-        return 0;
+        return negerrno(chdir, path);
 }
 
@@ -177 +175 @@
 int posix_close(int fildes)
 {
-        posix_pos[fildes] = 0;
-        int rc = rcerrno(vfs_put, fildes);
-        if (rc != EOK)
-                return -1;
-        else
-                return 0;
+        return negerrno(close, fildes);
 }
 
@@ -195 +188 @@
 ssize_t posix_read(int fildes, void *buf, size_t nbyte)
 {
-        ssize_t size = rcerrno(vfs_read, fildes, &posix_pos[fildes], buf, nbyte);
-        if (size < 0)
-                return -1;
-        return size;
+        return negerrno(read, fildes, buf, nbyte);
 }
 
@@ -211 +201 @@
 ssize_t posix_write(int fildes, const void *buf, size_t nbyte)
 {
-        ssize_t size = rcerrno(vfs_write, fildes, &posix_pos[fildes], buf, nbyte);
-        if (size < 0)
-                return -1;
-        return size;
+        return negerrno(write, fildes, buf, nbyte);
 }
 
@@ -228 +215 @@
 posix_off_t posix_lseek(int fildes, posix_off_t offset, int 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];
+        return negerrno(lseek, fildes, offset, whence);
 }
 
@@ -261 +226 @@
 int posix_fsync(int fildes)
 {
-        if (rcerrno(vfs_sync, fildes) != EOK)
-                return -1;
-        else
-                return 0;
+        return negerrno(fsync, fildes);
 }
 
@@ -276 +238 @@
 int posix_ftruncate(int fildes, posix_off_t length)
 {
-        if (rcerrno(vfs_resize, fildes, (aoff64_t) length) != EOK)
-                return -1;
-        else
-                return 0;
+        return negerrno(ftruncate, fildes, (aoff64_t) length);
 }
 
@@ -290 +249 @@
 int posix_rmdir(const char *path)
 {
-        if (rcerrno(vfs_unlink_path, path) != EOK)
-                return -1;
-        else
-                return 0;
+        return negerrno(rmdir, path);
 }
 
@@ -304 +260 @@
 int posix_unlink(const char *path)
 {
-        if (rcerrno(vfs_unlink_path, path) != EOK)
-                return -1;
-        else
-                return 0;
+        return negerrno(unlink, path);
 }
 
@@ -331 +284 @@
 int posix_dup2(int fildes, int fildes2)
 {
-        return negerrno(vfs_clone, fildes, fildes2, false);
+        return negerrno(dup2, fildes, fildes2);
 }
 
@@ -349 +302 @@
                  * Check file existence by attempting to open it.
                  */
-                int fd = posix_open(path, O_RDONLY);
-                if (fd < 0)
+                int fd = negerrno(open, path, O_RDONLY);
+                if (fd < 0) {
+                        /* errno was set by open() */
                         return -1;
-                posix_close(fd);
+                }
+                close(fd);
                 return 0;
         } else {