Changeset c77a64f in mainline

Timestamp:

2010-01-10T12:22:14Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6c01702

Parents:

5f70118

Message:

Must clear error indicator when reading/writing blocks in file_bd, otherwise a read beyond the end of device would render it unusable.

Location:

uspace

Files:

• lib/libc/generic/io/io.c (modified) (1 diff)
• srv/bd/file_bd/file_bd.c (modified) (2 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

@@ -208 +208 @@
         fibril_mutex_lock(&dev_lock);
 
+        clearerr(img);
         fseek(img, ba * block_size, SEEK_SET);
         n_rd = fread(buf, block_size, cnt, img);
@@ -231 +232 @@
         fibril_mutex_lock(&dev_lock);
 
+        clearerr(img);
         fseek(img, ba * block_size, SEEK_SET);
         n_wr = fwrite(buf, block_size, cnt, img);