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