Changes in uspace/lib/c/generic/io/io.c [f77c1c9:456c086] in mainline

File:

• uspace/lib/c/generic/io/io.c (modified) (10 diffs)

uspace/lib/c/generic/io/io.c

@@ -38 +38 @@
 #include <errno.h>
 #include <stdbool.h>
-#include <stdlib.h>
+#include <malloc.h>
 #include <async.h>
 #include <io/kio.h>
@@ -108 +108 @@
          * This will probably be removed later.
          */
+         
         int infd = inbox_get("stdin");
         if (infd >= 0) {
-                int stdinfd = -1;
-                (void) vfs_clone(infd, -1, false, &stdinfd);
+                int stdinfd = vfs_clone(infd, -1, false);
                 assert(stdinfd == 0);
                 vfs_open(stdinfd, MODE_READ);
@@ -122 +122 @@
         int outfd = inbox_get("stdout");
         if (outfd >= 0) {
-                int stdoutfd = -1;
-                (void) vfs_clone(outfd, -1, false, &stdoutfd);
+                int stdoutfd = vfs_clone(outfd, -1, false);
                 assert(stdoutfd <= 1);
                 while (stdoutfd < 1)
-                        (void) vfs_clone(outfd, -1, false, &stdoutfd);
+                        stdoutfd = vfs_clone(outfd, -1, false);
                 vfs_open(stdoutfd, MODE_APPEND);
                 stdout = fdopen(stdoutfd, "a");
@@ -136 +135 @@
         int errfd = inbox_get("stderr");
         if (errfd >= 0) {
-                int stderrfd = -1;
-                (void) vfs_clone(errfd, -1, false, &stderrfd);
+                int stderrfd = vfs_clone(errfd, -1, false);
                 assert(stderrfd <= 2);
                 while (stderrfd < 2)
-                        (void) vfs_clone(errfd, -1, false, &stderrfd);
+                        stderrfd = vfs_clone(errfd, -1, false);
                 vfs_open(stderrfd, MODE_APPEND);
                 stderr = fdopen(stderrfd, "a");
@@ -296 +294 @@
         if (create)
                 flags |= WALK_MAY_CREATE;
-        int file;
-        int rc = vfs_lookup(path, flags, &file);
-        if (rc != EOK) {
-                errno = rc;
+        int file = vfs_lookup(path, flags);
+        if (file < 0) {
+                errno = file;
                 free(stream);
                 return NULL;
         }
 
-        rc = vfs_open(file, mode);
+        int rc = vfs_open(file, mode);
         if (rc != EOK) {
                 errno = rc;
@@ -376 +373 @@
         list_remove(&stream->link);
         
-        if (rc != EOK) {
-                errno = rc;
+        if (rc != 0) {
+                /* errno was set by close() */
                 return EOF;
         }
@@ -433 +430 @@
 static size_t _fread(void *buf, size_t size, size_t nmemb, FILE *stream)
 {
-        int rc;
-        size_t nread;
-
         if (size == 0 || nmemb == 0)
                 return 0;
 
-        rc = vfs_read(stream->fd, &stream->pos, buf, size * nmemb, &nread);
-        if (rc != EOK) {
-                errno = rc;
+        ssize_t rd = vfs_read(stream->fd, &stream->pos, buf, size * nmemb);
+        if (rd < 0) {
+                errno = rd;
                 stream->error = true;
-        } else if (nread == 0) {
+                rd = 0;
+        } else if (rd == 0) {
                 stream->eof = true;
         }
-
-        return (nread / size);
+        
+        return (rd / size);
 }
 
@@ -462 +457 @@
 static size_t _fwrite(const void *buf, size_t size, size_t nmemb, FILE *stream)
 {
-        int rc;
-        size_t nwritten;
-
         if (size == 0 || nmemb == 0)
                 return 0;
 
+        ssize_t wr;
         if (stream->kio) {
-                rc = kio_write(buf, size * nmemb, &nwritten);
-                if (rc != EOK) {
+                size_t nwritten;
+                wr = kio_write(buf, size * nmemb, &nwritten);
+                if (wr != EOK) {
                         stream->error = true;
-                        nwritten = 0;
+                        wr = 0;
+                } else {
+                        wr = nwritten;
                 }
         } else {
-                rc = vfs_write(stream->fd, &stream->pos, buf, size * nmemb,
-                    &nwritten);
-                if (rc != EOK) {
-                        errno = rc;
+                wr = vfs_write(stream->fd, &stream->pos, buf, size * nmemb);
+                if (wr < 0) {
+                        errno = wr;
                         stream->error = true;
+                        wr = 0;
                 }
         }
 
-        if (nwritten > 0)
+        if (wr > 0)
                 stream->need_sync = true;
-
-        return (nwritten / size);
+        
+        return (wr / size);
 }
 
@@ -495 +491 @@
 static void _ffillbuf(FILE *stream)
 {
-        int rc;
-        size_t nread;
+        ssize_t rc;
 
         stream->buf_head = stream->buf_tail = stream->buf;
 
-        rc = vfs_read(stream->fd, &stream->pos, stream->buf, stream->buf_size,
-            &nread);
-        if (rc != EOK) {
+        rc = vfs_read(stream->fd, &stream->pos, stream->buf, stream->buf_size);
+        if (rc < 0) {
                 errno = rc;
                 stream->error = true;
@@ -508 +502 @@
         }
 
-        if (nread == 0) {
+        if (rc == 0) {
                 stream->eof = true;
                 return;
         }
 
-        stream->buf_head += nread;
+        stream->buf_head += rc;
         stream->buf_state = _bs_read;
 }