Changeset 3b3e776 in mainline for uspace/srv/bd/file_bd/file_bd.c

Timestamp:

2010-02-05T10:57:50Z (14 years ago)

Author:

Lenka Trochtova <trochtova.lenka@…>

Branches:

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

Children:

0358da0

Parents:

3f085132 (diff), b4cbef1 (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:

merged with head

File:

• uspace/srv/bd/file_bd/file_bd.c (modified) (7 diffs)

uspace/srv/bd/file_bd/file_bd.c

@@ -45 +45 @@
 #include <async.h>
 #include <as.h>
-#include <fibril_sync.h>
+#include <fibril_synch.h>
 #include <devmap.h>
 #include <sys/types.h>
@@ -56 +56 @@
 
 static const size_t block_size = 512;
+static bn_t num_blocks;
 static FILE *img;
 
@@ -99 +100 @@
 {
         int rc;
+        long img_size;
 
         rc = devmap_driver_register(NAME, file_bd_connection);
@@ -109 +111 @@
         if (img == NULL)
                 return EINVAL;
+
+        if (fseek(img, 0, SEEK_END) != 0) {
+                fclose(img);
+                return EIO;
+        }
+
+        img_size = ftell(img);
+        if (img_size < 0) {
+                fclose(img);
+                return EIO;
+        }
+
+        num_blocks = img_size / block_size;
 
         fibril_mutex_initialize(&dev_lock);
@@ -174 +189 @@
                         ipc_answer_1(callid, EOK, block_size);
                         continue;
+                case BD_GET_NUM_BLOCKS:
+                        ipc_answer_2(callid, EOK, LOWER32(num_blocks),
+                            UPPER32(num_blocks));
+                        continue;
                 default:
                         retval = EINVAL;
@@ -186 +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);
 
@@ -209 +235 @@
 {
         size_t n_wr;
+        int rc;
 
         fibril_mutex_lock(&dev_lock);
 
-        fseek(img, ba * block_size, SEEK_SET);
-        n_wr = fread(buf, block_size, cnt, img);
+        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);
 
         if (ferror(img) || n_wr < cnt) {
                 fibril_mutex_unlock(&dev_lock);
                 return EIO;     /* Write error */
+        }
+
+        if (fflush(img) != 0) {
+                fibril_mutex_unlock(&dev_lock);
+                return EIO;
         }