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 issues with zip64 not being written in local header.

Browse Source 
Modified split writing to stop creating disks after central dir.
Renamed method #defines.
This commit is contained in:
Nathan Moinvaziri 2017-10-10 10:05:20 -07:00
parent 11b489c949
commit af2daca4a1
7 changed files with 80 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
miniunz.c
View File

@ -89,10 +89,10 @@ int32_t miniunz_list(void *handle)
switch (file_info->compression_method)
{
case MZ_METHOD_RAW:
case MZ_COMPRESS_METHOD_RAW:
string_method = "Stored";
break;
case MZ_METHOD_DEFLATE:
case MZ_COMPRESS_METHOD_DEFLATE:
level = (int16_t)((file_info->flag & 0x6) / 2);
if (level == 0)
string_method = "Defl:N";
@ -103,10 +103,10 @@ int32_t miniunz_list(void *handle)
else
string_method = "Defl:?";
break;
case MZ_METHOD_BZIP2:
case MZ_COMPRESS_METHOD_BZIP2:
string_method = "BZip2";
break;
case MZ_METHOD_LZMA:
case MZ_COMPRESS_METHOD_LZMA:
string_method = "LZMA";
break;
default:

8
minizip.c
View File

@ -221,7 +221,7 @@ int main(int argc, char *argv[])
memset(&compress_info, 0, sizeof(compress_info));
memset(&crypt_info, 0, sizeof(crypt_info));
compress_info.method = MZ_METHOD_DEFLATE;
compress_info.method = MZ_COMPRESS_METHOD_DEFLATE;
compress_info.level = MZ_COMPRESS_LEVEL_DEFAULT;
// Parse command line options
@ -242,17 +242,17 @@ int main(int argc, char *argv[])
{
compress_info.level = (c - '0');
if (compress_info.level == 0)
compress_info.method = MZ_METHOD_RAW;
compress_info.method = MZ_COMPRESS_METHOD_RAW;
}
if ((c == 'j') || (c == 'J'))
opt_exclude_path = 1;
#ifdef HAVE_BZIP2
if ((c == 'b') || (c == 'B'))
compress_info.method = MZ_METHOD_BZIP2;
compress_info.method = MZ_COMPRESS_METHOD_BZIP2;
#endif
#ifdef HAVE_LZMA
if ((c == 'm') || (c == 'M'))
compress_info.method = MZ_METHOD_LZMA;
compress_info.method = MZ_COMPRESS_METHOD_LZMA;
#endif
#ifdef HAVE_AES
if ((c == 's') || (c == 'S'))

15
mz_strm_split.c
View File

@ -160,11 +160,15 @@ int32_t mz_stream_split_write(void *stream, const void *buf, int32_t size)
if (err == MZ_OK)
{
bytes_avail = (int32_t)(split->disk_size - split->total_out_disk);
bytes_to_write = bytes_left;
if (bytes_to_write > bytes_avail)
bytes_to_write = bytes_avail;
if (split->disk_directory == 0)
{
bytes_avail = (int32_t)(split->disk_size - split->total_out_disk);
if (bytes_to_write > bytes_avail)
bytes_to_write = bytes_avail;
}
written = mz_stream_write(split->stream.base, buf_ptr, bytes_to_write);
if (written != bytes_to_write)
return MZ_STREAM_ERROR;
@ -259,6 +263,11 @@ void mz_stream_split_delete(void **stream)
split = (mz_stream_split *)*stream;
if (split != NULL)
{
if (split->path)
free(split->path);
if (split->current_path)
free(split->current_path);
free(split);
}
*stream = NULL;

10
mz_unzip.c
View File

@ -717,10 +717,10 @@ extern int ZEXPORT mz_unzip_entry_open(void *handle, int raw, const char *passwo
return err;
if ((unzip->file_info.compression_method != 0) &&
(unzip->file_info.compression_method != MZ_METHOD_DEFLATE))
(unzip->file_info.compression_method != MZ_COMPRESS_METHOD_DEFLATE))
{
#ifdef HAVE_BZIP2
if (unzip->file_info.compression_method != MZ_METHOD_BZIP2)
if (unzip->file_info.compression_method != MZ_COMPRESS_METHOD_BZIP2)
return MZ_FORMAT_ERROR;
#elif HAVE_LZMA
if (unzip->file_info.compression_method != MZ_METHOD_LZMA)
@ -801,14 +801,14 @@ extern int ZEXPORT mz_unzip_entry_open(void *handle, int raw, const char *passwo
}
else
{
if (unzip->file_info.compression_method == MZ_METHOD_DEFLATE)
if (unzip->file_info.compression_method == MZ_COMPRESS_METHOD_DEFLATE)
mz_stream_zlib_create(&unzip->compress_stream);
#ifdef HAVE_BZIP2
else if (unzip->file_info.compression_method == MZ_METHOD_BZIP2)
else if (unzip->file_info.compression_method == MZ_COMPRESS_METHOD_BZIP2)
mz_stream_bzip_create(&unzip->compress_stream);
#endif
#ifdef HAVE_LZMA
else if (unzip->file_info.compression_method == MZ_METHOD_LZMA)
else if (unzip->file_info.compression_method == MZ_COMPRESS_METHOD_LZMA)
mz_stream_lzma_create(&unzip->compress_stream);
#endif
else

20
mz_unzip.h
View File

@ -31,11 +31,11 @@ extern "C" {
/***************************************************************************/
#ifndef MZ_METHOD
# define MZ_METHOD_RAW (0)
# define MZ_METHOD_DEFLATE (8)
# define MZ_METHOD_BZIP2 (12)
# define MZ_METHOD_LZMA (14)
#ifndef MZ_COMPRESS_METHOD
# define MZ_COMPRESS_METHOD_RAW (0)
# define MZ_COMPRESS_METHOD_DEFLATE (8)
# define MZ_COMPRESS_METHOD_BZIP2 (12)
# define MZ_COMPRESS_METHOD_LZMA (14)
#endif
/***************************************************************************/
@ -77,17 +77,17 @@ typedef struct mz_unzip_file_s
/***************************************************************************/
// Opening and close a zip file
// Open a zip file
extern void* ZEXPORT mz_unzip_open(void *stream);
// Open a zip file
// Close a zip file
extern int ZEXPORT mz_unzip_close(void *handle);
// Close a zip file
// Get global info about the zip file
extern int ZEXPORT mz_unzip_get_global_info(void *handle, mz_unzip_global *global_info);
// Get global info about the zip file
// Get the global comment string of the zip file, in the comment buffer
extern int ZEXPORT mz_unzip_get_global_comment(void *handle, char *comment, uint16_t comment_size);
// Get the global comment string of the zip file, in the comment buffer
/***************************************************************************/
// Reading the content of the current zip file, you can open it, read it, and close it
@ -100,6 +100,8 @@ extern int ZEXPORT mz_unzip_entry_read(void *handle, void *buf, uint32_t len);
extern int ZEXPORT mz_unzip_entry_get_info(void *handle, mz_unzip_file **file_info);
// Get info about the current file
//
// NOTE: The pointer to the file info is only valid while the current file is open
extern int ZEXPORT mz_unzip_entry_get_extrafield_local(void *handle, void *buf, uint32_t len);
// Read extra field from the current file

61
mz_zip.c
View File

@ -63,6 +63,16 @@
/***************************************************************************/
#define MZ_ZIP_FLAG_ENCRYPTED (1 << 0)
#define MZ_ZIP_FLAG_LZMA_EOS_MARKER (1 << 1)
#define MZ_ZIP_FLAG_DEFLATE_MAX (1 << 1)
#define MZ_ZIP_FLAG_DEFLATE_NORMAL (0)
#define MZ_ZIP_FLAG_DEFLATE_FAST (1 << 2)
#define MZ_ZIP_FLAG_DEFLATE_SUPER_FAST (MZ_ZIP_FLAG_DEFLATE_FAST | MZ_ZIP_FLAG_DEFLATE_MAX)
#define MZ_ZIP_FLAG_DATA_DESCRIPTOR (1 << 3)
/***************************************************************************/
typedef struct mz_zip_s
{
mz_zip_file file_info;
@ -405,13 +415,13 @@ extern int ZEXPORT mz_zip_entry_open(void *handle, const mz_zip_file *file_info,
switch (compress_info->method)
{
case MZ_METHOD_RAW:
case MZ_METHOD_DEFLATE:
case MZ_COMPRESS_METHOD_RAW:
case MZ_COMPRESS_METHOD_DEFLATE:
#ifdef HAVE_BZIP2
case MZ_METHOD_BZIP2:
case MZ_COMPRESS_METHOD_BZIP2:
#endif
#if HAVE_LZMA
case MZ_METHOD_LZMA:
case MZ_COMPRESS_METHOD_LZMA:
#endif
err = MZ_OK;
break;
@ -432,21 +442,21 @@ extern int ZEXPORT mz_zip_entry_open(void *handle, const mz_zip_file *file_info,
memcpy(&zip->crypt_info, crypt_info, sizeof(mz_zip_crypt));
memcpy(&zip->compress_info, compress_info, sizeof(mz_zip_compress));
zip->file_info.flag |= 8; // data descriptor
zip->file_info.flag |= MZ_ZIP_FLAG_DATA_DESCRIPTOR;
#ifdef HAVE_LZMA
zip->file_info.flag |= 2; // end of stream marker
zip->file_info.flag |= MZ_ZIP_FLAG_LZMA_EOS_MARKER;
#endif
if ((zip->compress_info.level == 8) || (zip->compress_info.level == 9))
zip->file_info.flag |= 2;
zip->file_info.flag |= MZ_ZIP_FLAG_DEFLATE_MAX;
if (zip->compress_info.level == 2)
zip->file_info.flag |= 4;
zip->file_info.flag |= MZ_ZIP_FLAG_DEFLATE_FAST;
if (zip->compress_info.level == 1)
zip->file_info.flag |= 6;
zip->file_info.flag |= MZ_ZIP_FLAG_DEFLATE_SUPER_FAST;
if (zip->crypt_info.password != NULL)
zip->file_info.flag |= 1;
zip->file_info.flag |= MZ_ZIP_FLAG_ENCRYPTED;
else
zip->file_info.flag &= ~1;
zip->file_info.flag &= ~MZ_ZIP_FLAG_ENCRYPTED;
filename_size = (uint16_t)strlen(zip->file_info.filename);
@ -469,7 +479,7 @@ extern int ZEXPORT mz_zip_entry_open(void *handle, const mz_zip_file *file_info,
version_needed = 51;
#endif
#ifdef HAVE_LZMA
if (zip->compress_info.method == MZ_METHOD_LZMA)
if (zip->compress_info.method == MZ_COMPRESS_METHOD_LZMA)
version_needed = 63;
#endif
@ -505,6 +515,8 @@ extern int ZEXPORT mz_zip_entry_open(void *handle, const mz_zip_file *file_info,
if ((zip->file_info.flag & 1) && (zip->crypt_info.aes))
extrafield_size += 4 + 7;
#endif
if (zip->file_info.zip64)
extrafield_size += 4;
err = mz_stream_write_uint16(zip->stream, extrafield_size);
}
if (err == MZ_OK)
@ -518,10 +530,15 @@ extern int ZEXPORT mz_zip_entry_open(void *handle, const mz_zip_file *file_info,
zip->file_info.extrafield_local_size) != zip->file_info.extrafield_local_size)
err = MZ_STREAM_ERROR;
}
// Add ZIP64 extra info header to central directory
if (zip->file_info.zip64)
{
mz_stream_write_uint16(zip->stream, 0x0001);
mz_stream_write_uint16(zip->stream, 0);
}
#ifdef HAVE_AES
// Write the AES extended info
if ((err == MZ_OK) && (zip->file_info.flag & 1) && (zip->crypt_info.aes))
if ((err == MZ_OK) && (zip->file_info.flag & MZ_ZIP_FLAG_ENCRYPTED) && (zip->crypt_info.aes))
{
err = mz_stream_write_uint16(zip->stream, 0x9901);
if (err == MZ_OK)
@ -591,14 +608,14 @@ extern int ZEXPORT mz_zip_entry_open(void *handle, const mz_zip_file *file_info,
}
else
{
if (zip->compress_info.method == MZ_METHOD_DEFLATE)
if (zip->compress_info.method == MZ_COMPRESS_METHOD_DEFLATE)
mz_stream_zlib_create(&zip->compress_stream);
#ifdef HAVE_BZIP2
else if (zip->compress_info.method == MZ_METHOD_BZIP2)
else if (zip->compress_info.method == MZ_COMPRESS_METHOD_BZIP2)
mz_stream_bzip_create(&zip->compress_stream);
#endif
#ifdef HAVE_LZMA
else if (zip->compress_info.method == MZ_METHOD_LZMA)
else if (zip->compress_info.method == MZ_COMPRESS_METHOD_LZMA)
mz_stream_lzma_create(&zip->compress_stream);
#endif
else
@ -680,7 +697,7 @@ extern int ZEXPORT mz_zip_entry_close_raw(void *handle, uint64_t uncompressed_si
mz_stream_get_prop_int64(zip->compress_stream, MZ_STREAM_PROP_TOTAL_OUT, &compressed_size);
}
if (zip->file_info.flag & 1)
if (zip->file_info.flag & MZ_ZIP_FLAG_ENCRYPTED)
{
mz_stream_set_base(zip->crypt_stream, zip->stream);
@ -723,7 +740,7 @@ extern int ZEXPORT mz_zip_entry_close_raw(void *handle, uint64_t uncompressed_si
if (zip->file_info.zip64)
{
version_needed = 45;
extrafield_zip64_size += 4;
extrafield_size += 4;
if (uncompressed_size >= UINT32_MAX)
extrafield_zip64_size += 8;
if (compressed_size >= UINT32_MAX)
@ -733,14 +750,14 @@ extern int ZEXPORT mz_zip_entry_close_raw(void *handle, uint64_t uncompressed_si
extrafield_size += extrafield_zip64_size;
}
#ifdef HAVE_AES
if ((zip->file_info.flag & 1) && (zip->crypt_info.aes))
if ((zip->file_info.flag & MZ_ZIP_FLAG_ENCRYPTED) && (zip->crypt_info.aes))
{
version_needed = 51;
extrafield_size += 4 + 7;
}
#endif
#ifdef HAVE_LZMA
if (zip->compress_info.method == MZ_METHOD_LZMA)
if (zip->compress_info.method == MZ_COMPRESS_METHOD_LZMA)
version_needed = 63;
#endif
@ -797,7 +814,7 @@ extern int ZEXPORT mz_zip_entry_close_raw(void *handle, uint64_t uncompressed_si
#ifdef HAVE_AES
// Write AES extra info header to central directory
if ((zip->file_info.flag & 1) && (zip->crypt_info.aes))
if ((zip->file_info.flag & MZ_ZIP_FLAG_ENCRYPTED) && (zip->crypt_info.aes))
{
mz_stream_write_uint16(zip->cd_stream, 0x9901);
mz_stream_write_uint16(zip->cd_stream, 7);

10
mz_zip.h
View File

@ -29,11 +29,11 @@ extern "C" {
/***************************************************************************/
#ifndef MZ_METHOD
# define MZ_METHOD_RAW (0)
# define MZ_METHOD_DEFLATE (8)
# define MZ_METHOD_BZIP2 (12)
# define MZ_METHOD_LZMA (14)
#ifndef MZ_COMPRESS_METHOD
# define MZ_COMPRESS_METHOD_RAW (0)
# define MZ_COMPRESS_METHOD_DEFLATE (8)
# define MZ_COMPRESS_METHOD_BZIP2 (12)
# define MZ_COMPRESS_METHOD_LZMA (14)
#endif
#define MZ_COMPRESS_LEVEL_DEFAULT (-1)