Changeset 65c1778 in mainline for uspace/lib/libc/generic/io/io.c

Timestamp:

2009-12-03T21:26:00Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

034bf0e

Parents:

22e6802 (diff), 002252a (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 bug fixes. (thx Tomas Brambora)

File:

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

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

@@ -341 +341 @@
 size_t fread(void *buf, size_t size, size_t nmemb, FILE *stream)
 {
-        size_t left = size * nmemb;
-        size_t done = 0;
-        
+        size_t left, done;
+
+        if (size == 0 || nmemb == 0)
+                return 0;
+
         /* Make sure no data is pending write. */
         _fflushbuf(stream);
+
+        left = size * nmemb;
+        done = 0;
         
         while ((left > 0) && (!stream->error) && (!stream->eof)) {
@@ -365 +370 @@
 static size_t _fwrite(const void *buf, size_t size, size_t nmemb, FILE *stream)
 {
-        size_t left = size * nmemb;
-        size_t done = 0;
-        
+        size_t left;
+        size_t done;
+
+        if (size == 0 || nmemb == 0)
+                return 0;
+
+        left = size * nmemb;
+        done = 0;
+
         while ((left > 0) && (!stream->error)) {
                 ssize_t wr;
@@ -421 +432 @@
         uint8_t b;
         bool need_flush;
-        
+
+        if (size == 0 || nmemb == 0)
+                return 0;
+
         /* If not buffered stream, write out directly. */
         if (stream->btype == _IONBF) {