all repos — mgba @ 9bee2f4cd3db42062731756c7080aeb4c3891300

mGBA Game Boy Advance Emulator

VFS: Make VFileFILE.unmap only write back if the file was mapped as writable
Jeffrey Pfau jeffrey@endrift.com
Sun, 28 Jun 2015 17:52:27 -0700
commit

9bee2f4cd3db42062731756c7080aeb4c3891300

parent

697b550b375fb5df76f4bdb2ff2f6437858eca26

1 files changed, 11 insertions(+), 5 deletions(-)

jump to
M src/util/vfs/vfs-file.c → src/util/vfs/vfs-file.c 
@@ -13,6 +13,7 @@
 struct VFileFILE {
 	struct VFile d;
 	FILE* file;
+	bool writable;
 };
 
 static bool _vffClose(struct VFile* vf);

@@ -46,6 +47,7 @@ return 0;
 	}
 
 	vff->file = file;
+	vff->writable = false;
 	vff->d.close = _vffClose;
 	vff->d.seek = _vffSeek;
 	vff->d.read = _vffRead;

@@ -84,8 +86,10 @@ return fwrite(buffer, size, 1, vff->file);
 }
 
 static void* _vffMap(struct VFile* vf, size_t size, int flags) {
-	UNUSED(flags);
 	struct VFileFILE* vff = (struct VFileFILE*) vf;
+	if (flags & MAP_WRITE) {
+		vff->writable = true;
+	}
 	void* mem = anonymousMemoryMap(size);
 	if (!mem) {
 		return 0;

@@ -99,10 +103,12 @@ }
 
 static void _vffUnmap(struct VFile* vf, void* memory, size_t size) {
 	struct VFileFILE* vff = (struct VFileFILE*) vf;
-	long pos = ftell(vff->file);
-	fseek(vff->file, 0, SEEK_SET);
-	fwrite(memory, size, 1, vff->file);
-	fseek(vff->file, pos, SEEK_SET);
+	if (vff->writable) {
+		long pos = ftell(vff->file);
+		fseek(vff->file, 0, SEEK_SET);
+		fwrite(memory, size, 1, vff->file);
+		fseek(vff->file, pos, SEEK_SET);
+	}
 	mappedMemoryFree(memory, size);
 }