Another fix for file system issues when encountering disk full (like when recording)

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15920 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 24 insertions, 0 deletions

diff --git a/firmware/common/file.c b/firmware/common/file.c
index 9290f508b8..f0437f9e68 100644
--- a/firmware/common/file.c
+++ b/firmware/common/file.c
@@ -548,6 +548,14 @@ static int readwrite(int fd, void* buf, long count, bool write)
                 file->fileoffset += nread;
             }
             file->cacheoffset = -1;
+            /* adjust file size to length written */
+            if ( write && file->fileoffset > file->size )
+            {
+                file->size = file->fileoffset;
+#ifdef HAVE_DIRCACHE
+                dircache_update_filesize(fd, file->size, file->fatfile.firstcluster);
+#endif
+            }
             return nread ? nread : rc * 10 - 4;
         }
         else {
@@ -580,6 +588,14 @@ static int readwrite(int fd, void* buf, long count, bool write)
                     errno = EIO;
                     file->fileoffset += nread;
                     file->cacheoffset = -1;
+                    /* adjust file size to length written */
+                    if ( file->fileoffset > file->size )
+                    {
+                        file->size = file->fileoffset;
+#ifdef HAVE_DIRCACHE
+                        dircache_update_filesize(fd, file->size, file->fatfile.firstcluster);
+#endif
+                    }
                     return nread ? nread : rc * 10 - 5;
                 }
                 /* seek back one sector to put file position right */
@@ -591,6 +607,14 @@ static int readwrite(int fd, void* buf, long count, bool write)
                     errno = EIO;
                     file->fileoffset += nread;
                     file->cacheoffset = -1;
+                    /* adjust file size to length written */
+                    if ( file->fileoffset > file->size )
+                    {
+                        file->size = file->fileoffset;
+#ifdef HAVE_DIRCACHE
+                        dircache_update_filesize(fd, file->size, file->fatfile.firstcluster);
+#endif
+                    }
                     return nread ? nread : rc * 10 - 6;
                 }
             }