c/minizip-ng
1
0
Fork 0
mirror of https://github.com/zlib-ng/minizip-ng synced 2025-03-28 21:13:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed write buffering when seeking to current position

Browse Source
This commit is contained in:
Nathan Moinvaziri 2012-06-29 00:00:50 -07:00
parent 6cae70f507
commit 1e00f0ecac
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ioapi_buf.c
View File

@ -30,7 +30,7 @@
#define VPRINTF _vcprintf #define VPRINTF _vcprintf
#endif #endif
#define IOBUF_VERBOSE (0) //#define IOBUF_VERBOSE
#ifdef __GNUC__ #ifdef __GNUC__
#ifndef max #ifndef max
@ -65,8 +65,11 @@ typedef struct ourstream_s {
voidpf stream; voidpf stream;
} ourstream_t; } ourstream_t;
#define print_buf(o,s,f,...) \ #if defined(IOBUF_VERBOSE)
do { ourbuffer_t *bufio = (ourbuffer_t *)opaque; if (bufio->verbose) print_buf_internal(o,s,f,__VA_ARGS__); } while (0); #define print_buf(o,s,f,...) print_buf_internal(o,s,f,__VA_ARGS__);
#else
#define print_buf(o,s,f,...)
#endif
void print_buf_internal(voidpf opaque, voidpf stream, char *format, ...) void print_buf_internal(voidpf opaque, voidpf stream, char *format, ...)
{ {
@ -77,7 +80,6 @@ void print_buf_internal(voidpf opaque, voidpf stream, char *format, ...)
VPRINTF(format, arglist); VPRINTF(format, arglist);
va_end(arglist); va_end(arglist);
} }
long fflush_buf (voidpf opaque, voidpf stream);
voidpf fopen_buf_internal_func (opaque, stream, number_disk, mode) voidpf fopen_buf_internal_func (opaque, stream, number_disk, mode)
voidpf opaque; voidpf opaque;
@ -153,12 +155,11 @@ uLong ZCALLBACK fread_buf_func (opaque, stream, buf, size)
uInt bytesLeftToRead = size; uInt bytesLeftToRead = size;
uInt bytesRead = -1; uInt bytesRead = -1;
if (bufio->verbose) print_buf(opaque, stream, "read [size %ld pos %lld]\n", size, streamio->position);
printf("Buf read [size %ld pos %lld]\n", size, streamio->position);
while (bytesLeftToRead > 0) while (bytesLeftToRead > 0)
{ {
if (streamio->readBufferPos == streamio->readBufferLength) if ((streamio->readBufferLength == 0) || (streamio->readBufferPos == streamio->readBufferLength))
{ {
if (streamio->readBufferLength == IOBUF_BUFFERSIZE) if (streamio->readBufferLength == IOBUF_BUFFERSIZE)
{ {
@ -182,8 +183,8 @@ uLong ZCALLBACK fread_buf_func (opaque, stream, buf, size)
if (bytesRead == 0) if (bytesRead == 0)
break; break;
} }
if (streamio->readBufferLength > 0) if ((streamio->readBufferLength - streamio->readBufferPos) > 0)
{ {
bytesToCopy = min(bytesLeftToRead, (streamio->readBufferLength - streamio->readBufferPos)); bytesToCopy = min(bytesLeftToRead, (streamio->readBufferLength - streamio->readBufferPos));
memcpy((char *)buf + bufLength, streamio->readBuffer + streamio->readBufferPos, bytesToCopy); memcpy((char *)buf + bufLength, streamio->readBuffer + streamio->readBufferPos, bytesToCopy);
@ -325,7 +326,7 @@ int fseek_buf_internal_func (opaque, stream, offset, origin)
if (streamio->writeBufferLength > 0) if (streamio->writeBufferLength > 0)
{ {
if ((offset >= streamio->position) && (offset < streamio->position + streamio->writeBufferLength)) if ((offset >= streamio->position) && (offset <= streamio->position + streamio->writeBufferLength))
{ {
streamio->writeBufferPos = (uLong)(offset - streamio->position); streamio->writeBufferPos = (uLong)(offset - streamio->position);
return 0; return 0;
@ -459,7 +460,6 @@ void fill_buffer_filefunc (pzlib_filefunc_def, ourbuf)
pzlib_filefunc_def->zclose_file = fclose_buf_func; pzlib_filefunc_def->zclose_file = fclose_buf_func;
pzlib_filefunc_def->zerror_file = ferror_buf_func; pzlib_filefunc_def->zerror_file = ferror_buf_func;
pzlib_filefunc_def->opaque = ourbuf; pzlib_filefunc_def->opaque = ourbuf;
ourbuf->verbose = IOBUF_VERBOSE;
} }
void fill_buffer_filefunc64 (pzlib_filefunc_def, ourbuf) void fill_buffer_filefunc64 (pzlib_filefunc_def, ourbuf)
@ -475,5 +475,4 @@ void fill_buffer_filefunc64 (pzlib_filefunc_def, ourbuf)
pzlib_filefunc_def->zclose_file = fclose_buf_func; pzlib_filefunc_def->zclose_file = fclose_buf_func;
pzlib_filefunc_def->zerror_file = ferror_buf_func; pzlib_filefunc_def->zerror_file = ferror_buf_func;
pzlib_filefunc_def->opaque = ourbuf; pzlib_filefunc_def->opaque = ourbuf;
ourbuf->verbose = IOBUF_VERBOSE;
} }

1
ioapi_buf.h
View File

@ -37,7 +37,6 @@ int ZCALLBACK fclose_buf_func OF((voidpf opaque,voidpf stream));
int ZCALLBACK ferror_buf_func OF((voidpf opaque,voidpf stream)); int ZCALLBACK ferror_buf_func OF((voidpf opaque,voidpf stream));
typedef struct ourbuffer_s { typedef struct ourbuffer_s {
int verbose;
zlib_filefunc_def filefunc; zlib_filefunc_def filefunc;
zlib_filefunc64_def filefunc64; zlib_filefunc64_def filefunc64;
} ourbuffer_t; } ourbuffer_t;