mirror of
https://github.com/zlib-ng/minizip-ng
synced 2025-03-28 21:13:18 +00:00
fixed append to zip file not working with i/o buffering
fixed file not found not failing properly with i/o buffering
This commit is contained in:
Nathan Moinvaziri
parent
217ca8e5a9
commit
3a2005c3ab
@ -1,67 +0,0 @@
|
||||
Change in 1.01e (12 feb 05)
|
||||
- Fix in zipOpen2 for globalcomment (Rolf Kalbermatter)
|
||||
- Fix possible memory leak in unzip.c (Zoran Stevanovic)
|
||||
|
||||
Change in 1.01b (20 may 04)
|
||||
- Integrate patch from Debian package (submited by Mark Brown)
|
||||
- Add tools mztools from Xavier Roche
|
||||
|
||||
Change in 1.01 (8 may 04)
|
||||
- fix buffer overrun risk in unzip.c (Xavier Roche)
|
||||
- fix a minor buffer insecurity in minizip.c (Mike Whittaker)
|
||||
|
||||
Change in 1.00: (10 sept 03)
|
||||
- rename to 1.00
|
||||
- cosmetic code change
|
||||
|
||||
Change in 0.22: (19 May 03)
|
||||
- crypting support (unless you define NOCRYPT)
|
||||
- append file in existing zipfile
|
||||
|
||||
Change in 0.21: (10 Mar 03)
|
||||
- bug fixes
|
||||
|
||||
Change in 0.17: (27 Jan 02)
|
||||
- bug fixes
|
||||
|
||||
Change in 0.16: (19 Jan 02)
|
||||
- Support of ioapi for virtualize zip file access
|
||||
|
||||
Change in 0.15: (19 Mar 98)
|
||||
- fix memory leak in minizip.c
|
||||
|
||||
Change in 0.14: (10 Mar 98)
|
||||
- fix bugs in minizip.c sample for zipping big file
|
||||
- fix problem in month in date handling
|
||||
- fix bug in unzlocal_GetCurrentFileInfoInternal in unzip.c for
|
||||
comment handling
|
||||
|
||||
Change in 0.13: (6 Mar 98)
|
||||
- fix bugs in zip.c
|
||||
- add real minizip sample
|
||||
|
||||
Change in 0.12: (4 Mar 98)
|
||||
- add zip.c and zip.h for creates .zip file
|
||||
- fix change_file_date in miniunz.c for Unix (Jean-loup Gailly)
|
||||
- fix miniunz.c for file without specific record for directory
|
||||
|
||||
Change in 0.11: (3 Mar 98)
|
||||
- fix bug in unzGetCurrentFileInfo for get extra field and comment
|
||||
- enhance miniunz sample, remove the bad unztst.c sample
|
||||
|
||||
Change in 0.10: (2 Mar 98)
|
||||
- fix bug in unzReadCurrentFile
|
||||
- rename unzip* to unz* function and structure
|
||||
- remove Windows-like hungary notation variable name
|
||||
- modify some structure in unzip.h
|
||||
- add somes comment in source
|
||||
- remove unzipGetcCurrentFile function
|
||||
- replace ZUNZEXPORT by ZEXPORT
|
||||
- add unzGetLocalExtrafield for get the local extrafield info
|
||||
- add a new sample, miniunz.c
|
||||
|
||||
Change in 0.4: (25 Feb 98)
|
||||
- suppress the type unzipFileInZip.
|
||||
Only on file in the zipfile can be open at the same time
|
||||
- fix somes typo in code
|
||||
- added tm_unz structure in unzip_file_info (date/time in readable format)
|
||||
@ -1,74 +0,0 @@
|
||||
MiniZip - Copyright (c) 1998-2010 - by Gilles Vollant - version 1.1 64 bits from Mathias Svensson
|
||||
|
||||
Introduction
|
||||
---------------------
|
||||
MiniZip 1.1 is built from MiniZip 1.0 by Gilles Vollant ( http://www.winimage.com/zLibDll/minizip.html )
|
||||
|
||||
When adding ZIP64 support into minizip it would result into risk of breaking compatibility with minizip 1.0.
|
||||
All possible work was done for compatibility.
|
||||
|
||||
|
||||
Background
|
||||
---------------------
|
||||
When adding ZIP64 support Mathias Svensson found that Even Rouault have added ZIP64
|
||||
support for unzip.c into minizip for a open source project called gdal ( http://www.gdal.org/ )
|
||||
|
||||
That was used as a starting point. And after that ZIP64 support was added to zip.c
|
||||
some refactoring and code cleanup was also done.
|
||||
|
||||
|
||||
Changed from MiniZip 1.0 to MiniZip 1.1
|
||||
---------------------------------------
|
||||
* Added ZIP64 support for unzip ( by Even Rouault )
|
||||
* Added ZIP64 support for zip ( by Mathias Svensson )
|
||||
* Reverted some changed that Even Rouault did.
|
||||
* Bunch of patches received from Gulles Vollant that he received for MiniZip from various users.
|
||||
* Added unzip patch for BZIP Compression method (patch create by Daniel Borca)
|
||||
* Added BZIP Compress method for zip
|
||||
* Did some refactoring and code cleanup
|
||||
|
||||
|
||||
Credits
|
||||
|
||||
Gilles Vollant - Original MiniZip author
|
||||
Even Rouault - ZIP64 unzip Support
|
||||
Daniel Borca - BZip Compression method support in unzip
|
||||
Mathias Svensson - ZIP64 zip support
|
||||
Mathias Svensson - BZip Compression method support in zip
|
||||
|
||||
Resources
|
||||
|
||||
ZipLayout http://result42.com/projects/ZipFileLayout
|
||||
Command line tool for Windows that shows the layout and information of the headers in a zip archive.
|
||||
Used when debugging and validating the creation of zip files using MiniZip64
|
||||
|
||||
|
||||
ZIP App Note http://www.pkware.com/documents/casestudies/APPNOTE.TXT
|
||||
Zip File specification
|
||||
|
||||
|
||||
Notes.
|
||||
* To be able to use BZip compression method in zip64.c or unzip64.c the BZIP2 lib is needed and HAVE_BZIP2 need to be defined.
|
||||
|
||||
License
|
||||
----------------------------------------------------------
|
||||
Condition of use and distribution are the same than zlib :
|
||||
|
||||
This software is provided 'as-is', without any express or implied
|
||||
warranty. In no event will the authors be held liable for any damages
|
||||
arising from the use of this software.
|
||||
|
||||
Permission is granted to anyone to use this software for any purpose,
|
||||
including commercial applications, and to alter it and redistribute it
|
||||
freely, subject to the following restrictions:
|
||||
|
||||
1. The origin of this software must not be misrepresented; you must not
|
||||
claim that you wrote the original software. If you use this software
|
||||
in a product, an acknowledgment in the product documentation would be
|
||||
appreciated but is not required.
|
||||
2. Altered source versions must be plainly marked as such, and must not be
|
||||
misrepresented as being the original software.
|
||||
3. This notice may not be removed or altered from any source distribution.
|
||||
|
||||
----------------------------------------------------------
|
||||
|
||||
107
ioapi_buf.c
107
ioapi_buf.c
@ -144,6 +144,41 @@ voidpf ZCALLBACK fopendisk64_buf_func (opaque, stream_cd, number_disk, mode)
|
||||
return fopen_buf_internal_func(opaque, stream, number_disk, mode);
|
||||
}
|
||||
|
||||
long fflush_buf OF((voidpf opaque, voidpf stream));
|
||||
long fflush_buf (opaque, stream)
|
||||
voidpf opaque;
|
||||
voidpf stream;
|
||||
{
|
||||
ourbuffer_t *bufio = (ourbuffer_t *)opaque;
|
||||
ourstream_t *streamio = (ourstream_t *)stream;
|
||||
uInt totalBytesWritten = 0;
|
||||
uInt bytesToWrite = streamio->writeBufferLength;
|
||||
uInt bytesLeftToWrite = streamio->writeBufferLength;
|
||||
int bytesWritten = 0;
|
||||
|
||||
while (bytesLeftToWrite > 0)
|
||||
{
|
||||
if (bufio->filefunc64.zwrite_file != NULL)
|
||||
bytesWritten = bufio->filefunc64.zwrite_file(bufio->filefunc64.opaque, streamio->stream, streamio->writeBuffer + (bytesToWrite - bytesLeftToWrite), bytesLeftToWrite);
|
||||
else
|
||||
bytesWritten = bufio->filefunc.zwrite_file(bufio->filefunc.opaque, streamio->stream, streamio->writeBuffer + (bytesToWrite - bytesLeftToWrite), bytesLeftToWrite);
|
||||
|
||||
streamio->writeBufferMisses += 1;
|
||||
|
||||
print_buf(opaque, stream, "write flush [%d:%d len %d]\n", bytesToWrite, bytesLeftToWrite, streamio->writeBufferLength);
|
||||
|
||||
if (bytesWritten < 0)
|
||||
return bytesWritten;
|
||||
|
||||
totalBytesWritten += bytesWritten;
|
||||
bytesLeftToWrite -= bytesWritten;
|
||||
streamio->position += bytesWritten;
|
||||
}
|
||||
streamio->writeBufferLength = 0;
|
||||
streamio->writeBufferPos = 0;
|
||||
return totalBytesWritten;
|
||||
}
|
||||
|
||||
uLong ZCALLBACK fread_buf_func (opaque, stream, buf, size)
|
||||
voidpf opaque;
|
||||
voidpf stream;
|
||||
@ -157,9 +192,15 @@ uLong ZCALLBACK fread_buf_func (opaque, stream, buf, size)
|
||||
uInt bytesToCopy = 0;
|
||||
uInt bytesLeftToRead = size;
|
||||
uInt bytesRead = -1;
|
||||
int retVal = 0;
|
||||
|
||||
print_buf(opaque, stream, "read [size %ld pos %lld]\n", size, streamio->position);
|
||||
|
||||
if (streamio->writeBufferLength > 0)
|
||||
{
|
||||
print_buf(opaque, stream, "switch from write to read, not yet supported [%lld]\n", streamio->position);
|
||||
}
|
||||
|
||||
while (bytesLeftToRead > 0)
|
||||
{
|
||||
if ((streamio->readBufferLength == 0) || (streamio->readBufferPos == streamio->readBufferLength))
|
||||
@ -205,54 +246,40 @@ uLong ZCALLBACK fread_buf_func (opaque, stream, buf, size)
|
||||
return size - bytesLeftToRead;
|
||||
}
|
||||
|
||||
long fflush_buf (opaque, stream)
|
||||
voidpf opaque;
|
||||
voidpf stream;
|
||||
{
|
||||
ourbuffer_t *bufio = (ourbuffer_t *)opaque;
|
||||
ourstream_t *streamio = (ourstream_t *)stream;
|
||||
uInt totalBytesWritten = 0;
|
||||
uInt bytesToWrite = streamio->writeBufferLength;
|
||||
uInt bytesLeftToWrite = streamio->writeBufferLength;
|
||||
int bytesWritten = 0;
|
||||
|
||||
while (bytesLeftToWrite > 0)
|
||||
{
|
||||
if (bufio->filefunc64.zwrite_file != NULL)
|
||||
bytesWritten = bufio->filefunc64.zwrite_file(bufio->filefunc64.opaque, streamio->stream, streamio->writeBuffer + (bytesToWrite - bytesLeftToWrite), bytesLeftToWrite);
|
||||
else
|
||||
bytesWritten = bufio->filefunc.zwrite_file(bufio->filefunc.opaque, streamio->stream, streamio->writeBuffer + (bytesToWrite - bytesLeftToWrite), bytesLeftToWrite);
|
||||
|
||||
streamio->writeBufferMisses += 1;
|
||||
|
||||
print_buf(opaque, stream, "write flush [%d:%d len %d]\n", bytesToWrite, bytesLeftToWrite, streamio->writeBufferLength);
|
||||
|
||||
if (bytesWritten < 0)
|
||||
return bytesWritten;
|
||||
|
||||
totalBytesWritten += bytesWritten;
|
||||
bytesLeftToWrite -= bytesWritten;
|
||||
streamio->position += bytesWritten;
|
||||
}
|
||||
streamio->writeBufferLength = 0;
|
||||
streamio->writeBufferPos = 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;
|
||||
ourstream_t *streamio = (ourstream_t *)stream;
|
||||
uInt bytesToWrite = size;
|
||||
uInt bytesLeftToWrite = size;
|
||||
uInt bytesToCopy = 0;
|
||||
|
||||
int retVal = 0;
|
||||
|
||||
print_buf(opaque, stream, "write [size %ld len %d pos %lld]\n", size, streamio->writeBufferLength, streamio->position);
|
||||
|
||||
if (streamio->readBufferLength > 0)
|
||||
{
|
||||
streamio->position -= streamio->readBufferLength;
|
||||
streamio->position += streamio->readBufferPos;
|
||||
|
||||
streamio->readBufferLength = 0;
|
||||
streamio->readBufferPos = 0;
|
||||
|
||||
print_buf(opaque, stream, "switch from read to write [%lld]\n", streamio->position);
|
||||
|
||||
if (bufio->filefunc64.zseek64_file != NULL)
|
||||
retVal = bufio->filefunc64.zseek64_file(bufio->filefunc64.opaque, streamio->stream, streamio->position, ZLIB_FILEFUNC_SEEK_SET);
|
||||
else
|
||||
retVal = bufio->filefunc.zseek_file(bufio->filefunc.opaque, streamio->stream, (uLong)streamio->position, ZLIB_FILEFUNC_SEEK_SET);
|
||||
|
||||
if (retVal != 0)
|
||||
return -1;
|
||||
}
|
||||
|
||||
while (bytesLeftToWrite > 0)
|
||||
{
|
||||
if (streamio->writeBufferLength == IOBUF_BUFFERSIZE)
|
||||
@ -397,7 +424,10 @@ long ZCALLBACK fseek_buf_func (opaque, stream, offset, origin)
|
||||
{
|
||||
ourbuffer_t *bufio = (ourbuffer_t *)opaque;
|
||||
ourstream_t *streamio = (ourstream_t *)stream;
|
||||
int retVal = fseek_buf_internal_func(opaque, stream, offset, origin);
|
||||
int retVal = -1;
|
||||
if (bufio->filefunc.zseek_file == NULL)
|
||||
return retVal;
|
||||
retVal = fseek_buf_internal_func(opaque, stream, offset, origin);
|
||||
if (retVal == 1)
|
||||
retVal = bufio->filefunc.zseek_file(bufio->filefunc.opaque, streamio->stream, offset, origin);
|
||||
return retVal;
|
||||
@ -411,7 +441,10 @@ long ZCALLBACK fseek64_buf_func (opaque, stream, offset, origin)
|
||||
{
|
||||
ourbuffer_t *bufio = (ourbuffer_t *)opaque;
|
||||
ourstream_t *streamio = (ourstream_t *)stream;
|
||||
int retVal = fseek_buf_internal_func(opaque, stream, offset, origin);
|
||||
int retVal = -1;
|
||||
if (bufio->filefunc64.zseek64_file == NULL)
|
||||
return retVal;
|
||||
retVal = fseek_buf_internal_func(opaque, stream, offset, origin);
|
||||
if (retVal == 1)
|
||||
retVal = bufio->filefunc64.zseek64_file(bufio->filefunc64.opaque, streamio->stream, offset, origin);
|
||||
return retVal;
|
||||
|
||||
@ -41,5 +41,5 @@ typedef struct ourbuffer_s {
|
||||
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);
|
||||
void fill_buffer_filefunc OF((zlib_filefunc_def* pzlib_filefunc_def, ourbuffer_t *ourbuf));
|
||||
void fill_buffer_filefunc64 OF((zlib_filefunc64_def* pzlib_filefunc_def, ourbuffer_t *ourbuf));
|
||||
Loading…
x
Reference in New Issue
Block a user