adam/cobm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug in fopen() mode fixed.

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1049 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
meep-eep
2003-07-12 23:02:55 +00:00
parent 1e32549dc3
commit 1a36fdd8b4
1 changed files with 36 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/sc2code/libs/uio/uiostream.c
+36 -11
View File
@@ -49,6 +49,7 @@ uio_fopen(uio_DirHandle *dir, const char *path, const char *mode) {
int openFlags; int openFlags;
uio_Handle *handle; uio_Handle *handle;
uio_Stream *stream; uio_Stream *stream;
int i;
switch (*mode) { switch (*mode) {
case 'r': case 'r':
@@ -66,20 +67,30 @@ uio_fopen(uio_DirHandle *dir, const char *path, const char *mode) {
} }
mode++; mode++;
// 'b' may either be the second or the third character. // C'89 says 'b' may either be the second or the third character.
if (*mode == 'b') { // If someone specifies both 'b' and 't', he/she is out of luck.
mode++; i = 2;
while (i-- && (*mode != '\0')) {
switch (*mode) {
case 'b':
#ifdef WIN32 #ifdef WIN32
openFlags |= O_BINARY; openFlags |= O_BINARY;
#endif #endif
if (*mode == '+') { break;
mode++; case 't':
openFlags = (openFlags & ~O_ACCMODE) | O_RDWR; #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++; mode++;
openFlags = (openFlags & ~O_ACCMODE) | O_RDWR;
} }
// Any characters in the mode string that might follow are ignored. // 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; 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); bytesWritten = uio_write(stream->handle, buf, bytesToWrite);
if (bytesWritten != bytesToWrite) { if (bytesWritten != bytesToWrite) {
stream->status = uio_Stream_STATUS_ERROR; stream->status = uio_Stream_STATUS_ERROR;
if (bytesWritten == -1) if (bytesWritten == -1)
return 0; 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->readStart = stream->buf;
stream->bufPtr = stream->buf; stream->bufPtr = stream->buf;
stream->readEnd = stream->buf; stream->readEnd = stream->buf;