From 1a36fdd8b4307e074d8249841451b68ea1d05600 Mon Sep 17 00:00:00 2001
From: meep-eep <meep-eep@8092fc87-c524-0410-9efc-e669fe64eaf9>
Date: Sat, 12 Jul 2003 23:02:55 +0000
Subject: [PATCH] Bug in fopen() mode fixed.

git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1049 8092fc87-c524-0410-9efc-e669fe64eaf9
---
 sc2/src/sc2code/libs/uio/uiostream.c | 47 +++++++++++++++++++++-------
 1 file changed, 36 insertions(+), 11 deletions(-)

diff --git a/sc2/src/sc2code/libs/uio/uiostream.c b/sc2/src/sc2code/libs/uio/uiostream.c
index 2b69e166c..08e8c4cd7 100644
--- a/sc2/src/sc2code/libs/uio/uiostream.c
+++ b/sc2/src/sc2code/libs/uio/uiostream.c
@@ -49,6 +49,7 @@ uio_fopen(uio_DirHandle *dir, const char *path, const char *mode) {
 	int openFlags;
 	uio_Handle *handle;
 	uio_Stream *stream;
+	int i;
 	
 	switch (*mode) {
 		case 'r':
@@ -66,20 +67,30 @@ uio_fopen(uio_DirHandle *dir, const char *path, const char *mode) {
 	}
 	mode++;
 
-	// 'b' may either be the second or the third character.
-	if (*mode == 'b') {
-		mode++;
+	// C'89 says 'b' may either be the second or the third character.
+	// If someone specifies both 'b' and 't', he/she is out of luck.
+	i = 2;
+	while (i-- && (*mode != '\0')) {
+		switch (*mode) {
+			case 'b':
 #ifdef WIN32
-		openFlags |= O_BINARY;
+				openFlags |= O_BINARY;
 #endif
-		if (*mode == '+') {
-			mode++;
-			openFlags = (openFlags & ~O_ACCMODE) | O_RDWR;
+				break;
+			case 't':
+#ifdef WIN32
+				openFlags |= O_TEXT;
+#endif
+				break;
+			case '+':
+				openFlags = (openFlags & ~O_ACCMODE) | O_RDWR;
+				break;
+			default:
+				i = 0;
+					// leave the while loop
+				break;
 		}
-	} else
-	if (*mode == '+') {
 		mode++;
-		openFlags = (openFlags & ~O_ACCMODE) | O_RDWR;
 	}
 
 	// Any characters in the mode string that might follow are ignored.
@@ -404,13 +415,27 @@ uio_fwrite(const void *buf, size_t size, size_t nmemb, uio_Stream *stream) {
 		return 0;
 	}
 
+	// TODO: It's possible that uio_Stream_flushBuffer just seeked back
+	//       from the end of the part written, to the end of the part
+	//       read. This seek will just undo that effect, so there's room
+	//       for optimisation here.
+	//       (decouple stream->seekLow from stream->readEnd by adding
+	//       a seekHigh var?)
+	if (uio_lseek(stream->handle, stream->seekLow -
+			(stream->readEnd - stream->bufPtr), SEEK_SET) == -1) {
+		// errno is set
+		return 0;
+	}
+	stream->seekLow -= (stream->readEnd - stream->bufPtr);
+	
 	bytesWritten = uio_write(stream->handle, buf, bytesToWrite);
 	if (bytesWritten != bytesToWrite) {
 		stream->status = uio_Stream_STATUS_ERROR;
 		if (bytesWritten == -1)
 			return 0;
 	}
-	stream->seekLow += stream->readEnd - stream->bufPtr + bytesWritten;
+	stream->seekLow += bytesWritten;
+	// TODO: readStart is no longer aligned on a block.
 	stream->readStart = stream->buf;
 	stream->bufPtr = stream->buf;
 	stream->readEnd = stream->buf;