Changeset 0d974d8 in mainline

Timestamp:

2008-10-31T15:59:41Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

7d861950

Parents:

916bf1a

Message:

fat_read() needs to stop reading beyond the EOF.

File:

• uspace/srv/fs/fat/fat_ops.c (modified) (1 diff)

uspace/srv/fs/fat/fat_ops.c

@@ -539 +539 @@
                  * requested. This keeps the code very simple.
                  */
-                bytes = min(len, bps - pos % bps);
-                b = fat_block_get(bs, nodep, pos / bps);
-                (void) ipc_data_read_finalize(callid, b->data + pos % bps,
-                    bytes);
-                block_put(b);
+                if (pos >= nodep->size) {
+                        bytes = 0;              /* reading beyond the EOF */
+                        (void) ipc_data_read_finalize(callid, NULL, 0);
+                } else {
+                        bytes = min(len, bps - pos % bps);
+                        bytes = min(bytes, nodep->size - pos);
+                        b = fat_block_get(bs, nodep, pos / bps);
+                        (void) ipc_data_read_finalize(callid, b->data + pos % bps,
+                            bytes);
+                        block_put(b);
+                }
         } else {
                 unsigned bnum;