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

Version 2.3.8.

Browse Source
This commit is contained in:
Nathan Moinvaziri 2018-07-14 09:53:56 -07:00
parent 4bdb436e8e
commit ae724eff61
39 changed files with 128 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -32,7 +32,7 @@ set(INSTALL_MAN_DIR ${CMAKE_INSTALL_MANDIR} CACHE PATH "Installation directory f
set(INSTALL_PKGCONFIG_DIR ${CMAKE_INSTALL_LIBDIR}/pkgconfig CACHE PATH "Installation directory for pkgconfig (.pc) files")
set(INSTALL_CMAKE_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/minizip CACHE PATH "Installation directory for cmake files.")
set(VERSION "2.3.7")
set(VERSION "2.3.8")
# Set cmake debug postfix to d
set(CMAKE_DEBUG_POSTFIX "d")

2
Minizip.podspec
View File

@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'Minizip'
s.version = '2.3.7'
s.version = '2.3.8'
s.license = 'zlib'
s.summary = 'Minizip contrib in zlib with the latest bug fixes and advanced features'
s.description = <<-DESC

2
README.md
View File

@ -1,4 +1,4 @@
# Minizip 2.3.7
# Minizip 2.3.8
This library is a refactoring of the minizip contribution found in the zlib distribution and is supported on Windows, macOS, and Linux. The motivation for this work has been the inclusion of advanced features, improvements in code maintainability and readability, and the reduction of duplicate code. It is based on the original work of [Gilles Vollant](http://www.winimage.com/zLibDll/minizip.html) that has been contributed to by many people over the years.

91
minizip.c
View File

@ -1,5 +1,5 @@
/* minizip.c
Version 2.3.7, July 13, 2018
Version 2.3.8, July 14, 2018
part of the MiniZip project
Copyright (C) 2010-2018 Nathan Moinvaziri
@ -533,7 +533,7 @@ int32_t minizip_extract_onefile(void *handle, const char *filename, const char *
/***************************************************************************/
#ifndef NOMAIN
#if 0
int main(int argc, char *argv[])
{
void *handle = NULL;
@ -760,3 +760,90 @@ int main(int argc, char *argv[])
return err;
}
#endif
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
#include "mz.h"
#include "mz_zip.h"
#include "mz_compat.h"
static void myextract(const char * zip, const char * fn)
{
unz_file_info64 ufi;
unzFile hUnzip;
void * buffer;
int iRead;
int found;
printf("uopen : %p\n", (void *)(hUnzip = unzOpen2_64(zip, NULL)));
// find requested file
printf("ufi1st: %d\n", unzGoToFirstFile(hUnzip));
found = 0;
for (;;)
{
char fnz[256];
printf("ufinfo: %d\n", unzGetCurrentFileInfo64(hUnzip, &ufi, (char *)&fnz, sizeof(fnz) - 1, NULL, 0, NULL, 0));
if (strcmp(fnz, fn) == 0)
{
printf("FOUND!: %s\n", fn);
printf("uoffst: %lld\n", unzGetOffset64(hUnzip));
printf("ufopen: %d\n", unzOpenCurrentFile3(hUnzip, NULL, NULL, 0, NULL));
buffer = malloc(ufi.uncompressed_size);
printf("uread : %d\n", iRead = unzReadCurrentFile(hUnzip, buffer, ufi.uncompressed_size));
printf("READ : %s\n", buffer); /* WITH ZIP64, IT'S RETURNING THE CONTENT OF THE FIRST FILE WHILE POSITIONED ON THE 2ND */
free(buffer);
printf("ufclos: %d\n", unzCloseCurrentFile(hUnzip));
found = 1;
break;
}
printf("ufinxt: %d\n", unzGoToNextFile(hUnzip));
}
if (found == 0)
printf("not found: %s\n", fn);
printf("uclose: %d\n", unzClose(hUnzip));
}
int main(void)
{
int zip64;
// create two .zip files, one regular and one with ZIP64 enabled, with two file entries each
/*for (zip64 = 0; zip64 <= 1; zip64++)
{
static const unsigned char content1[] = "11.txt-first file";
static const unsigned char content2[] = "22.txt-second file";
zipFile hZip;
zip_fileinfo zfi;
printf("zcreat: %p\n", (void *)(hZip = zipOpen2_64(zip64 ? "test_64.zip" : "test_32.zip", APPEND_STATUS_CREATE, NULL, NULL)));
memset(&zfi, 0, sizeof(zfi));
printf("zaddfi: %d\n", zipOpenNewFileInZip4_64(hZip, "11.txt", &zfi, NULL, 0, NULL, 0, NULL,
MZ_COMPRESS_METHOD_DEFLATE, 6, 0,
-MAX_WBITS, 8, 0,
NULL, 0xD7681E40,
0, 0, zip64));
printf("zwrite: %d\n", zipWriteInFileInZip(hZip, content1, sizeof(content1)));
printf("zfclos: %d\n", zipCloseFileInZip(hZip));
printf("zaddfi: %d\n", zipOpenNewFileInZip4_64(hZip, "22.txt", &zfi, NULL, 0, NULL, 0, NULL,
MZ_COMPRESS_METHOD_DEFLATE, 6, 0,
-MAX_WBITS, 8, 0,
NULL, 0x7A416084,
0, 0, zip64));
printf("zwrite: %d\n", zipWriteInFileInZip(hZip, content2, sizeof(content2)));
printf("zfclos: %d\n", zipCloseFileInZip(hZip));
printf("zclose: %d\n", zipClose(hZip, NULL));
}*/
// try extracting the last (= second) file from each .zip
//myextract("test_32.zip", "22.txt");
myextract("test_64.zip", "22.txt");
return 0;
}

4
mz.h
View File

@ -1,5 +1,5 @@
/* mz.h -- Errors codes, zip flags and magic
Version 2.3.7, July 13, 2018
Version 2.3.8, July 14, 2018
part of the MiniZip project
Copyright (C) 2010-2018 Nathan Moinvaziri
@ -19,7 +19,7 @@ extern "C" {
/***************************************************************************/
// MZ_VERSION
#define MZ_VERSION ("2.3.7")
#define MZ_VERSION ("2.3.8")
// MZ_ERROR
#define MZ_OK (0)

2
mz_compat.c
View File

@ -1,5 +1,5 @@
/* mz_compat.c -- Backwards compatible interface for older versions
Version 2.3.7, July 13, 2018
Version 2.3.8, July 14, 2018
part of the MiniZip project
Copyright (C) 2010-2018 Nathan Moinvaziri

2
mz_compat.h
View File

@ -1,5 +1,5 @@
/* mz_compat.h -- Backwards compatible interface for older versions
Version 2.3.7, July 13, 2018
Version 2.3.8, July 14, 2018
part of the MiniZip project
Copyright (C) 2010-2018 Nathan Moinvaziri

2
mz_os.c
View File

@ -1,5 +1,5 @@
/* mz_os.c -- System functions
Version 2.3.7, July 13, 2018
Version 2.3.8, July 14, 2018
part of the MiniZip project
Copyright (C) 2010-2018 Nathan Moinvaziri

2
mz_os.h
View File

@ -1,5 +1,5 @@
/* mz_os.h -- System functions
Version 2.3.7, July 13, 2018
Version 2.3.8, July 14, 2018
part of the MiniZip project
Copyright (C) 2010-2018 Nathan Moinvaziri

2
mz_os_posix.c
View File

@ -1,5 +1,5 @@
/* mz_os_posix.c -- System functions for posix
Version 2.3.7, July 13, 2018
Version 2.3.8, July 14, 2018
part of the MiniZip project
Copyright (C) 2010-2018 Nathan Moinvaziri

2
mz_os_posix.h
View File

@ -1,5 +1,5 @@
/* mz_os_posix.h -- System functions for posix
Version 2.3.7, July 13, 2018
Version 2.3.8, July 14, 2018
part of the MiniZip project
Copyright (C) 2010-2018 Nathan Moinvaziri

2
mz_os_win32.c
View File

@ -1,5 +1,5 @@
/* mz_os_win32.c -- System functions for Windows
Version 2.3.7, July 13, 2018
Version 2.3.8, July 14, 2018
part of the MiniZip project
Copyright (C) 2010-2018 Nathan Moinvaziri

2
mz_os_win32.h
View File

@ -1,5 +1,5 @@
/* mz_os_win32.h -- System functions for Windows
Version 2.3.7, July 13, 2018
Version 2.3.8, July 14, 2018
part of the MiniZip project
Copyright (C) 2010-2018 Nathan Moinvaziri

2
mz_strm.c
View File

@ -1,5 +1,5 @@
/* mz_strm.c -- Stream interface
Version 2.3.7, July 13, 2018
Version 2.3.8, July 14, 2018
part of the MiniZip project
Copyright (C) 2010-2018 Nathan Moinvaziri

2
mz_strm.h
View File

@ -1,5 +1,5 @@
/* mz_strm.h -- Stream interface
Version 2.3.7, July 13, 2018
Version 2.3.8, July 14, 2018
part of the MiniZip project
Copyright (C) 2010-2018 Nathan Moinvaziri

2
mz_strm_aes.c
View File

@ -1,5 +1,5 @@
/* mz_strm_aes.c -- Stream for WinZip AES encryption
Version 2.3.7, July 13, 2018
Version 2.3.8, July 14, 2018
part of the MiniZip project
Copyright (C) 2010-2018 Nathan Moinvaziri

2
mz_strm_aes.h
View File

@ -1,5 +1,5 @@
/* mz_strm_aes.h -- Stream for WinZIP AES encryption
Version 2.3.7, July 13, 2018
Version 2.3.8, July 14, 2018
part of the MiniZip project
Copyright (C) 2010-2018 Nathan Moinvaziri

2
mz_strm_buf.c
View File

@ -1,5 +1,5 @@
/* mz_strm_buf.c -- Stream for buffering reads/writes
Version 2.3.7, July 13, 2018
Version 2.3.8, July 14, 2018
part of the MiniZip project
This version of ioapi is designed to buffer IO.

2
mz_strm_buf.h
View File

@ -1,5 +1,5 @@
/* mz_strm_buf.h -- Stream for buffering reads/writes
Version 2.3.7, July 13, 2018
Version 2.3.8, July 14, 2018
part of the MiniZip project
This version of ioapi is designed to buffer IO.

2
mz_strm_bzip.c
View File

@ -1,5 +1,5 @@
/* mz_strm_bzip.c -- Stream for bzip inflate/deflate
Version 2.3.7, July 13, 2018
Version 2.3.8, July 14, 2018
part of the MiniZip project
Copyright (C) 2010-2018 Nathan Moinvaziri

2
mz_strm_bzip.h
View File

@ -1,5 +1,5 @@
/* mz_strm_bzip.h -- Stream for bzip inflate/deflate
Version 2.3.7, July 13, 2018
Version 2.3.8, July 14, 2018
part of the MiniZip project
Copyright (C) 2010-2018 Nathan Moinvaziri

2
mz_strm_crc32.c
View File

@ -1,5 +1,5 @@
/* mz_strm_crc32.c -- Stream for CRC32 hashing
Version 2.3.7, July 13, 2018
Version 2.3.8, July 14, 2018
part of the MiniZip project
Copyright (C) 2010-2018 Nathan Moinvaziri

2
mz_strm_crc32.h
View File

@ -1,5 +1,5 @@
/* mz_strm_crc32.h -- Stream for CRC32 hashing
Version 2.3.7, July 13, 2018
Version 2.3.8, July 14, 2018
part of the MiniZip project
Copyright (C) 2010-2018 Nathan Moinvaziri

2
mz_strm_lzma.c
View File

@ -1,5 +1,5 @@
/* mz_strm_lzma.c -- Stream for lzma inflate/deflate
Version 2.3.7, July 13, 2018
Version 2.3.8, July 14, 2018
part of the MiniZip project
Copyright (C) 2010-2018 Nathan Moinvaziri

2
mz_strm_lzma.h
View File

@ -1,5 +1,5 @@
/* mz_strm_lzma.h -- Stream for lzma inflate/deflate
Version 2.3.7, July 13, 2018
Version 2.3.8, July 14, 2018
part of the MiniZip project
Copyright (C) 2010-2018 Nathan Moinvaziri

2
mz_strm_mem.c
View File

@ -1,5 +1,5 @@
/* mz_strm_mem.c -- Stream for memory access
Version 2.3.7, July 13, 2018
Version 2.3.8, July 14, 2018
part of the MiniZip project
This interface is designed to access memory rather than files.

2
mz_strm_mem.h
View File

@ -1,5 +1,5 @@
/* mz_strm_mem.h -- Stream for memory access
Version 2.3.7, July 13, 2018
Version 2.3.8, July 14, 2018
part of MiniZip project
Copyright (C) 2010-2018 Nathan Moinvaziri

2
mz_strm_pkcrypt.c
View File

@ -1,5 +1,5 @@
/* mz_strm_pkcrypt.c -- Code for traditional PKWARE encryption
Version 2.3.7, July 13, 2018
Version 2.3.8, July 14, 2018
part of the MiniZip project
Copyright (C) 2010-2018 Nathan Moinvaziri

2
mz_strm_pkcrypt.h
View File

@ -1,5 +1,5 @@
/* mz_strm_pkcrypt.h -- Code for traditional PKWARE encryption
Version 2.3.7, July 13, 2018
Version 2.3.8, July 14, 2018
part of the MiniZip project
Copyright (C) 2010-2018 Nathan Moinvaziri

2
mz_strm_posix.c
View File

@ -1,5 +1,5 @@
/* mz_strm_posix.c -- Stream for filesystem access for posix/linux
Version 2.3.7, July 13, 2018
Version 2.3.8, July 14, 2018
part of the MiniZip project
Copyright (C) 2010-2018 Nathan Moinvaziri

2
mz_strm_posix.h
View File

@ -1,5 +1,5 @@
/* mz_strm_posix.h -- Stream for filesystem access for posix/linux
Version 2.3.7, July 13, 2018
Version 2.3.8, July 14, 2018
part of the MiniZip project
Copyright (C) 2010-2018 Nathan Moinvaziri

2
mz_strm_split.c
View File

@ -1,5 +1,5 @@
/* mz_strm_split.c -- Stream for split files
Version 2.3.7, July 13, 2018
Version 2.3.8, July 14, 2018
part of the MiniZip project
Copyright (C) 2010-2018 Nathan Moinvaziri

2
mz_strm_split.h
View File

@ -1,5 +1,5 @@
/* mz_strm_split.h -- Stream for split files
Version 2.3.7, July 13, 2018
Version 2.3.8, July 14, 2018
part of MiniZip project
Copyright (C) 2010-2018 Nathan Moinvaziri

2
mz_strm_win32.c
View File

@ -1,5 +1,5 @@
/* mz_strm_win32.c -- Stream for filesystem access for windows
Version 2.3.7, July 13, 2018
Version 2.3.8, July 14, 2018
part of the MiniZip project
Copyright (C) 2010-2018 Nathan Moinvaziri

2
mz_strm_win32.h
View File

@ -1,5 +1,5 @@
/* mz_sstrm_win32.h -- Stream for filesystem access for windows
Version 2.3.7, July 13, 2018
Version 2.3.8, July 14, 2018
part of the MiniZip project
Copyright (C) 2010-2018 Nathan Moinvaziri

2
mz_strm_zlib.c
View File

@ -1,5 +1,5 @@
/* mz_strm_zlib.c -- Stream for zlib inflate/deflate
Version 2.3.7, July 13, 2018
Version 2.3.8, July 14, 2018
part of the MiniZip project
Copyright (C) 2010-2018 Nathan Moinvaziri

2
mz_strm_zlib.h
View File

@ -1,5 +1,5 @@
/* mz_strm_zlib.h -- Stream for zlib inflate/deflate
Version 2.3.7, July 13, 2018
Version 2.3.8, July 14, 2018
part of the MiniZip project
Copyright (C) 2010-2018 Nathan Moinvaziri

2
mz_zip.c
View File

@ -1,5 +1,5 @@
/* zip.c -- Zip manipulation
Version 2.3.7, July 13, 2018
Version 2.3.8, July 14, 2018
part of the MiniZip project
Copyright (C) 2010-2018 Nathan Moinvaziri

2
mz_zip.h
View File

@ -1,5 +1,5 @@
/* mz_zip.h -- Zip manipulation
Version 2.3.7, July 13, 2018
Version 2.3.8, July 14, 2018
part of the MiniZip project
Copyright (C) 2010-2018 Nathan Moinvaziri