From 9adfcad1b56e5f42410390e8cb6cfce6f5043134 Mon Sep 17 00:00:00 2001
From: Jeffrey Pfau <jeffrey@endrift.com>
Date: Thu, 5 Mar 2015 18:40:33 -0800
Subject: [PATCH] Util: Cleanup of VFileZip and VFile7z

---
 src/util/vfs.c          | 12 ++++++++++++
 src/util/vfs.h          |  2 ++
 src/util/vfs/vfs-lzma.c | 28 ++++++----------------------
 src/util/vfs/vfs-zip.c  | 15 +--------------
 4 files changed, 21 insertions(+), 36 deletions(-)

diff --git a/src/util/vfs.c b/src/util/vfs.c
index 291185aa2..d706d0b32 100644
--- a/src/util/vfs.c
+++ b/src/util/vfs.c
@@ -378,3 +378,15 @@ const char* _vdeName(struct VDirEntry* vde) {
 	}
 	return 0;
 }
+
+ssize_t VFileReadline(struct VFile* vf, char* buffer, size_t size) {
+	size_t bytesRead = 0;
+	while (bytesRead < size - 1) {
+		size_t newRead = vf->read(vf, &buffer[bytesRead], 1);
+		bytesRead += newRead;
+		if (!newRead || buffer[bytesRead] == '\n') {
+			break;
+		}
+	}
+	return buffer[bytesRead] = '\0';
+}
diff --git a/src/util/vfs.h b/src/util/vfs.h
index 0fc0cbf5a..30c45cbfb 100644
--- a/src/util/vfs.h
+++ b/src/util/vfs.h
@@ -52,4 +52,6 @@ struct VDir* VDirOpen7z(const char* path, int flags);
 struct VFile* VDirOptionalOpenFile(struct VDir* dir, const char* realPath, const char* prefix, const char* suffix, int mode);
 struct VFile* VDirOptionalOpenIncrementFile(struct VDir* dir, const char* realPath, const char* prefix, const char* infix, const char* suffix, int mode);
 
+ssize_t VFileReadline(struct VFile* vf, char* buffer, size_t size);
+
 #endif
diff --git a/src/util/vfs/vfs-lzma.c b/src/util/vfs/vfs-lzma.c
index e429d7f29..dff53156a 100644
--- a/src/util/vfs/vfs-lzma.c
+++ b/src/util/vfs/vfs-lzma.c
@@ -51,7 +51,6 @@ struct VFile7z {
 static bool _vf7zClose(struct VFile* vf);
 static off_t _vf7zSeek(struct VFile* vf, off_t offset, int whence);
 static ssize_t _vf7zRead(struct VFile* vf, void* buffer, size_t size);
-static ssize_t _vf7zReadline(struct VFile* vf, char* buffer, size_t size);
 static ssize_t _vf7zWrite(struct VFile* vf, const void* buffer, size_t size);
 static void* _vf7zMap(struct VFile* vf, size_t size, int flags);
 static void _vf7zUnmap(struct VFile* vf, void* memory, size_t size);
@@ -142,16 +141,12 @@ off_t _vf7zSeek(struct VFile* vf, off_t offset, int whence) {
 		return -1;
 	}
 
-	if (position <= vf7z->offset) {
-		vf7z->offset = position;
-		return position;
+	if (position > vf7z->size) {
+		return -1;
 	}
 
-	if (position <= vf7z->size) {
-		return vf7z->offset;
-	}
-
-	return -1;
+	vf7z->offset = position;
+	return position;
 }
 
 ssize_t _vf7zRead(struct VFile* vf, void* buffer, size_t size) {
@@ -162,21 +157,10 @@ ssize_t _vf7zRead(struct VFile* vf, void* buffer, size_t size) {
 	}
 
 	memcpy(buffer, vf7z->outBuffer + vf7z->offset + vf7z->bufferOffset, size);
+	vf7z->offset += size;
 	return size;
 }
 
-ssize_t _vf7zReadline(struct VFile* vf, char* buffer, size_t size) {
-	size_t bytesRead = 0;
-	while (bytesRead < size - 1) {
-		size_t newRead = vf->read(vf, &buffer[bytesRead], 1);
-		bytesRead += newRead;
-		if (!newRead || buffer[bytesRead] == '\n') {
-			break;
-		}
-	}
-	return buffer[bytesRead] = '\0';
-}
-
 ssize_t _vf7zWrite(struct VFile* vf, const void* buffer, size_t size) {
 	// TODO
 	UNUSED(vf);
@@ -301,7 +285,7 @@ struct VFile* _vd7zOpenFile(struct VDir* vd, const char* path, int mode) {
 	vf->d.close = _vf7zClose;
 	vf->d.seek = _vf7zSeek;
 	vf->d.read = _vf7zRead;
-	vf->d.readline = _vf7zReadline;
+	vf->d.readline = VFileReadline;
 	vf->d.write = _vf7zWrite;
 	vf->d.map = _vf7zMap;
 	vf->d.unmap = _vf7zUnmap;
diff --git a/src/util/vfs/vfs-zip.c b/src/util/vfs/vfs-zip.c
index 02e6216fe..18789e423 100644
--- a/src/util/vfs/vfs-zip.c
+++ b/src/util/vfs/vfs-zip.c
@@ -38,7 +38,6 @@ struct VFileZip {
 static bool _vfzClose(struct VFile* vf);
 static off_t _vfzSeek(struct VFile* vf, off_t offset, int whence);
 static ssize_t _vfzRead(struct VFile* vf, void* buffer, size_t size);
-static ssize_t _vfzReadline(struct VFile* vf, char* buffer, size_t size);
 static ssize_t _vfzWrite(struct VFile* vf, const void* buffer, size_t size);
 static void* _vfzMap(struct VFile* vf, size_t size, int flags);
 static void _vfzUnmap(struct VFile* vf, void* memory, size_t size);
@@ -188,18 +187,6 @@ ssize_t _vfzRead(struct VFile* vf, void* buffer, size_t size) {
 	return bytesRead;
 }
 
-ssize_t _vfzReadline(struct VFile* vf, char* buffer, size_t size) {
-	size_t bytesRead = 0;
-	while (bytesRead < size - 1) {
-		size_t newRead = vf->read(vf, &buffer[bytesRead], 1);
-		bytesRead += newRead;
-		if (!newRead || buffer[bytesRead] == '\n') {
-			break;
-		}
-	}
-	return buffer[bytesRead] = '\0';
-}
-
 ssize_t _vfzWrite(struct VFile* vf, const void* buffer, size_t size) {
 	// TODO
 	UNUSED(vf);
@@ -296,7 +283,7 @@ struct VFile* _vdzOpenFile(struct VDir* vd, const char* path, int mode) {
 	vfz->d.close = _vfzClose;
 	vfz->d.seek = _vfzSeek;
 	vfz->d.read = _vfzRead;
-	vfz->d.readline = _vfzReadline;
+	vfz->d.readline = VFileReadline;
 	vfz->d.write = _vfzWrite;
 	vfz->d.map = _vfzMap;
 	vfz->d.unmap = _vfzUnmap;