Changeset ccce242 in mainline

Timestamp:

2010-01-10T14:01:25Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

0ff9e67

Parents:

1ac3a52 (diff), 6c01702 (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 file_bd fixes.

Location:

uspace

Files:

• lib/libc/generic/io/io.c (modified) (1 diff)
• srv/bd/file_bd/file_bd.c (modified) (3 diffs)

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

@@ -595 +595 @@
 }
 
+void clearerr(FILE *stream)
+{
+        stream->eof = false;
+        stream->error = false;
+}
+
 int fphone(FILE *stream)
 {

uspace/srv/bd/file_bd/file_bd.c

@@ -205 +205 @@
 {
         size_t n_rd;
+        int rc;
 
         fibril_mutex_lock(&dev_lock);
 
-        fseek(img, ba * block_size, SEEK_SET);
+        clearerr(img);
+        rc = fseek(img, ba * block_size, SEEK_SET);
+        if (rc < 0) {
+                fibril_mutex_unlock(&dev_lock);
+                return EIO;
+        }
+
         n_rd = fread(buf, block_size, cnt, img);
 
@@ -228 +235 @@
 {
         size_t n_wr;
+        int rc;
 
         fibril_mutex_lock(&dev_lock);
 
-        fseek(img, ba * block_size, SEEK_SET);
+        clearerr(img);
+        rc = fseek(img, ba * block_size, SEEK_SET);
+        if (rc < 0) {
+                fibril_mutex_unlock(&dev_lock);
+                return EIO;
+        }
+
         n_wr = fwrite(buf, block_size, cnt, img);
 
@@ -237 +251 @@
                 fibril_mutex_unlock(&dev_lock);
                 return EIO;     /* Write error */
+        }
+
+        if (fflush(img) != 0) {
+                fibril_mutex_unlock(&dev_lock);
+                return EIO;
         }