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

Enable data descriptor by default since it doesn't do any seek backs to update the local header.

Browse Source 
Fixed seeking to local header when writing split archive. It kept seeking back to disk with the cd instead of the disk with the local header when the disk referenced was the first disk.
This commit is contained in:
Nathan Moinvaziri 2020-01-04 16:55:21 -08:00
parent a008833eca
commit 41fcda94f6
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
mz_zip.c
View File

@ -1466,7 +1466,7 @@ void *mz_zip_create(void **handle)
if (zip != NULL)
{
memset(zip, 0, sizeof(mz_zip));
zip->data_descriptor = 0;
zip->data_descriptor = 1;
}
if (handle != NULL)
*handle = zip;
@ -1922,15 +1922,20 @@ int32_t mz_zip_entry_is_open(void *handle)
static int32_t mz_zip_seek_to_local_header(void *handle)
{
mz_zip *zip = (mz_zip *)handle;
int64_t disk_size = 0;
int32_t disk_number = zip->file_info.disk_number;
if (disk_number == zip->disk_number_with_cd)
{
mz_stream_get_prop_int64(zip->stream, MZ_STREAM_PROP_DISK_SIZE, &disk_size);
if ((disk_size == 0) || ((zip->open_mode & MZ_OPEN_MODE_WRITE) == 0))
disk_number = -1;
}
if (((zip->open_mode & MZ_OPEN_MODE_WRITE) == 0) && (zip->file_info.disk_number == zip->disk_number_with_cd))
mz_stream_set_prop_int64(zip->stream, MZ_STREAM_PROP_DISK_NUMBER, -1);
else
mz_stream_set_prop_int64(zip->stream, MZ_STREAM_PROP_DISK_NUMBER, zip->file_info.disk_number);
mz_stream_set_prop_int64(zip->stream, MZ_STREAM_PROP_DISK_NUMBER, disk_number);
mz_zip_print("Zip - Entry - Seek local (disk %" PRId32 " offset %" PRId64 ")\n",
zip->file_info.disk_number, zip->file_info.disk_offset);
disk_number, zip->file_info.disk_offset);
/* Guard against seek overflows */
if ((zip->disk_offset_shift > 0) &&