Changeset 8e3498b in mainline for uspace/lib/posix/source/unistd.c

Timestamp:

2017-12-04T18:44:24Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

bde5c04

Parents:

40feeac

Message:

vfs_read/write() should return error code separately from number of bytes transferred.

File:

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

uspace/lib/posix/source/unistd.c

@@ -213 +213 @@
 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;
+        int rc;
+
+        rc = rcerrno(vfs_read, fildes, &posix_pos[fildes], buf, nbyte, &nread);
+        if (rc != EOK)
+                return -1;
+        return (ssize_t) nread;
 }
 
@@ -229 +232 @@
 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;
+        int rc;
+
+        rc = rcerrno(vfs_write, fildes, &posix_pos[fildes], buf, nbyte, &nwr);
+        if (rc != EOK)
+                return -1;
+        return nwr;
 }