Changes in uspace/lib/posix/source/unistd.c [0d0b319:1165a419] in mainline

File:

• uspace/lib/posix/source/unistd.c (modified) (14 diffs)

uspace/lib/posix/source/unistd.c

@@ -40 +40 @@
 #include "posix/unistd.h"
 
-#include <errno.h>
-
+#include "posix/errno.h"
 #include "posix/string.h"
 #include "posix/fcntl.h"
@@ -53 +52 @@
 #include <libarch/config.h>
 
-// FIXME: replace with a hash table
 aoff64_t posix_pos[MAX_OPEN_FILES];
 
@@ -128 +126 @@
 char *posix_getcwd(char *buf, size_t size)
 {
-        if (failed(vfs_cwd_get(buf, size))) 
+        int rc = rcerrno(vfs_cwd_get, buf, size);
+        if (rc != EOK) 
                 return NULL;
         return buf;
@@ -140 +139 @@
 int posix_chdir(const char *path)
 {
-        if (failed(vfs_cwd_set(path)))
+        int rc = rcerrno(vfs_cwd_set, path);
+        if (rc != EOK)
                 return -1;
         return 0;
@@ -196 +196 @@
 {
         posix_pos[fildes] = 0;
-        if (failed(vfs_put(fildes)))
+        int rc = rcerrno(vfs_put, fildes);
+        if (rc != EOK)
                 return -1;
         else
@@ -212 +213 @@
 ssize_t posix_read(int fildes, void *buf, size_t nbyte)
 {
-        size_t nread;
-        if (failed(vfs_read(fildes, &posix_pos[fildes], buf, nbyte, &nread)))
-                return -1;
-        return (ssize_t) nread;
+        ssize_t size = rcerrno(vfs_read, fildes, &posix_pos[fildes], buf, nbyte);
+        if (size < 0)
+                return -1;
+        return size;
 }
 
@@ -228 +229 @@
 ssize_t posix_write(int fildes, const void *buf, size_t nbyte)
 {
-        size_t nwr;
-        if (failed(vfs_write(fildes, &posix_pos[fildes], buf, nbyte, &nwr)))
-                return -1;
-        return nwr;
+        ssize_t size = rcerrno(vfs_write, fildes, &posix_pos[fildes], buf, nbyte);
+        if (size < 0)
+                return -1;
+        return size;
 }
 
@@ -246 +247 @@
 {
         struct stat st;
+        int rc;
 
         switch (whence) {
@@ -255 +257 @@
                 break;
         case SEEK_END:
-                if (failed(vfs_stat(fildes, &st)))
+                rc = rcerrno(vfs_stat, fildes, &st);
+                if (rc != EOK)
                         return -1;
                 posix_pos[fildes] = st.size + offset;
@@ -276 +279 @@
 int posix_fsync(int fildes)
 {
-        if (failed(vfs_sync(fildes)))
+        if (rcerrno(vfs_sync, fildes) != EOK)
                 return -1;
         else
@@ -291 +294 @@
 int posix_ftruncate(int fildes, posix_off_t length)
 {
-        if (failed(vfs_resize(fildes, (aoff64_t) length)))
+        if (rcerrno(vfs_resize, fildes, (aoff64_t) length) != EOK)
                 return -1;
         else
@@ -305 +308 @@
 int posix_rmdir(const char *path)
 {
-        if (failed(vfs_unlink_path(path)))
+        if (rcerrno(vfs_unlink_path, path) != EOK)
                 return -1;
         else
@@ -319 +322 @@
 int posix_unlink(const char *path)
 {
-        if (failed(vfs_unlink_path(path)))
+        if (rcerrno(vfs_unlink_path, path) != EOK)
                 return -1;
         else
@@ -346 +349 @@
 int posix_dup2(int fildes, int fildes2)
 {
-        int file;
-        if (failed(vfs_clone(fildes, fildes2, false, &file))) {
-                return -1;
-        }
-        return file;
+        return negerrno(vfs_clone, fildes, fildes2, false);
 }