Changeset ce04ea44 in mainline for uspace/lib/posix

Timestamp:

2017-04-02T12:27:14Z (9 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

d4067a7

Parents:

163fc09

Message:

Rename read() to vfs_read() and write() to vfs_write()

Location:

uspace/lib/posix/source

Files:

• stdio.c (modified) (2 diffs)
• unistd.c (modified) (2 diffs)

uspace/lib/posix/source/stdio.c

@@ -344 +344 @@
 {
         const int fildes = *(int *) fd;
-        ssize_t wr = write(fildes, &posix_pos[fildes], str, size);
+        ssize_t wr = vfs_write(fildes, &posix_pos[fildes], str, size);
         if (wr < 0)
-                return errno;
+                return wr;
         return str_nlength(str, wr);
 }
@@ -372 +372 @@
                 
                 const int fildes = *(int *) fd;
-                if (write(fildes, &posix_pos[fildes], buf, sz) != (ssize_t) sz)
+                if (vfs_write(fildes, &posix_pos[fildes], buf, sz) < 0)
                         break;
                 

uspace/lib/posix/source/unistd.c

@@ -196 +196 @@
 ssize_t posix_read(int fildes, void *buf, size_t nbyte)
 {
-        return negerrno(read, fildes, &posix_pos[fildes], buf, nbyte);
+        ssize_t size = rcerrno(vfs_read, fildes, &posix_pos[fildes], buf, nbyte);
+        if (size < 0)
+                return -1;
+        return size;
 }
 
@@ -209 +212 @@
 ssize_t posix_write(int fildes, const void *buf, size_t nbyte)
 {
-        return negerrno(write, fildes, &posix_pos[fildes], buf, nbyte);
+        ssize_t size = rcerrno(vfs_write, fildes, &posix_pos[fildes], buf, nbyte);
+        if (size < 0)
+                return -1;
+        return size;
 }