mirror of
https://github.com/zlib-ng/minizip-ng
synced 2025-03-28 21:13:18 +00:00
Merged unzip and zip classes into one zip class and reduce a lot of redundant code between the two.
This commit is contained in:
Nathan Moinvaziri
parent
9781d0aa80
commit
8f67ff9b16
@ -26,7 +26,7 @@
|
||||
#include "mz_os.h"
|
||||
#include "mz_strm.h"
|
||||
#include "mz_strm_split.h"
|
||||
#include "mz_unzip.h"
|
||||
#include "mz_zip.h"
|
||||
|
||||
/***************************************************************************/
|
||||
|
||||
@ -59,7 +59,7 @@ typedef struct miniunz_opt_s {
|
||||
|
||||
int32_t miniunz_list(void *handle)
|
||||
{
|
||||
mz_unzip_file *file_info = NULL;
|
||||
mz_zip_file *file_info = NULL;
|
||||
uint32_t ratio = 0;
|
||||
int16_t level = 0;
|
||||
int16_t err = MZ_OK;
|
||||
@ -68,7 +68,7 @@ int32_t miniunz_list(void *handle)
|
||||
char crypt = ' ';
|
||||
|
||||
|
||||
err = mz_unzip_goto_first_entry(handle);
|
||||
err = mz_zip_goto_first_entry(handle);
|
||||
|
||||
if (err != MZ_OK && err != MZ_END_OF_LIST)
|
||||
{
|
||||
@ -81,7 +81,7 @@ int32_t miniunz_list(void *handle)
|
||||
|
||||
do
|
||||
{
|
||||
err = mz_unzip_entry_get_info(handle, &file_info);
|
||||
err = mz_zip_entry_get_info(handle, &file_info);
|
||||
if (err != MZ_OK)
|
||||
{
|
||||
printf("Error %d getting entry info in zip file\n", err);
|
||||
@ -130,7 +130,7 @@ int32_t miniunz_list(void *handle)
|
||||
(uint32_t)tmu_date.tm_hour, (uint32_t)tmu_date.tm_min,
|
||||
file_info->crc, file_info->filename);
|
||||
|
||||
err = mz_unzip_goto_next_entry(handle);
|
||||
err = mz_zip_goto_next_entry(handle);
|
||||
}
|
||||
while (err == MZ_OK);
|
||||
|
||||
@ -145,7 +145,7 @@ int32_t miniunz_list(void *handle)
|
||||
|
||||
int32_t miniunz_extract_currentfile(void *handle, const char *destination, const char *password, miniunz_opt *options)
|
||||
{
|
||||
mz_unzip_file *file_info = NULL;
|
||||
mz_zip_file *file_info = NULL;
|
||||
uint8_t buf[INT16_MAX];
|
||||
int32_t read = 0;
|
||||
int32_t written = 0;
|
||||
@ -159,7 +159,7 @@ int32_t miniunz_extract_currentfile(void *handle, const char *destination, const
|
||||
char directory[512];
|
||||
|
||||
|
||||
err = mz_unzip_entry_get_info(handle, &file_info);
|
||||
err = mz_zip_entry_get_info(handle, &file_info);
|
||||
|
||||
if (err != MZ_OK)
|
||||
{
|
||||
@ -196,7 +196,7 @@ int32_t miniunz_extract_currentfile(void *handle, const char *destination, const
|
||||
return err;
|
||||
}
|
||||
|
||||
err = mz_unzip_entry_open(handle, 0, password);
|
||||
err = mz_zip_entry_read_open(handle, 0, password);
|
||||
|
||||
if (err != MZ_OK)
|
||||
{
|
||||
@ -260,11 +260,11 @@ int32_t miniunz_extract_currentfile(void *handle, const char *destination, const
|
||||
printf(" Extracting: %s\n", out_path);
|
||||
while (1)
|
||||
{
|
||||
read = mz_unzip_entry_read(handle, buf, sizeof(buf));
|
||||
read = mz_zip_entry_read(handle, buf, sizeof(buf));
|
||||
if (read < 0)
|
||||
{
|
||||
err = read;
|
||||
printf("Error %d reading entry in zip file\n", err);
|
||||
printf("Error %d reading entry in zip file\n", err);
|
||||
break;
|
||||
}
|
||||
if (read == 0)
|
||||
@ -291,7 +291,7 @@ int32_t miniunz_extract_currentfile(void *handle, const char *destination, const
|
||||
|
||||
mz_stream_os_delete(&stream);
|
||||
|
||||
err_close = mz_unzip_entry_close(handle);
|
||||
err_close = mz_zip_entry_close(handle);
|
||||
if (err_close != MZ_OK)
|
||||
printf("Error %d closing entry in zip file\n", err_close);
|
||||
|
||||
@ -303,7 +303,7 @@ int32_t miniunz_extract_all(void *handle, const char *destination, const char *p
|
||||
int16_t err = MZ_OK;
|
||||
|
||||
|
||||
err = mz_unzip_goto_first_entry(handle);
|
||||
err = mz_zip_goto_first_entry(handle);
|
||||
|
||||
if (err != MZ_OK && err != MZ_END_OF_LIST)
|
||||
{
|
||||
@ -318,7 +318,7 @@ int32_t miniunz_extract_all(void *handle, const char *destination, const char *p
|
||||
if (err != MZ_OK)
|
||||
break;
|
||||
|
||||
err = mz_unzip_goto_next_entry(handle);
|
||||
err = mz_zip_goto_next_entry(handle);
|
||||
|
||||
if (err != MZ_OK && err != MZ_END_OF_LIST)
|
||||
{
|
||||
@ -332,7 +332,7 @@ int32_t miniunz_extract_all(void *handle, const char *destination, const char *p
|
||||
|
||||
int32_t miniunz_extract_onefile(void *handle, const char *filename, const char *destination, const char *password, miniunz_opt *options)
|
||||
{
|
||||
if (mz_unzip_locate_entry(handle, filename, NULL) != MZ_OK)
|
||||
if (mz_zip_locate_entry(handle, filename, NULL) != MZ_OK)
|
||||
{
|
||||
printf("File %s not found in the zip file\n", filename);
|
||||
return 2;
|
||||
@ -432,7 +432,7 @@ int main(int argc, const char *argv[])
|
||||
else
|
||||
{
|
||||
// Open zip file
|
||||
handle = mz_unzip_open(split_stream);
|
||||
handle = mz_zip_open(split_stream, MZ_STREAM_MODE_READ);
|
||||
|
||||
if (handle == NULL)
|
||||
{
|
||||
@ -460,7 +460,7 @@ int main(int argc, const char *argv[])
|
||||
err = miniunz_extract_onefile(handle, filename_to_extract, destination, password, &options);
|
||||
}
|
||||
|
||||
mz_unzip_close(handle);
|
||||
mz_zip_close(handle, NULL, NULL);
|
||||
}
|
||||
|
||||
mz_stream_os_close(stream);
|
||||
|
||||
@ -108,12 +108,12 @@ int32_t minizip_add_file(void *handle, const char *path, minizip_opt *options, m
|
||||
file_info.filename = filenameinzip;
|
||||
|
||||
if (mz_file_get_size(path) >= UINT32_MAX)
|
||||
file_info.zip64 = 1;
|
||||
file_info.zip_64 = 1;
|
||||
|
||||
mz_os_get_file_date(path, &file_info.dos_date);
|
||||
|
||||
// Add to zip
|
||||
err = mz_zip_entry_open(handle, &file_info, compress_info, crypt_info);
|
||||
err = mz_zip_entry_write_open(handle, &file_info, compress_info, crypt_info);
|
||||
if (err != MZ_OK)
|
||||
{
|
||||
printf("Error in opening %s in zip file (%d)\n", filenameinzip, err);
|
||||
@ -367,7 +367,7 @@ int main(int argc, char *argv[])
|
||||
}
|
||||
else
|
||||
{
|
||||
handle = mz_zip_open(opt_open_existing, open_stream);
|
||||
handle = mz_zip_open(open_stream, mode);
|
||||
|
||||
if (handle == NULL)
|
||||
{
|
||||
|
||||
9
src/mz.h
9
src/mz.h
@ -56,15 +56,6 @@ extern "C" {
|
||||
MZ_ZIP_FLAG_DEFLATE_MAX)
|
||||
#define MZ_ZIP_FLAG_DATA_DESCRIPTOR (1 << 3)
|
||||
|
||||
// MZ_ZIP_MAGIC
|
||||
#define MZ_ZIP_MAGIC_DISKHEADER (0x08074b50)
|
||||
#define MZ_ZIP_MAGIC_LOCALHEADER (0x04034b50)
|
||||
#define MZ_ZIP_MAGIC_CENTRALHEADER (0x02014b50)
|
||||
#define MZ_ZIP_MAGIC_ENDHEADER (0x06054b50)
|
||||
#define MZ_ZIP_MAGIC_ENDHEADER64 (0x06064b50)
|
||||
#define MZ_ZIP_MAGIC_ENDLOCHEADER64 (0x07064b50)
|
||||
#define MZ_ZIP_MAGIC_DATADESCRIPTOR (0x08074b50)
|
||||
|
||||
// MZ_VERSION
|
||||
#define MZ_VERSION ("2.0.1")
|
||||
|
||||
|
||||
@ -14,12 +14,11 @@
|
||||
#include <stdint.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "mz_error.h"
|
||||
#include "mz.h"
|
||||
#include "mz_os.h"
|
||||
#include "mz_strm.h"
|
||||
#include "mz_strm_zlib.h"
|
||||
#include "mz_zip.h"
|
||||
#include "mz_unzip.h"
|
||||
|
||||
#include "mz_compat.h"
|
||||
|
||||
@ -52,6 +51,7 @@ extern zipFile ZEXPORT zipOpen2_64(const void *path, int append, const char **gl
|
||||
zlib_filefunc64_def *pzlib_filefunc_def)
|
||||
{
|
||||
mz_compat *compat = NULL;
|
||||
mz_zip_global *global_info = NULL;
|
||||
int32_t mode = MZ_STREAM_MODE_READWRITE;
|
||||
int32_t open_existing = 0;
|
||||
int16_t err = MZ_OK;
|
||||
@ -80,7 +80,7 @@ extern zipFile ZEXPORT zipOpen2_64(const void *path, int append, const char **gl
|
||||
return NULL;
|
||||
}
|
||||
|
||||
handle = mz_zip_open(open_existing, stream);
|
||||
handle = mz_zip_open(stream, mode);
|
||||
|
||||
if (handle == NULL)
|
||||
{
|
||||
@ -89,7 +89,10 @@ extern zipFile ZEXPORT zipOpen2_64(const void *path, int append, const char **gl
|
||||
}
|
||||
|
||||
if (globalcomment != NULL)
|
||||
mz_zip_get_global_comment(handle, globalcomment);
|
||||
{
|
||||
mz_zip_get_global_info(handle, &global_info);
|
||||
*globalcomment = global_info->comment;
|
||||
}
|
||||
|
||||
compat = (mz_compat *)malloc(sizeof(mz_compat));
|
||||
compat->handle = handle;
|
||||
@ -117,15 +120,15 @@ extern int ZEXPORT zipOpenNewFileInZip5(zipFile file, const char *filename, cons
|
||||
file_info.internal_fa = zipfi->internal_fa;
|
||||
}
|
||||
|
||||
file_info.filename = filename;
|
||||
file_info.extrafield_local = extrafield_local;
|
||||
file_info.extrafield_local_size = size_extrafield_local;
|
||||
file_info.extrafield_global = extrafield_global;
|
||||
file_info.extrafield_global_size = size_extrafield_global;
|
||||
file_info.filename = (char *)filename;
|
||||
//file_info.extrafield_local = extrafield_local;
|
||||
//file_info.extrafield_local_size = size_extrafield_local;
|
||||
file_info.extrafield = (uint8_t *)extrafield_global;
|
||||
file_info.extrafield_size = size_extrafield_global;
|
||||
file_info.version_madeby = version_madeby;
|
||||
file_info.comment = comment;
|
||||
file_info.comment = (char *)comment;
|
||||
file_info.flag = flag_base;
|
||||
file_info.zip64 = zip64;
|
||||
file_info.zip_64 = zip64;
|
||||
|
||||
mz_zip_compress compress_info;
|
||||
|
||||
@ -141,7 +144,7 @@ extern int ZEXPORT zipOpenNewFileInZip5(zipFile file, const char *filename, cons
|
||||
#endif
|
||||
crypt_info.password = password;
|
||||
|
||||
return mz_zip_entry_open(compat->handle, &file_info, &compress_info, &crypt_info);
|
||||
return mz_zip_entry_write_open(compat->handle, &file_info, &compress_info, &crypt_info);
|
||||
}
|
||||
|
||||
extern int ZEXPORT zipOpenNewFileInZip4_64(zipFile file, const char *filename, const zip_fileinfo *zipfi,
|
||||
@ -277,7 +280,7 @@ extern unzFile ZEXPORT unzOpen2_64(const void *path, zlib_filefunc64_def *pzlib_
|
||||
return NULL;
|
||||
}
|
||||
|
||||
handle = mz_unzip_open(stream);
|
||||
handle = mz_zip_open(stream, mode);
|
||||
|
||||
if (handle == NULL)
|
||||
{
|
||||
@ -300,7 +303,7 @@ extern int ZEXPORT unzClose(unzFile file)
|
||||
if (compat == NULL)
|
||||
return MZ_PARAM_ERROR;
|
||||
|
||||
err = mz_unzip_close(compat->handle);
|
||||
err = mz_zip_close(compat->handle, NULL, 0);
|
||||
|
||||
if (compat->stream != NULL)
|
||||
mz_stream_delete(&compat->stream);
|
||||
@ -332,17 +335,17 @@ extern int ZEXPORT unzGetGlobalInfo(unzFile file, unz_global_info* pglobal_info3
|
||||
extern int ZEXPORT unzGetGlobalInfo64(unzFile file, unz_global_info64 *pglobal_info)
|
||||
{
|
||||
mz_compat *compat = (mz_compat *)file;
|
||||
mz_unzip_global global_info;
|
||||
mz_zip_global *global_info = NULL;
|
||||
int16_t err = MZ_OK;
|
||||
|
||||
if (compat == NULL)
|
||||
return MZ_PARAM_ERROR;
|
||||
err = mz_unzip_get_global_info(compat->handle, &global_info);
|
||||
err = mz_zip_get_global_info(compat->handle, &global_info);
|
||||
if (err == MZ_OK)
|
||||
{
|
||||
pglobal_info->size_comment = global_info.comment_size;
|
||||
pglobal_info->number_entry = global_info.number_entry;
|
||||
pglobal_info->number_disk_with_CD = global_info.number_disk_with_CD;
|
||||
pglobal_info->size_comment = global_info->comment_size;
|
||||
pglobal_info->number_entry = global_info->number_entry;
|
||||
pglobal_info->number_disk_with_CD = global_info->number_disk_with_cd;
|
||||
}
|
||||
return err;
|
||||
}
|
||||
@ -350,9 +353,15 @@ extern int ZEXPORT unzGetGlobalInfo64(unzFile file, unz_global_info64 *pglobal_i
|
||||
extern int ZEXPORT unzGetGlobalComment(unzFile file, char *comment, uint16_t comment_size)
|
||||
{
|
||||
mz_compat *compat = (mz_compat *)file;
|
||||
if (compat == NULL)
|
||||
mz_zip_global *global_info = NULL;
|
||||
int16_t err = MZ_OK;
|
||||
|
||||
if (comment == NULL || comment_size == 0)
|
||||
return MZ_PARAM_ERROR;
|
||||
return mz_unzip_get_global_comment(compat->handle, comment, comment_size);
|
||||
err = mz_zip_get_global_info(compat->handle, &global_info);
|
||||
if (err == MZ_OK)
|
||||
strncpy(comment, global_info->comment, comment_size);
|
||||
return err;
|
||||
}
|
||||
|
||||
extern int ZEXPORT unzOpenCurrentFile3(unzFile file, int *method, int *level, int raw, const char *password)
|
||||
@ -364,7 +373,7 @@ extern int ZEXPORT unzOpenCurrentFile3(unzFile file, int *method, int *level, in
|
||||
*method = 0;
|
||||
if (level != NULL)
|
||||
*level = 0;
|
||||
return mz_unzip_entry_open(compat->handle, raw, password);
|
||||
return mz_zip_entry_read_open(compat->handle, raw, password);
|
||||
}
|
||||
|
||||
extern int ZEXPORT unzOpenCurrentFile(unzFile file)
|
||||
@ -387,7 +396,7 @@ extern int ZEXPORT unzReadCurrentFile(unzFile file, voidp buf, uint32_t len)
|
||||
mz_compat *compat = (mz_compat *)file;
|
||||
if (compat == NULL)
|
||||
return MZ_PARAM_ERROR;
|
||||
return mz_unzip_entry_read(compat->handle, buf, len);
|
||||
return mz_zip_entry_read(compat->handle, buf, len);
|
||||
}
|
||||
|
||||
extern int ZEXPORT unzCloseCurrentFile(unzFile file)
|
||||
@ -395,24 +404,24 @@ extern int ZEXPORT unzCloseCurrentFile(unzFile file)
|
||||
mz_compat *compat = (mz_compat *)file;
|
||||
if (compat == NULL)
|
||||
return MZ_PARAM_ERROR;
|
||||
return mz_unzip_entry_close(compat->handle);
|
||||
return mz_zip_entry_close(compat->handle);
|
||||
}
|
||||
|
||||
extern int ZEXPORT unzGetCurrentFileInfo(unzFile file, unz_file_info *pfile_info, char *filename,
|
||||
uint16_t filename_size, void *extrafield, uint16_t extrafield_size, char *comment, uint16_t comment_size)
|
||||
{
|
||||
mz_compat *compat = (mz_compat *)file;
|
||||
mz_unzip_file *file_info = NULL;
|
||||
mz_zip_file *file_info = NULL;
|
||||
int16_t bytes_to_copy = 0;
|
||||
int16_t err = MZ_OK;
|
||||
|
||||
if (compat == NULL)
|
||||
return MZ_PARAM_ERROR;
|
||||
err = mz_unzip_entry_get_info(compat->handle, &file_info);
|
||||
err = mz_zip_entry_get_info(compat->handle, &file_info);
|
||||
|
||||
if ((err == MZ_OK) && (pfile_info != NULL))
|
||||
{
|
||||
pfile_info->version = file_info->version;
|
||||
pfile_info->version = file_info->version_madeby;
|
||||
pfile_info->version_needed = file_info->version_needed;
|
||||
pfile_info->flag = file_info->flag;
|
||||
pfile_info->compression_method = file_info->compression_method;
|
||||
@ -459,18 +468,18 @@ extern int ZEXPORT unzGetCurrentFileInfo64(unzFile file, unz_file_info64 * pfile
|
||||
uint16_t filename_size, void *extrafield, uint16_t extrafield_size, char *comment, uint16_t comment_size)
|
||||
{
|
||||
mz_compat *compat = (mz_compat *)file;
|
||||
mz_unzip_file *file_info = NULL;
|
||||
mz_zip_file *file_info = NULL;
|
||||
int16_t bytes_to_copy = 0;
|
||||
int16_t err = MZ_OK;
|
||||
|
||||
if (compat == NULL)
|
||||
return MZ_PARAM_ERROR;
|
||||
|
||||
err = mz_unzip_entry_get_info(compat->handle, &file_info);
|
||||
err = mz_zip_entry_get_info(compat->handle, &file_info);
|
||||
|
||||
if ((err == MZ_OK) && (pfile_info != NULL))
|
||||
{
|
||||
pfile_info->version = file_info->version;
|
||||
pfile_info->version = file_info->version_madeby;
|
||||
pfile_info->version_needed = file_info->version_needed;
|
||||
pfile_info->flag = file_info->flag;
|
||||
pfile_info->compression_method = file_info->compression_method;
|
||||
@ -518,7 +527,7 @@ extern int ZEXPORT unzGoToFirstFile(unzFile file)
|
||||
mz_compat *compat = (mz_compat *)file;
|
||||
if (compat == NULL)
|
||||
return MZ_PARAM_ERROR;
|
||||
return mz_unzip_goto_first_entry(compat->handle);
|
||||
return mz_zip_goto_first_entry(compat->handle);
|
||||
}
|
||||
|
||||
extern int ZEXPORT unzGoToNextFile(unzFile file)
|
||||
@ -526,7 +535,7 @@ extern int ZEXPORT unzGoToNextFile(unzFile file)
|
||||
mz_compat *compat = (mz_compat *)file;
|
||||
if (compat == NULL)
|
||||
return MZ_PARAM_ERROR;
|
||||
return mz_unzip_goto_next_entry(compat->handle);
|
||||
return mz_zip_goto_next_entry(compat->handle);
|
||||
}
|
||||
|
||||
extern int ZEXPORT unzLocateFile(unzFile file, const char *filename, unzFileNameComparer filename_compare_func)
|
||||
@ -534,7 +543,7 @@ extern int ZEXPORT unzLocateFile(unzFile file, const char *filename, unzFileName
|
||||
mz_compat *compat = (mz_compat *)file;
|
||||
if (compat == NULL)
|
||||
return MZ_PARAM_ERROR;
|
||||
return mz_unzip_locate_entry(compat->handle, filename, filename_compare_func);
|
||||
return mz_zip_locate_entry(compat->handle, filename, filename_compare_func);
|
||||
}
|
||||
|
||||
/***************************************************************************/
|
||||
|
||||
1036
src/mz_unzip.c
1036
src/mz_unzip.c
File diff suppressed because it is too large
Load Diff
136
src/mz_unzip.h
136
src/mz_unzip.h
@ -1,136 +0,0 @@
|
||||
/* mz_unzip.h -- Zip manipulation
|
||||
Version 2.0.1, October 16th, 2017
|
||||
part of the MiniZip project
|
||||
|
||||
Copyright (C) 2012-2017 Nathan Moinvaziri
|
||||
https://github.com/nmoinvaz/minizip
|
||||
Copyright (C) 2009-2010 Mathias Svensson
|
||||
Modifications for Zip64 support on both zip and unzip
|
||||
http://result42.com
|
||||
Copyright (C) 2007-2008 Even Rouault
|
||||
Modifications of Unzip for Zip64
|
||||
Copyright (C) 1998-2010 Gilles Vollant
|
||||
http://www.winimage.com/zLibDll/minizip.html
|
||||
|
||||
This program is distributed under the terms of the same license as zlib.
|
||||
See the accompanying LICENSE file for the full text of the license.
|
||||
*/
|
||||
|
||||
#ifndef _MZ_UNZIP_H
|
||||
#define _MZ_UNZIP_H
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
#ifndef _ZLIB_H
|
||||
#include "zlib.h"
|
||||
#endif
|
||||
|
||||
#include "mz_strm.h"
|
||||
|
||||
/***************************************************************************/
|
||||
|
||||
// Global data about the zip file that come from the end of central dir
|
||||
typedef struct mz_unzip_global_s
|
||||
{
|
||||
uint64_t number_entry; // total number of entries in the central dir on this disk
|
||||
uint32_t number_disk_with_CD; // number the the disk with central dir, used for spanning ZIP
|
||||
uint16_t comment_size; // size of the global comment of the zip file
|
||||
} mz_unzip_global;
|
||||
|
||||
// Info about a file in the zip file at the central directory
|
||||
typedef struct mz_unzip_file_s
|
||||
{
|
||||
uint16_t version; // version made by 2 bytes
|
||||
uint16_t version_needed; // version needed to extract 2 bytes
|
||||
uint16_t flag; // general purpose bit flag 2 bytes
|
||||
uint16_t compression_method; // compression method 2 bytes
|
||||
uint32_t dos_date; // last mod file date in Dos fmt 4 bytes
|
||||
uint32_t crc; // crc-32 4 bytes
|
||||
uint64_t compressed_size; // compressed size 8 bytes
|
||||
uint64_t uncompressed_size; // uncompressed size 8 bytes
|
||||
uint16_t filename_size; // filename length 2 bytes
|
||||
uint16_t extrafield_size; // extra field length 2 bytes
|
||||
uint16_t comment_size; // file comment length 2 bytes
|
||||
|
||||
uint32_t disk_num_start; // disk number start 4 bytes
|
||||
uint16_t internal_fa; // internal file attributes 2 bytes
|
||||
uint32_t external_fa; // external file attributes 4 bytes
|
||||
|
||||
uint64_t disk_offset; // relative offset of local header 8 bytes
|
||||
|
||||
char *filename; // filename string
|
||||
uint8_t *extrafield; // extrafield data
|
||||
char *comment; // comment string
|
||||
} mz_unzip_file;
|
||||
|
||||
/***************************************************************************/
|
||||
// Opening and close a zip file
|
||||
|
||||
extern void* ZEXPORT mz_unzip_open(void *stream);
|
||||
// Open a zip file
|
||||
|
||||
extern int ZEXPORT mz_unzip_close(void *handle);
|
||||
// Close a zip file
|
||||
|
||||
extern int ZEXPORT mz_unzip_get_global_info(void *handle, mz_unzip_global *global_info);
|
||||
// Get global info about the zip file
|
||||
|
||||
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
|
||||
|
||||
extern int ZEXPORT mz_unzip_entry_open(void *handle, int raw, const char *password);
|
||||
// Open for reading data the current file in the zip file
|
||||
|
||||
extern int ZEXPORT mz_unzip_entry_read(void *handle, void *buf, uint32_t len);
|
||||
// Read bytes from the current file
|
||||
|
||||
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
|
||||
//
|
||||
// This is the local-header version of the extra field (sometimes, there is
|
||||
// more info in the local-header version than in the central-header)
|
||||
//
|
||||
// if buf == NULL, it return the size of the local extra field
|
||||
// if buf != NULL, len is the size of the buffer, the extra header is copied in buf.
|
||||
//
|
||||
// return number of bytes copied in buf, or (if <0) the error code
|
||||
|
||||
extern int ZEXPORT mz_unzip_entry_close(void *handle);
|
||||
// Close the file in zip
|
||||
|
||||
/***************************************************************************/
|
||||
// Navigate the directory of the zip file
|
||||
|
||||
typedef int (*mz_filename_compare_cb)(void *handle, const char *filename1, const char *filename2);
|
||||
|
||||
extern int ZEXPORT mz_unzip_locate_entry(void *file, const char *filename, mz_filename_compare_cb filename_compare_cb);
|
||||
// Locate the file with the specified name in the zip file
|
||||
//
|
||||
// if filename_compare_cb == NULL, it uses strcmp
|
||||
//
|
||||
// return MZ_OK if the file is found (it becomes the current file)
|
||||
// return MZ_END_OF_LIST if the file is not found
|
||||
|
||||
extern int ZEXPORT mz_unzip_goto_first_entry(void *handle);
|
||||
// Go to the first entry in the zip file
|
||||
|
||||
extern int ZEXPORT mz_unzip_goto_next_entry(void *handle);
|
||||
// Go to the next entry in the zip file or MZ_END_OF_LIST if reaching the end
|
||||
|
||||
/***************************************************************************/
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif /* _UNZ_H */
|
||||
1795
src/mz_zip.c
1795
src/mz_zip.c
File diff suppressed because it is too large
Load Diff
97
src/mz_zip.h
97
src/mz_zip.h
@ -29,20 +29,44 @@ extern "C" {
|
||||
|
||||
/***************************************************************************/
|
||||
|
||||
typedef struct mz_zip_global_s
|
||||
{
|
||||
uint64_t number_entry; // total number of entries in the central dir on this disk
|
||||
uint32_t number_disk_with_cd; // number the the disk with central dir, used for spanning ZIP
|
||||
uint16_t comment_size; // size of the global comment of the zip file
|
||||
uint8_t *comment;
|
||||
} mz_zip_global;
|
||||
|
||||
typedef struct mz_zip_file_s
|
||||
{
|
||||
uint32_t dos_date; // ms-dos date and time
|
||||
uint16_t internal_fa; // internal file attributes
|
||||
uint32_t external_fa; // external file attributes
|
||||
const uint8_t *extrafield_local; // extra fields in local header
|
||||
uint16_t extrafield_local_size; // size of additional extra fields in local header
|
||||
const uint8_t *extrafield_global; // extra fields in global header
|
||||
uint16_t extrafield_global_size; // size of extra fields in global header
|
||||
uint16_t version_madeby; // version made by
|
||||
const char *comment; // file comment
|
||||
const char *filename; // filename
|
||||
uint8_t zip64; // enable zip64 extensions if 1
|
||||
uint16_t flag; // base flag value
|
||||
uint16_t version_madeby; // version made by 2 bytes
|
||||
uint16_t version_needed; // version needed to extract 2 bytes
|
||||
uint16_t flag; // general purpose bit flag 2 bytes
|
||||
uint16_t compression_method; // compression method 2 bytes
|
||||
uint32_t dos_date; // last mod file date in Dos fmt 4 bytes
|
||||
uint32_t crc; // crc-32 4 bytes
|
||||
uint64_t compressed_size; // compressed size 8 bytes
|
||||
uint64_t uncompressed_size; // uncompressed size 8 bytes
|
||||
uint16_t filename_size; // filename length 2 bytes
|
||||
uint16_t extrafield_size; // extra field length 2 bytes
|
||||
uint16_t comment_size; // file comment length 2 bytes
|
||||
|
||||
uint32_t disk_num_start; // disk number start 4 bytes
|
||||
uint16_t internal_fa; // internal file attributes 2 bytes
|
||||
uint32_t external_fa; // external file attributes 4 bytes
|
||||
|
||||
uint64_t disk_offset; // relative offset of local header 8 bytes
|
||||
|
||||
char *filename; // filename string
|
||||
uint8_t *extrafield; // extrafield data
|
||||
char *comment; // comment string
|
||||
|
||||
uint8_t zip_64; // zip 64 extensions if 1
|
||||
|
||||
#ifdef HAVE_AES
|
||||
uint16_t aes_version;
|
||||
uint8_t aes_encryption_mode;
|
||||
#endif
|
||||
} mz_zip_file;
|
||||
|
||||
typedef struct mz_zip_compress_s
|
||||
@ -58,29 +82,45 @@ typedef struct mz_zip_crypt_s
|
||||
{
|
||||
const char *password; // encryption password
|
||||
#if defined(HAVE_AES)
|
||||
uint8_t aes; // enable winzip aes encryption if 1
|
||||
uint8_t aes; // winzip aes encryption if 1
|
||||
#endif
|
||||
} mz_zip_crypt;
|
||||
|
||||
/***************************************************************************/
|
||||
|
||||
extern void* ZEXPORT mz_zip_open(uint8_t open_existing, void *stream);
|
||||
extern void* ZEXPORT mz_zip_open(void *stream, int32_t mode);
|
||||
// Create a zip file
|
||||
//
|
||||
// NOTE: There is no delete function into a zip file. If you want delete file in a zip file,
|
||||
// you must open a zip file, and create another. You can use RAW reading and writing to copy
|
||||
// the file you did not want delete.
|
||||
|
||||
extern int ZEXPORT mz_zip_get_global_comment(void *handle, const char **global_comment);
|
||||
// Gets the global comments if opening an existing zip
|
||||
extern int ZEXPORT mz_zip_get_global_info(void *handle, mz_zip_global **global_info);
|
||||
// Gets the global zip file info
|
||||
|
||||
extern int ZEXPORT mz_zip_entry_open(void *handle, const mz_zip_file *file_info,
|
||||
extern int ZEXPORT mz_zip_entry_get_info(void *handle, mz_zip_file **file_info);
|
||||
// Get info about the current file
|
||||
//
|
||||
// NOTE: The file info is only valid while the current entry is open
|
||||
|
||||
extern int ZEXPORT mz_zip_entry_get_local_info(void *handle, mz_zip_file **local_file_info);
|
||||
// Get local info about the current file
|
||||
//
|
||||
// NOTE: The local file info is only valid while the current entry is being read
|
||||
|
||||
extern int ZEXPORT mz_zip_entry_write_open(void *handle, const mz_zip_file *file_info,
|
||||
const mz_zip_compress *compress_info, const mz_zip_crypt *crypt_info);
|
||||
// Open a file in the ZIP for writing
|
||||
// Open a file in the zip for writing
|
||||
|
||||
extern int ZEXPORT mz_zip_entry_write(void *handle, const void *buf, uint32_t len);
|
||||
// Write data in the zip file
|
||||
|
||||
extern int ZEXPORT mz_zip_entry_read_open(void *handle, int raw, const char *password);
|
||||
// Open for reading data the current file in the zip file
|
||||
|
||||
extern int ZEXPORT mz_zip_entry_read(void *handle, void *buf, uint32_t len);
|
||||
// Read bytes from the current file
|
||||
|
||||
extern int ZEXPORT mz_zip_entry_close(void *handle);
|
||||
// Close the current file in the zip file
|
||||
|
||||
@ -89,6 +129,27 @@ extern int ZEXPORT mz_zip_entry_close_raw(void *handle, uint64_t uncompressed_si
|
||||
|
||||
extern int ZEXPORT mz_zip_close(void *handle, const char *global_comment, uint16_t version_madeby);
|
||||
// Close the zip file
|
||||
//
|
||||
// NOTE: global_comment and version_madeby are only used when the zip file is open for writing
|
||||
|
||||
/***************************************************************************/
|
||||
// Navigate the directory of the zip file
|
||||
|
||||
typedef int(*mz_filename_compare_cb)(void *handle, const char *filename1, const char *filename2);
|
||||
|
||||
extern int ZEXPORT mz_zip_locate_entry(void *file, const char *filename, mz_filename_compare_cb filename_compare_cb);
|
||||
// Locate the file with the specified name in the zip file
|
||||
//
|
||||
// if filename_compare_cb == NULL, it uses strcmp
|
||||
//
|
||||
// return MZ_OK if the file is found (it becomes the current file)
|
||||
// return MZ_END_OF_LIST if the file is not found
|
||||
|
||||
extern int ZEXPORT mz_zip_goto_first_entry(void *handle);
|
||||
// Go to the first entry in the zip file
|
||||
|
||||
extern int ZEXPORT mz_zip_goto_next_entry(void *handle);
|
||||
// Go to the next entry in the zip file or MZ_END_OF_LIST if reaching the end
|
||||
|
||||
/***************************************************************************/
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user