Handle reading outside EOF.

git-svn-id: https://src.develer.com/svnoss/bertos/trunk@1842 38d2e660-2303-0410-9eaa-f027e97ec537

diff --git a/bertos/fs/battfs.c b/bertos/fs/battfs.c
index 9bc8bdfd0b649b556743dcb1fae4b68eef509f6f..119085907637112386c7ef5094722166e981e127 100644 (file)
--- a/bertos/fs/battfs.c
+++ b/bertos/fs/battfs.c
@@ -665,7 +665,7 @@ static size_t battfs_read(struct KFile *fd, void *_buf, size_t size)
        pgaddr_t addr_offset;
        pgaddr_t read_len;
 
-       size = MIN((kfile_off_t)size, fd->size - fd->seek_pos);
+       size = MIN((kfile_off_t)size, MAX(fd->size - fd->seek_pos, 0));
 
        while (size)
        {

diff --git a/bertos/fs/battfs_test.c b/bertos/fs/battfs_test.c
index 8ab33a4885a3be472641615aeeb1b06dca7d8f74..c1cd89e6e418c454f1c2d52d89d155ad70edc866 100644 (file)
--- a/bertos/fs/battfs_test.c
+++ b/bertos/fs/battfs_test.c
@@ -748,6 +748,44 @@ static void increaseFile(BattFsSuper *disk)
        TRACEMSG("17: passed\n");
 }
 
+static void readEOF(BattFsSuper *disk)
+{
+       BattFs fd1;
+       uint8_t buf[16];
+
+       TRACEMSG("18: reading over EOF test\n");
+
+       fp = fopen(test_filename, "w+");
+
+       unsigned int PAGE_FILL = PAGE_SIZE - BATTFS_HEADER_LEN;
+       inode_t INODE = 0;
+       inode_t INODE2 = 4;
+       unsigned int MODE = 0;
+
+       disk->erase(disk, 0);
+       battfs_writeTestBlock(disk, 1, INODE, 0, PAGE_FILL, 0);
+       battfs_writeTestBlock(disk, 2, INODE, 3, PAGE_FILL, 1);
+       battfs_writeTestBlock(disk, 3, INODE, 0, PAGE_FILL, 1);
+       disk->erase(disk, 4);
+       battfs_writeTestBlock(disk, 5, INODE2, 0, PAGE_FILL, 0);
+       battfs_writeTestBlock(disk, 6, INODE2, 1, PAGE_FILL, 1);
+       battfs_writeTestBlock(disk, 7, INODE2, 0, PAGE_FILL, 1);
+
+       fclose(fp);
+
+       ASSERT(battfs_init(disk));
+       ASSERT(battfs_fileopen(disk, &fd1, INODE, MODE));
+       ASSERT(kfile_seek(&fd1.fd, fd1.fd.size + 10, SEEK_SET) == fd1.fd.size + 10);
+       ASSERT(fd1.fd.seek_pos == fd1.fd.size + 10);
+       ASSERT(kfile_read(&fd1.fd, buf, sizeof(buf)) == 0);
+
+       ASSERT(kfile_close(&fd1.fd) == 0);
+       ASSERT(battfs_close(disk));
+
+       TRACEMSG("18: passed\n");
+}
+
+
 int battfs_testRun(void)
 {
        BattFsSuper disk;
@@ -776,6 +814,7 @@ int battfs_testRun(void)
        createFile(&disk);
        multipleWrite(&disk);
        increaseFile(&disk);
+       readEOF(&disk);
 
        kprintf("All tests passed!\n");
 

diff --git a/bertos/kern/kfile.c b/bertos/kern/kfile.c
index cab20aa668803ac929ed65157a813608b33ae8db..2d8a2f841bbfa6c2c8fb6a4174e0e4ee6d9b7c8a 100644 (file)
--- a/bertos/kern/kfile.c
+++ b/bertos/kern/kfile.c
@@ -197,8 +197,7 @@ kfile_off_t kfile_genericSeek(struct KFile *fd, kfile_off_t offset, KSeekMode wh
        /* Bound check */
        if (seek_pos + offset > fd->size)
        {
-               ASSERT(0);
-               return EOF;
+               LOG_INFO("seek outside EOF\n");
        }
 
        fd->seek_pos = seek_pos + offset;