devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Now the file corruption bug when reading & writing the same file is

Browse source 
hopefully fully fixed.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8251 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Miika Pekkarinen 2005-12-16 20:44:41 +00:00
parent fa51eb4ee8
commit a6a0c4b2d5
1 changed files with 19 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

30
firmware/common/file.c
View file

@ -445,10 +445,29 @@ static int readwrite(int fd, void* buf, long count, bool write)
headbytes = count; headbytes = count;
file->cacheoffset += count; file->cacheoffset += count;
if ( file->cacheoffset >= SECTOR_SIZE ) if ( file->cacheoffset >= SECTOR_SIZE )
{
/* Flush the cache first if it's dirty. */
if (file->dirty)
{
rc = flush_cache(fd);
if ( rc < 0 ) {
errno = EIO;
return rc * 10 - 9;
}
}
file->cacheoffset = -1; file->cacheoffset = -1;
}
} }
else { else {
headbytes = SECTOR_SIZE - file->cacheoffset; headbytes = SECTOR_SIZE - file->cacheoffset;
if (file->dirty)
{
rc = flush_cache(fd);
if ( rc < 0 ) {
errno = EIO;
return rc * 10 - 9;
}
}
file->cacheoffset = -1; file->cacheoffset = -1;
} }
@ -543,17 +562,6 @@ static int readwrite(int fd, void* buf, long count, bool write)
file->dirty = true; file->dirty = true;
} }
else { else {
/* Flush the cache first if it's dirty. */
if (file->dirty)
{
rc = flush_cache(fd);
if ( rc < 0 ) {
errno = EIO;
return rc * 10 - 8;
}
file->cacheoffset = -1;
}
rc = fat_readwrite(&(file->fatfile), 1, &(file->cache),false); rc = fat_readwrite(&(file->fatfile), 1, &(file->cache),false);
if (rc < 1 ) { if (rc < 1 ) {
DEBUGF("Failed caching sector\n"); DEBUGF("Failed caching sector\n");