ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

VFS: Make VFileFILE.unmap only write back if the file was mapped as writable

This commit is contained in:
Jeffrey Pfau 2015-06-28 17:52:27 -07:00
parent 697b550b37
commit 9bee2f4cd3
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/util/vfs/vfs-file.c
View File

@ -13,6 +13,7 @@
struct VFileFILE { struct VFileFILE {
struct VFile d; struct VFile d;
FILE* file; FILE* file;
bool writable;
}; };
static bool _vffClose(struct VFile* vf); static bool _vffClose(struct VFile* vf);
@ -46,6 +47,7 @@ struct VFile* VFileFromFILE(FILE* file) {
} }
vff->file = file; vff->file = file;
vff->writable = false;
vff->d.close = _vffClose; vff->d.close = _vffClose;
vff->d.seek = _vffSeek; vff->d.seek = _vffSeek;
vff->d.read = _vffRead; vff->d.read = _vffRead;
@ -84,8 +86,10 @@ ssize_t _vffWrite(struct VFile* vf, const void* buffer, size_t size) {
} }
static void* _vffMap(struct VFile* vf, size_t size, int flags) { static void* _vffMap(struct VFile* vf, size_t size, int flags) {
UNUSED(flags);
struct VFileFILE* vff = (struct VFileFILE*) vf; struct VFileFILE* vff = (struct VFileFILE*) vf;
if (flags & MAP_WRITE) {
vff->writable = true;
}
void* mem = anonymousMemoryMap(size); void* mem = anonymousMemoryMap(size);
if (!mem) { if (!mem) {
return 0; return 0;
@ -99,10 +103,12 @@ static void* _vffMap(struct VFile* vf, size_t size, int flags) {
static void _vffUnmap(struct VFile* vf, void* memory, size_t size) { static void _vffUnmap(struct VFile* vf, void* memory, size_t size) {
struct VFileFILE* vff = (struct VFileFILE*) vf; struct VFileFILE* vff = (struct VFileFILE*) vf;
long pos = ftell(vff->file); if (vff->writable) {
fseek(vff->file, 0, SEEK_SET); long pos = ftell(vff->file);
fwrite(memory, size, 1, vff->file); fseek(vff->file, 0, SEEK_SET);
fseek(vff->file, pos, SEEK_SET); fwrite(memory, size, 1, vff->file);
fseek(vff->file, pos, SEEK_SET);
}
mappedMemoryFree(memory, size); mappedMemoryFree(memory, size);
} }