Changeset f1d6866 in mainline for uspace/lib/c/generic/io/io.c

Timestamp:

2011-09-18T21:22:59Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

dcc44ca1

Parents:

85ff862 (diff), 45a9cf4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

• uspace/lib/c/generic/io/io.c (modified) (1 diff)

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

@@ -418 +418 @@
 
         bytes_used = stream->buf_head - stream->buf_tail;
-        if (bytes_used == 0)
-                return;
 
         /* If buffer has prefetched read data, we need to seek back. */
-        if (stream->buf_state == _bs_read)
+        if (bytes_used > 0 && stream->buf_state == _bs_read)
                 lseek(stream->fd, - (ssize_t) bytes_used, SEEK_CUR);
 
         /* If buffer has unwritten data, we need to write them out. */
-        if (stream->buf_state == _bs_write)
+        if (bytes_used > 0 && stream->buf_state == _bs_write)
                 (void) _fwrite(stream->buf_tail, 1, bytes_used, stream);