mirror of
https://github.com/zlib-ng/minizip-ng
synced 2025-03-28 21:13:18 +00:00
added support for io buffering
This commit is contained in:
Nathan Moinvaziri
parent
82def1052a
commit
6aaab7317c
2
README
2
README
@ -1 +1 @@
|
||||
Minizip contrib from zlib 1.2.6.1 that supports pkware disk spanning. It also includes io_mem and fixes found on the minizip forum.
|
||||
Minizip contrib from zlib 1.2.6.1 that supports pkware disk spanning and io buffering. It also includes io_mem and fixes found on the minizip forum.
|
||||
4
ioapi.h
4
ioapi.h
@ -175,10 +175,8 @@ typedef struct zlib_filefunc64_def_s
|
||||
voidpf opaque;
|
||||
} zlib_filefunc64_def;
|
||||
|
||||
void fill_fopen64_filefunc OF((zlib_filefunc64_def* pzlib_filefunc_def));
|
||||
void fill_fopen_filefunc OF((zlib_filefunc_def* pzlib_filefunc_def));
|
||||
void fill_fopendisk64_filefunc OF((zlib_filefunc64_def* pzlib_filefunc_def));
|
||||
void fill_fopendisk_filefunc OF((zlib_filefunc_def* pzlib_filefunc_def));
|
||||
void fill_fopen64_filefunc OF((zlib_filefunc64_def* pzlib_filefunc_def));
|
||||
|
||||
/* now internal definition, only for zip.c and unzip.h */
|
||||
typedef struct zlib_filefunc64_32_def_s
|
||||
|
||||
372
ioapi_buf.c
Normal file
372
ioapi_buf.c
Normal file
@ -0,0 +1,372 @@
|
||||
/* ioapi_buf.h -- IO base function header for compress/uncompress .zip
|
||||
files using zlib + zip or unzip API
|
||||
|
||||
This version of ioapi is designed to buffer IO.
|
||||
|
||||
Based on Unzip ioapi.c version 0.22, May 19th, 2003
|
||||
|
||||
Copyright (C) 1998-2003 Gilles Vollant
|
||||
(C) 2003 Justin Fletcher
|
||||
(C) 2012 Nathan Moinvaziri
|
||||
|
||||
This file is under the same license as the Unzip tool it is distributed
|
||||
with.
|
||||
*/
|
||||
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "zlib.h"
|
||||
#include "ioapi.h"
|
||||
|
||||
#include "ioapi_buf.h"
|
||||
|
||||
#if defined(_WIN32)
|
||||
#include <conio.h>
|
||||
#define printf _cprintf
|
||||
#endif
|
||||
|
||||
#ifdef __GNUC__
|
||||
#ifndef max
|
||||
#define max(x,y) ({ \
|
||||
const typeof(x) _x = (x); \
|
||||
const typeof(y) _y = (y); \
|
||||
(void) (&_x == &_y); \
|
||||
_x > _y ? _x : _y; })
|
||||
#endif /* __GNUC__ */
|
||||
|
||||
#ifndef min
|
||||
#define min(x,y) ({ \
|
||||
const typeof(x) _x = (x); \
|
||||
const typeof(y) _y = (y); \
|
||||
(void) (&_x == &_y); \
|
||||
_x < _y ? _x : _y; })
|
||||
#endif
|
||||
#endif
|
||||
|
||||
voidpf ZCALLBACK fopen_buf_func (opaque, filename, mode)
|
||||
voidpf opaque;
|
||||
const char* filename;
|
||||
int mode;
|
||||
{
|
||||
ourbuffer_t *bufio = (ourbuffer_t *)opaque;
|
||||
return bufio->filefunc.zopen_file(bufio->filefunc.opaque, filename, mode);
|
||||
}
|
||||
|
||||
voidpf ZCALLBACK fopen64_buf_func (opaque, filename, mode)
|
||||
voidpf opaque;
|
||||
const char* filename;
|
||||
int mode;
|
||||
{
|
||||
ourbuffer_t *bufio = (ourbuffer_t *)opaque;
|
||||
return bufio->filefunc64.zopen64_file(bufio->filefunc64.opaque, filename, mode);
|
||||
}
|
||||
|
||||
voidpf ZCALLBACK fopendisk_buf_func (opaque, stream, number_disk, mode)
|
||||
voidpf opaque;
|
||||
voidpf stream;
|
||||
int number_disk;
|
||||
int mode;
|
||||
{
|
||||
ourbuffer_t *bufio = (ourbuffer_t *)opaque;
|
||||
return bufio->filefunc.zopendisk_file(bufio->filefunc.opaque, stream, number_disk, mode);
|
||||
}
|
||||
|
||||
voidpf ZCALLBACK fopendisk64_buf_func (opaque, stream, number_disk, mode)
|
||||
voidpf opaque;
|
||||
voidpf stream;
|
||||
int number_disk;
|
||||
int mode;
|
||||
{
|
||||
ourbuffer_t *bufio = (ourbuffer_t *)opaque;
|
||||
return bufio->filefunc64.zopendisk64_file(bufio->filefunc64.opaque, stream, number_disk, mode);
|
||||
}
|
||||
|
||||
uLong ZCALLBACK fread_buf_func (opaque, stream, buf, size)
|
||||
voidpf opaque;
|
||||
voidpf stream;
|
||||
void* buf;
|
||||
uLong size;
|
||||
{
|
||||
ourbuffer_t *bufio = (ourbuffer_t *)opaque;
|
||||
uLong bytesToRead = 0;
|
||||
uLong bytesRead = -1;
|
||||
uLong bytesLeftToRead = size;
|
||||
uLong bufLength = 0;
|
||||
uLong bytesToCopy = 0;
|
||||
|
||||
if (bufio->verbose)
|
||||
printf("Buf read [size %d]\n", size);
|
||||
|
||||
while (bytesLeftToRead > 0)
|
||||
{
|
||||
if (bufio->readBufferLength == 0)
|
||||
{
|
||||
bytesToRead = IOBUF_BUFFERSIZE - bufio->readBufferLength;
|
||||
|
||||
if (bufio->filefunc64.zread_file != NULL)
|
||||
bytesRead = bufio->filefunc64.zread_file(bufio->filefunc.opaque, stream, bufio->readBuffer + bufio->readBufferLength, bytesToRead);
|
||||
else
|
||||
bytesRead = bufio->filefunc.zread_file(bufio->filefunc.opaque, stream, bufio->readBuffer + bufio->readBufferLength, bytesToRead);
|
||||
|
||||
if (bufio->verbose)
|
||||
printf("Buf filled [bytesToRead %d bytesRead %d len %d]\n", bytesToRead, bytesRead, bufio->readBufferLength + bytesRead);
|
||||
|
||||
if (bytesRead < 0)
|
||||
return bytesRead;
|
||||
else if (bytesRead == 0)
|
||||
break;
|
||||
|
||||
bufio->readBufferMisses += 1;
|
||||
bufio->readBufferLength += bytesRead;
|
||||
}
|
||||
|
||||
if (bufio->readBufferLength > 0)
|
||||
{
|
||||
bytesToCopy = min((long)bytesLeftToRead, bufio->readBufferLength);
|
||||
|
||||
memcpy((char *)buf + bufLength, bufio->readBuffer, bytesToCopy);
|
||||
memcpy(bufio->readBuffer, bufio->readBuffer + bytesToCopy, bufio->readBufferLength - bytesToCopy);
|
||||
|
||||
if (bufio->verbose)
|
||||
printf("Buf emptied [bytesToCopy %d bytesLeftToRead %d len %d]\n", bytesToCopy, bytesLeftToRead, bufio->readBufferLength - bytesToCopy);
|
||||
|
||||
bufLength += bytesToCopy;
|
||||
bytesLeftToRead -= bytesToCopy;
|
||||
|
||||
bufio->readBufferLength -= bytesToCopy;
|
||||
bufio->readBufferHits += 1;
|
||||
}
|
||||
}
|
||||
|
||||
if (bytesLeftToRead < 0)
|
||||
return -1;
|
||||
|
||||
return size - bytesLeftToRead;
|
||||
}
|
||||
|
||||
uLong ZCALLBACK fwriteflush_buf_func (opaque, stream)
|
||||
voidpf opaque;
|
||||
voidpf stream;
|
||||
{
|
||||
ourbuffer_t *bufio = (ourbuffer_t *)opaque;
|
||||
uLong bytesWritten = 0;
|
||||
uLong totalBytesWritten = 0;
|
||||
uLong bytesToWrite = bufio->writeBufferLength;
|
||||
uLong bytesLeftToWrite = bufio->writeBufferLength;
|
||||
|
||||
while (bytesLeftToWrite > 0)
|
||||
{
|
||||
if (bufio->filefunc64.zwrite_file != NULL)
|
||||
bytesWritten = bufio->filefunc64.zwrite_file(bufio->filefunc.opaque, stream, bufio->writeBuffer + (bytesToWrite - bytesLeftToWrite), bytesLeftToWrite);
|
||||
else
|
||||
bytesWritten = bufio->filefunc.zwrite_file(bufio->filefunc.opaque, stream, bufio->writeBuffer + (bytesToWrite - bytesLeftToWrite), bytesLeftToWrite);
|
||||
|
||||
bufio->writeBufferMisses += 1;
|
||||
|
||||
if (bufio->verbose)
|
||||
printf("Buf write flush [bytesToWrite %d bytesLeftToWrite %d len %d]\n", bytesToWrite, bytesLeftToWrite, bufio->writeBufferLength);
|
||||
|
||||
if (bytesWritten < 0)
|
||||
return bytesWritten;
|
||||
|
||||
totalBytesWritten += bytesWritten;
|
||||
bytesLeftToWrite -= bytesWritten;
|
||||
}
|
||||
bufio->writeBufferLength = 0;
|
||||
return totalBytesWritten;
|
||||
}
|
||||
|
||||
uLong ZCALLBACK fwrite_buf_func (opaque, stream, buf, size)
|
||||
voidpf opaque;
|
||||
voidpf stream;
|
||||
const void* buf;
|
||||
uLong size;
|
||||
{
|
||||
ourbuffer_t *bufio = (ourbuffer_t *)opaque;
|
||||
uLong bytesToWrite = size;
|
||||
uLong bytesLeftToWrite = size;
|
||||
uLong bytesToCopy = 0;
|
||||
|
||||
|
||||
if (bufio->verbose)
|
||||
printf("Buf write [size %d len %d]\n", size, bufio->writeBufferLength);
|
||||
|
||||
while (bytesLeftToWrite > 0)
|
||||
{
|
||||
if (bufio->writeBufferLength == IOBUF_BUFFERSIZE)
|
||||
{
|
||||
if (fwriteflush_buf_func(opaque, stream) < 0)
|
||||
return -1;
|
||||
}
|
||||
|
||||
bytesToCopy = min(bytesLeftToWrite, (uLong)(IOBUF_BUFFERSIZE - bufio->writeBufferLength));
|
||||
|
||||
memcpy(bufio->writeBuffer + bufio->writeBufferLength, (char *)buf + (bytesToWrite - bytesLeftToWrite), bytesToCopy);
|
||||
|
||||
if (bufio->verbose)
|
||||
printf("Buf write copy [bytesToCopy %d bytesToWrite %d bytesLeftToWrite %d len %d]\n", bytesToCopy, bytesToWrite, bytesLeftToWrite, bufio->writeBufferLength + bytesToCopy);
|
||||
|
||||
bytesLeftToWrite -= bytesToCopy;
|
||||
|
||||
bufio->writeBufferHits += 1;
|
||||
bufio->writeBufferLength += bytesToCopy;
|
||||
}
|
||||
|
||||
if (bytesLeftToWrite < 0)
|
||||
return -1;
|
||||
|
||||
return size - bytesLeftToWrite;
|
||||
}
|
||||
|
||||
long ZCALLBACK ftell_buf_func (opaque, stream)
|
||||
voidpf opaque;
|
||||
voidpf stream;
|
||||
{
|
||||
ourbuffer_t *bufio = (ourbuffer_t *)opaque;
|
||||
long position = 0;
|
||||
position = bufio->filefunc.ztell_file(bufio->filefunc64.opaque, stream);
|
||||
if (bufio->verbose)
|
||||
printf("Buf tell [position %I64d readLen %d writeLen %d]\n", position, bufio->readBufferLength, bufio->writeBufferLength);
|
||||
if (bufio->readBufferLength > 0)
|
||||
position -= bufio->readBufferLength;
|
||||
if (bufio->writeBufferLength > 0)
|
||||
position += bufio->writeBufferLength;
|
||||
return position;
|
||||
}
|
||||
|
||||
ZPOS64_T ZCALLBACK ftell64_buf_func (opaque, stream)
|
||||
voidpf opaque;
|
||||
voidpf stream;
|
||||
{
|
||||
ourbuffer_t *bufio = (ourbuffer_t *)opaque;
|
||||
ZPOS64_T position = 0;
|
||||
position = bufio->filefunc64.ztell64_file(bufio->filefunc64.opaque, stream);
|
||||
if (bufio->verbose)
|
||||
printf("Buf tell [position %I64d readLen %d writeLen %d]\n", position, bufio->readBufferLength, bufio->writeBufferLength);
|
||||
if (bufio->readBufferLength > 0)
|
||||
position -= bufio->readBufferLength;
|
||||
if (bufio->writeBufferLength > 0)
|
||||
position += bufio->writeBufferLength;
|
||||
return position;
|
||||
}
|
||||
|
||||
long ZCALLBACK fseek_buf_func (opaque, stream, offset, origin)
|
||||
voidpf opaque;
|
||||
voidpf stream;
|
||||
uLong offset;
|
||||
int origin;
|
||||
{
|
||||
ourbuffer_t *bufio = (ourbuffer_t *)opaque;
|
||||
if ((origin == ZLIB_FILEFUNC_SEEK_CUR) && (offset < (uLong)bufio->readBufferLength))
|
||||
{
|
||||
if (bufio->verbose)
|
||||
printf("Buf seek cur %d\n", offset);
|
||||
memcpy(bufio->readBuffer, bufio->readBuffer + offset, bufio->readBufferLength - offset);
|
||||
bufio->readBufferLength -= offset;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (bufio->verbose)
|
||||
printf("Buf seek oob\n");
|
||||
bufio->readBufferLength = 0;
|
||||
}
|
||||
if (bufio->writeBufferLength > 0)
|
||||
{
|
||||
if (fwriteflush_buf_func(opaque, stream) < 0)
|
||||
return -1;
|
||||
}
|
||||
return bufio->filefunc.zseek_file(bufio->filefunc.opaque, stream, offset, origin);
|
||||
}
|
||||
|
||||
long ZCALLBACK fseek64_buf_func (opaque, stream, offset, origin)
|
||||
voidpf opaque;
|
||||
voidpf stream;
|
||||
ZPOS64_T offset;
|
||||
int origin;
|
||||
{
|
||||
ourbuffer_t *bufio = (ourbuffer_t *)opaque;
|
||||
if ((origin == ZLIB_FILEFUNC_SEEK_CUR) && (offset < bufio->readBufferLength))
|
||||
{
|
||||
if (bufio->verbose)
|
||||
printf("Buf seek64 cur %d\n", offset);
|
||||
memcpy(bufio->readBuffer, bufio->readBuffer + offset, bufio->readBufferLength - (long)offset);
|
||||
bufio->readBufferLength -= (long)offset;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (bufio->verbose)
|
||||
printf("Buf seek64 oob\n");
|
||||
bufio->readBufferLength = 0;
|
||||
}
|
||||
if (bufio->writeBufferLength > 0)
|
||||
{
|
||||
if (fwriteflush_buf_func(opaque, stream) < 0)
|
||||
return -1;
|
||||
}
|
||||
return bufio->filefunc64.zseek64_file(bufio->filefunc64.opaque, stream, offset, origin);
|
||||
}
|
||||
|
||||
int ZCALLBACK fclose_buf_func (opaque, stream)
|
||||
voidpf opaque;
|
||||
voidpf stream;
|
||||
{
|
||||
ourbuffer_t *bufio = (ourbuffer_t *)opaque;
|
||||
if (bufio->writeBufferLength > 0)
|
||||
fwriteflush_buf_func(opaque, stream);
|
||||
if (bufio->verbose)
|
||||
{
|
||||
if (bufio->readBufferHits + bufio->readBufferMisses > 0)
|
||||
printf("Buf read efficency %.02f%%\n", (bufio->readBufferHits / ((float)bufio->readBufferHits + bufio->readBufferMisses)) * 100);
|
||||
if (bufio->writeBufferHits + bufio->writeBufferMisses > 0)
|
||||
printf("Buf write efficency %.02f%%\n", (bufio->writeBufferHits / ((float)bufio->writeBufferHits + bufio->writeBufferMisses)) * 100);
|
||||
}
|
||||
if (bufio->filefunc64.zclose_file != NULL)
|
||||
return bufio->filefunc64.zclose_file(bufio->filefunc.opaque, stream);
|
||||
return bufio->filefunc.zclose_file(bufio->filefunc.opaque, stream);
|
||||
}
|
||||
|
||||
int ZCALLBACK ferror_buf_func (opaque, stream)
|
||||
voidpf opaque;
|
||||
voidpf stream;
|
||||
{
|
||||
ourbuffer_t *bufio = (ourbuffer_t *)opaque;
|
||||
if (bufio->filefunc64.zerror_file != NULL)
|
||||
return bufio->filefunc64.zerror_file(bufio->filefunc.opaque, stream);
|
||||
return bufio->filefunc.zerror_file(bufio->filefunc.opaque, stream);
|
||||
}
|
||||
|
||||
|
||||
void fill_buffer_filefunc (pzlib_filefunc_def, ourbuf)
|
||||
zlib_filefunc_def* pzlib_filefunc_def;
|
||||
ourbuffer_t *ourbuf;
|
||||
{
|
||||
pzlib_filefunc_def->zopen_file = fopen_buf_func;
|
||||
pzlib_filefunc_def->zopendisk_file = fopendisk_buf_func;
|
||||
pzlib_filefunc_def->zread_file = fread_buf_func;
|
||||
pzlib_filefunc_def->zwrite_file = fwrite_buf_func;
|
||||
pzlib_filefunc_def->ztell_file = ftell_buf_func;
|
||||
pzlib_filefunc_def->zseek_file = fseek_buf_func;
|
||||
pzlib_filefunc_def->zclose_file = fclose_buf_func;
|
||||
pzlib_filefunc_def->zerror_file = ferror_buf_func;
|
||||
pzlib_filefunc_def->opaque = ourbuf;
|
||||
//ourbuf->verbose = 1;
|
||||
}
|
||||
|
||||
void fill_buffer_filefunc64 (pzlib_filefunc_def, ourbuf)
|
||||
zlib_filefunc64_def* pzlib_filefunc_def;
|
||||
ourbuffer_t *ourbuf;
|
||||
{
|
||||
pzlib_filefunc_def->zopen64_file = fopen64_buf_func;
|
||||
pzlib_filefunc_def->zopendisk64_file = fopendisk64_buf_func;
|
||||
pzlib_filefunc_def->zread_file = fread_buf_func;
|
||||
pzlib_filefunc_def->zwrite_file = fwrite_buf_func;
|
||||
pzlib_filefunc_def->ztell64_file = ftell64_buf_func;
|
||||
pzlib_filefunc_def->zseek64_file = fseek64_buf_func;
|
||||
pzlib_filefunc_def->zclose_file = fclose_buf_func;
|
||||
pzlib_filefunc_def->zerror_file = ferror_buf_func;
|
||||
pzlib_filefunc_def->opaque = ourbuf;
|
||||
//ourbuf->verbose = 1;
|
||||
}
|
||||
55
ioapi_buf.h
Normal file
55
ioapi_buf.h
Normal file
@ -0,0 +1,55 @@
|
||||
/* ioapi_buf.h -- IO base function header for compress/uncompress .zip
|
||||
files using zlib + zip or unzip API
|
||||
|
||||
This version of ioapi is designed to buffer IO.
|
||||
|
||||
Based on Unzip ioapi.c version 0.22, May 19th, 2003
|
||||
|
||||
Copyright (C) 1998-2003 Gilles Vollant
|
||||
(C) 2003 Justin Fletcher
|
||||
(C) 2012 Nathan Moinvaziri
|
||||
|
||||
This file is under the same license as the Unzip tool it is distributed
|
||||
with.
|
||||
*/
|
||||
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "zlib.h"
|
||||
#include "ioapi.h"
|
||||
|
||||
#define IOBUF_BUFFERSIZE (64 * 1024)
|
||||
|
||||
voidpf ZCALLBACK fopen_buf_func OF((voidpf opaque,const char* filename,int mode));
|
||||
voidpf ZCALLBACK fopen64_buf_func OF((voidpf opaque,const char* filename,int mode));
|
||||
voidpf ZCALLBACK fopendisk_buf_func OF((voidpf opaque, voidpf stream, int number_disk, int mode));
|
||||
voidpf ZCALLBACK fopendisk64_buf_func OF((voidpf opaque, voidpf stream, int number_disk, int mode));
|
||||
uLong ZCALLBACK fread_buf_func OF((voidpf opaque,voidpf stream,void* buf,uLong size));
|
||||
uLong ZCALLBACK fwrite_buf_func OF((voidpf opaque,voidpf stream,const void* buf,uLong size));
|
||||
long ZCALLBACK ftell_buf_func OF((voidpf opaque,voidpf stream));
|
||||
ZPOS64_T ZCALLBACK ftell64_buf_func OF((voidpf opaque, voidpf stream));
|
||||
long ZCALLBACK fseek_buf_func OF((voidpf opaque,voidpf stream,uLong offset,int origin));
|
||||
long ZCALLBACK fseek64_buf_func OF((voidpf opaque, voidpf stream, ZPOS64_T offset, int origin));
|
||||
int ZCALLBACK fclose_buf_func OF((voidpf opaque,voidpf stream));
|
||||
int ZCALLBACK ferror_buf_func OF((voidpf opaque,voidpf stream));
|
||||
|
||||
typedef struct ourbuffer_s {
|
||||
char readBuffer[IOBUF_BUFFERSIZE];
|
||||
long readBufferLength;
|
||||
long readBufferHits;
|
||||
long readBufferMisses;
|
||||
char writeBuffer[IOBUF_BUFFERSIZE];
|
||||
long writeBufferLength;
|
||||
long writeBufferHits;
|
||||
long writeBufferMisses;
|
||||
uLong position;
|
||||
int verbose;
|
||||
zlib_filefunc_def filefunc;
|
||||
zlib_filefunc64_def filefunc64;
|
||||
} ourbuffer_t;
|
||||
|
||||
void fill_buffer_filefunc (zlib_filefunc_def* pzlib_filefunc_def, ourbuffer_t *ourbuf);
|
||||
void fill_buffer_filefunc64 (zlib_filefunc64_def* pzlib_filefunc_def, ourbuffer_t *ourbuf);
|
||||
4
zip.c
4
zip.c
@ -1260,9 +1260,9 @@ extern int ZEXPORT zipOpenNewFileInZip4_64 (zipFile file, const char* filename,
|
||||
zi->ci.flag = flagBase;
|
||||
if ((level==8) || (level==9))
|
||||
zi->ci.flag |= 2;
|
||||
if ((level==2))
|
||||
if (level==2)
|
||||
zi->ci.flag |= 4;
|
||||
if ((level==1))
|
||||
if (level==1)
|
||||
zi->ci.flag |= 6;
|
||||
if (password != NULL)
|
||||
zi->ci.flag |= 1;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user