Changeset 58898d1d in mainline for uspace/lib/c/generic/io/io.c

Timestamp:

2017-03-24T20:31:54Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

8e9b2534

Parents:

c9e3692

Message:

Remove VFS_IN_SEEK from VFS

File:

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

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

@@ -41 +41 @@
 #include <stdbool.h>
 #include <malloc.h>
+#include <sys/stat.h>
 #include <async.h>
 #include <io/kio.h>
@@ -56 +57 @@
 static FILE stdin_null = {
         .fd = -1,
+        .pos = 0, 
         .error = true,
         .eof = true,
@@ -70 +72 @@
 static FILE stdout_kio = {
         .fd = -1,
+        .pos = 0, 
         .error = false,
         .eof = false,
@@ -84 +87 @@
 static FILE stderr_kio = {
         .fd = -1,
+        .pos = 0, 
         .error = false,
         .eof = false,
@@ -288 +292 @@
         }
         
+        stream->pos = 0;
         stream->error = false;
         stream->eof = false;
@@ -311 +316 @@
         
         stream->fd = fd;
+        stream->pos = 0;
         stream->error = false;
         stream->eof = false;
@@ -396 +402 @@
 static size_t _fread(void *buf, size_t size, size_t nmemb, FILE *stream)
 {
-        size_t left, done;
-
         if (size == 0 || nmemb == 0)
                 return 0;
 
-        left = size * nmemb;
-        done = 0;
-        
-        while ((left > 0) && (!stream->error) && (!stream->eof)) {
-                ssize_t rd = read(stream->fd, buf + done, left);
-                
-                if (rd < 0) {
-                        /* errno was set by read() */
-                        stream->error = true;
-                } else if (rd == 0) {
-                        stream->eof = true;
-                } else {
-                        left -= rd;
-                        done += rd;
-                }
-        }
-        
-        return (done / size);
+        ssize_t rd = read(stream->fd, &stream->pos, buf, size * nmemb);
+        if (rd < 0) {
+                /* errno was set by read() */
+                stream->error = true;
+                rd = 0;
+        } else if (rd == 0) {
+                stream->eof = true;
+        }
+        
+        return (rd / size);
 }
 
@@ -433 +429 @@
 static size_t _fwrite(const void *buf, size_t size, size_t nmemb, FILE *stream)
 {
-        size_t left;
-        size_t done;
-        int rc;
-
         if (size == 0 || nmemb == 0)
                 return 0;
 
-        left = size * nmemb;
-        done = 0;
-
-        while ((left > 0) && (!stream->error)) {
-                ssize_t wr;
-                size_t uwr;
-                
-                if (stream->kio) {
-                        uwr = 0;
-                        rc = kio_write(buf + done, left, &uwr);
-                        if (rc != EOK)
-                                errno = rc;
+        ssize_t wr;
+        if (stream->kio) {
+                size_t nwritten;
+                wr = kio_write(buf, size * nmemb, &nwritten);
+                if (wr != EOK) {
+                        stream->error = true;
+                        wr = 0;
                 } else {
-                        wr = write(stream->fd, buf + done, left);
-                        if (wr >= 0) {
-                                uwr = (size_t)wr;
-                                rc = EOK;
-                        } else {
-                                /* errno was set by write */
-                                uwr = 0;
-                                rc = errno;
-                        }
-                }
-                
-                if (rc != EOK) {
-                        /* errno was set above */
+                        wr = nwritten;
+                }
+        } else {
+                wr = write(stream->fd, &stream->pos, buf, size * nmemb);
+                if (wr < 0) {
+                        /* errno was set by write() */
                         stream->error = true;
-                } else {
-                        left -= uwr;
-                        done += uwr;
-                }
-        }
-
-        if (done > 0)
+                        wr = 0;
+                }
+        }
+
+        if (wr > 0)
                 stream->need_sync = true;
         
-        return (done / size);
+        return (wr / size);
 }
 
@@ -489 +467 @@
         stream->buf_head = stream->buf_tail = stream->buf;
 
-        rc = read(stream->fd, stream->buf, stream->buf_size);
+        rc = read(stream->fd, &stream->pos, stream->buf, stream->buf_size);
         if (rc < 0) {
                 /* errno was set by read() */
@@ -516 +494 @@
 
         /* If buffer has prefetched read data, we need to seek back. */
-        if (bytes_used > 0 && stream->buf_state == _bs_read) {
-                off64_t rc;
-                rc = lseek(stream->fd, - (ssize_t) bytes_used, SEEK_CUR);
-                if (rc == (off64_t)-1) {
-                        /* errno was set by lseek */
-                        stream->error = 1;
-                        return;
-                }
-        }
+        if (bytes_used > 0 && stream->buf_state == _bs_read)
+                stream->pos -= bytes_used;
 
         /* If buffer has unwritten data, we need to write them out. */
@@ -796 +767 @@
 int fseek(FILE *stream, off64_t offset, int whence)
 {
-        off64_t rc;
-
         if (stream->error)
-                return EOF;
+                return -1;
 
         _fflushbuf(stream);
         if (stream->error) {
                 /* errno was set by _fflushbuf() */
-                return EOF;
+                return -1;
         }
 
         stream->ungetc_chars = 0;
 
-        rc = lseek(stream->fd, offset, whence);
-        if (rc == (off64_t) (-1)) {
-                /* errno has been set by lseek() */
-                return EOF;
+        struct stat st;
+        switch (whence) {
+        case SEEK_SET:
+                stream->pos = offset;
+                break;
+        case SEEK_CUR:
+                stream->pos += offset;
+                break;
+        case SEEK_END:
+                if (fstat(stream->fd, &st) != EOK) {
+                        /* errno was set by fstat() */
+                        stream->error = true;
+                        return -1;      
+                }
+                stream->pos = st.size + offset;
+                break;
         }
 
@@ -821 +802 @@
 off64_t ftell(FILE *stream)
 {
-        off64_t pos;
-        
         if (stream->error)
                 return EOF;
@@ -832 +811 @@
         }
 
-        pos = lseek(stream->fd, 0, SEEK_CUR);
-        if (pos == (off64_t) -1) {
-                /* errno was set by lseek */
-                return (off64_t) -1;
-        }
-        
-        return pos - stream->ungetc_chars;
+        return stream->pos - stream->ungetc_chars;
 }