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

Added XZ compression method for libcompression.

Browse Source
This commit is contained in:
Nathan Moinvaziri 2020-10-25 12:27:29 -07:00
parent cda49c2bf1
commit ff7ef66155
3 changed files with 75 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
mz_strm_libcomp.c
View File

@ -46,7 +46,7 @@ typedef struct mz_stream_libcomp_s {
int8_t initialized;
int32_t mode;
int32_t error;
int16_t algorithm;
int16_t method;
} mz_stream_libcomp;
/***************************************************************************/
@ -55,10 +55,11 @@ int32_t mz_stream_libcomp_open(void *stream, const char *path, int32_t mode) {
mz_stream_libcomp *libcomp = (mz_stream_libcomp *)stream;
int32_t err = 0;
int16_t operation = 0;
compression_algorithm algorithm = 0;
MZ_UNUSED(path);
if (libcomp->algorithm == 0)
if (libcomp->method == 0)
return MZ_PARAM_ERROR;
libcomp->total_in = 0;
@ -78,8 +79,12 @@ int32_t mz_stream_libcomp_open(void *stream, const char *path, int32_t mode) {
#endif
}
err = compression_stream_init(&libcomp->cstream, (compression_stream_operation)operation,
(compression_algorithm)libcomp->algorithm);
if (libcomp->method == MZ_COMPRESS_METHOD_DEFLATE)
algorithm = COMPRESSION_ZLIB;
else if (libcomp->method == MZ_COMPRESS_METHOD_XZ)
algorithm = COMPRESSION_LZMA;
err = compression_stream_init(&libcomp->cstream, (compression_stream_operation)operation, algorithm);
if (err == COMPRESSION_STATUS_ERROR) {
libcomp->error = err;
@ -313,7 +318,7 @@ int32_t mz_stream_libcomp_set_prop_int64(void *stream, int32_t prop, int64_t val
mz_stream_libcomp *libcomp = (mz_stream_libcomp *)stream;
switch (prop) {
case MZ_STREAM_PROP_COMPRESS_METHOD:
libcomp->algorithm = (int16_t)value;
libcomp->method = (int16_t)value;
break;
case MZ_STREAM_PROP_TOTAL_IN_MAX:
libcomp->max_total_in = value;
@ -372,7 +377,7 @@ void *mz_stream_zlib_create(void **stream) {
if (stream_int != NULL) {
libcomp = (mz_stream_libcomp *)stream_int;
libcomp->stream.vtbl = &mz_stream_zlib_vtbl;
libcomp->algorithm = COMPRESSION_ZLIB;
libcomp->method = MZ_COMPRESS_METHOD_DEFLATE;
}
if (stream != NULL)
*stream = stream_int;
@ -382,3 +387,38 @@ void *mz_stream_zlib_create(void **stream) {
void *mz_stream_zlib_get_interface(void) {
return (void *)&mz_stream_zlib_vtbl;
}
/***************************************************************************/
static mz_stream_vtbl mz_stream_lzma_vtbl = {
mz_stream_libcomp_open,
mz_stream_libcomp_is_open,
mz_stream_libcomp_read,
mz_stream_libcomp_write,
mz_stream_libcomp_tell,
mz_stream_libcomp_seek,
mz_stream_libcomp_close,
mz_stream_libcomp_error,
mz_stream_lzma_create,
mz_stream_libcomp_delete,
mz_stream_libcomp_get_prop_int64,
mz_stream_libcomp_set_prop_int64
};
void *mz_stream_lzma_create(void **stream) {
mz_stream_libcomp *libcomp = NULL;
void *stream_int = NULL;
mz_stream_libcomp_create(&stream_int);
if (stream_int != NULL) {
libcomp = (mz_stream_libcomp *)stream_int;
libcomp->stream.vtbl = &mz_stream_lzma_vtbl;
libcomp->method = MZ_COMPRESS_METHOD_XZ;
}
if (stream != NULL)
*stream = stream_int;
return stream_int;
}
void *mz_stream_lzma_get_interface(void) {
return (void *)&mz_stream_lzma_vtbl;
}

20
mz_strm_libcomp.h
View File

@ -59,6 +59,26 @@ void* mz_stream_zlib_get_crc32_update(void);
/***************************************************************************/
int32_t mz_stream_lzma_open(void *stream, const char *filename, int32_t mode);
int32_t mz_stream_lzma_is_open(void *stream);
int32_t mz_stream_lzma_read(void *stream, void *buf, int32_t size);
int32_t mz_stream_lzma_write(void *stream, const void *buf, int32_t size);
int64_t mz_stream_lzma_tell(void *stream);
int32_t mz_stream_lzma_seek(void *stream, int64_t offset, int32_t origin);
int32_t mz_stream_lzma_close(void *stream);
int32_t mz_stream_lzma_error(void *stream);
int32_t mz_stream_lzma_get_prop_int64(void *stream, int32_t prop, int64_t *value);
int32_t mz_stream_lzma_set_prop_int64(void *stream, int32_t prop, int64_t value);
void* mz_stream_lzma_create(void **stream);
void mz_stream_lzma_delete(void **stream);
void* mz_stream_lzma_get_interface(void);
void* mz_stream_lzma_get_crc32_update(void);
/***************************************************************************/
#ifdef __cplusplus
}
#endif

11
mz_zip.c
View File

@ -1710,7 +1710,12 @@ static int32_t mz_zip_entry_open_int(void *handle, uint8_t raw, int16_t compress
else if (zip->file_info.compression_method == MZ_COMPRESS_METHOD_LZMA ||
zip->file_info.compression_method == MZ_COMPRESS_METHOD_XZ) {
mz_stream_lzma_create(&zip->compress_stream);
mz_stream_set_prop_int64(zip->compress_stream, MZ_STREAM_PROP_COMPRESS_METHOD, zip->file_info.compression_method);
mz_stream_set_prop_int64(zip->compress_stream, MZ_STREAM_PROP_COMPRESS_METHOD,
zip->file_info.compression_method);
}
#elif defined(HAVE_LIBCOMP)
else if (zip->file_info.compression_method == MZ_COMPRESS_METHOD_XZ) {
mz_stream_lzma_create(&zip->compress_stream);
}
#endif
#ifdef HAVE_ZSTD
@ -1728,7 +1733,9 @@ static int32_t mz_zip_entry_open_int(void *handle, uint8_t raw, int16_t compress
int32_t set_end_of_stream = 0;
#ifndef HAVE_LIBCOMP
if (zip->entry_raw || zip->file_info.compression_method == MZ_COMPRESS_METHOD_STORE || zip->file_info.flag & MZ_ZIP_FLAG_ENCRYPTED)
if (zip->entry_raw ||
zip->file_info.compression_method == MZ_COMPRESS_METHOD_STORE ||
zip->file_info.flag & MZ_ZIP_FLAG_ENCRYPTED)
#endif
{
max_total_in = zip->file_info.compressed_size;