Version 2.3.0.

Add back auto detection of zip64. #258
Simplification & fixed formatting. #258
2018-05-03 17:59:04 -07:00 · 2018-05-03 17:57:20 -07:00 · 2018-05-03 17:24:32 -07:00 · 2018-05-03 09:35:37 -07:00 · 2018-05-02 20:09:48 -07:00 · 2018-05-02 20:09:25 -07:00
42 changed files with 858 additions and 1230 deletions
@@ -1,5 +0,0 @@
-# Xcode
-xcuserdata/
-
-# JetBrains
-.idea/
@@ -30,7 +30,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.2.7")
+set(VERSION "2.3.0")

 # Set cmake debug postfix to d
 set(CMAKE_DEBUG_POSTFIX "d")
@@ -42,6 +42,7 @@ if(USE_ZLIB)
    if(ZLIB_FOUND)
        include_directories(${ZLIB_INCLUDE_DIRS})
    endif()
+    add_definitions(-DHAVE_ZLIB)
 endif()

 set(MINIZIP_PC ${CMAKE_CURRENT_BINARY_DIR}/minizip.pc)
@@ -50,31 +51,31 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/minizip.pc.cmakein ${MINIZIP_PC} @ONL
 set(PROJECT_NAME libminizip)

 set(MINIZIP_SRC
-    src/mz_os.c
-    src/mz_compat.c
-    src/mz_strm.c
-    src/mz_strm_buf.c
-    src/mz_strm_mem.c
-    src/mz_strm_posix.c
-    src/mz_strm_split.c
-    src/mz_strm_zlib.c
-    src/mz_zip.c)
+    mz_os.c
+    mz_compat.c
+    mz_strm.c
+    mz_strm_buf.c
+    mz_strm_mem.c
+    mz_strm_posix.c
+    mz_strm_split.c
+    mz_strm_zlib.c
+    mz_zip.c)

 set(MINIZIP_PUBLIC_HEADERS
-    src/mz.h
-    src/mz_os.h
-    src/mz_compat.h
-    src/mz_strm.h
-    src/mz_strm_buf.h
-    src/mz_strm_mem.h
-    src/mz_strm_posix.h
-    src/mz_strm_split.h
-    src/mz_strm_zlib.h
-    src/mz_zip.h)
+    mz.h
+    mz_os.h
+    mz_compat.h
+    mz_strm.h
+    mz_strm_buf.h
+    mz_strm_mem.h
+    mz_strm_posix.h
+    mz_strm_split.h
+    mz_strm_zlib.h
+    mz_zip.h)

 if(WIN32)
-    list(APPEND MINIZIP_SRC "src/mz_os_win32.c" "src/mz_strm_win32.c")
-    list(APPEND MINIZIP_PUBLIC_HEADERS "src/mz_os_win32.h" "src/mz_strm_win32.h")
+    list(APPEND MINIZIP_SRC "mz_os_win32.c" "mz_strm_win32.c")
+    list(APPEND MINIZIP_PUBLIC_HEADERS "mz_os_win32.h" "mz_strm_win32.h")

    add_definitions(-D_CRT_SECURE_NO_DEPRECATE)
 endif()
@@ -86,8 +87,8 @@ endif()
 if(UNIX)
    add_compile_options(-O3)

-    list(APPEND MINIZIP_SRC "src/mz_os_posix.c")
-    list(APPEND MINIZIP_PUBLIC_HEADERS "src/mz_os_posix.h")
+    list(APPEND MINIZIP_SRC "mz_os_posix.c")
+    list(APPEND MINIZIP_PUBLIC_HEADERS "mz_os_posix.h")

    set(define_lfs_macros TRUE)

@@ -106,9 +107,9 @@ if(UNIX)
        add_definitions(-D_FILE_OFFSET_BITS=64)
    endif()

-    find_package(PkgConfig REQUIRED)
-
    if(CMAKE_SYSTEM_NAME MATCHES "Linux")
+        find_package(PkgConfig REQUIRED)
+
        pkg_check_modules(LIBBSD libbsd REQUIRED)

        include_directories(${LIBBSD_INCLUDE_DIRS})
@@ -119,28 +120,26 @@ endif()
 if(USE_CRYPT)
    add_definitions(-DHAVE_CRYPT)

-    list(APPEND MINIZIP_SRC "src/mz_strm_crypt.c")
-    list(APPEND MINIZIP_PUBLIC_HEADERS "src/mz_strm_crypt.h")
+    list(APPEND MINIZIP_SRC "mz_strm_crypt.c")
+    list(APPEND MINIZIP_PUBLIC_HEADERS "mz_strm_crypt.h")
 endif()

 if(USE_AES)
    add_definitions(-DHAVE_AES)

-    list(APPEND MINIZIP_SRC "src/mz_strm_aes.c")
-    list(APPEND MINIZIP_PUBLIC_HEADERS "src/mz_strm_aes.h")
+    list(APPEND MINIZIP_SRC "mz_strm_aes.c")
+    list(APPEND MINIZIP_PUBLIC_HEADERS "mz_strm_aes.h")

    set(AES_SRC
        lib/aes/aescrypt.c
        lib/aes/aeskey.c
        lib/aes/aestab.c
-        lib/aes/aes_ni.c
        lib/aes/hmac.c
        lib/aes/pwd2key.c
        lib/aes/sha1.c)

    set(AES_PUBLIC_HEADERS
        lib/aes/aes.h
-        lib/aes/aes_ni.h
        lib/aes/aesopt.h
        lib/aes/aestab.h
        lib/aes/brg_endian.h
@@ -156,13 +155,22 @@ endif()

 if(USE_ZLIB)
    add_definitions(-DHAVE_ZLIB)
+
+    include(CheckFunctionExists)
+    set(CMAKE_REQUIRED_LIBRARIES ZLIB::ZLIB)
+    CHECK_FUNCTION_EXISTS(z_get_crc_table
+        NEEDS_Z_PREFIX)
+
+    if(NEEDS_Z_PREFIX)
+        add_definitions(-DZ_PREFIX)
+    endif()
 endif()
 if(USE_BZIP2)
    add_definitions(-DHAVE_BZIP2)
    add_definitions(-DBZ_NO_STDIO)

-    list(APPEND MINIZIP_SRC "src/mz_strm_bzip.c")
-    list(APPEND MINIZIP_PUBLIC_HEADERS "src/mz_strm_bzip.h")
+    list(APPEND MINIZIP_SRC "mz_strm_bzip.c")
+    list(APPEND MINIZIP_PUBLIC_HEADERS "mz_strm_bzip.h")

    set(BZIP2_SRC
        lib/bzip2/blocksort.c
@@ -187,8 +195,8 @@ if(USE_LZMA)
    add_definitions(-DHAVE_CONFIG_H)
    add_definitions(-DLZMA_API_STATIC)

-    list(APPEND MINIZIP_SRC "src/mz_strm_lzma.c")
-    list(APPEND MINIZIP_PUBLIC_HEADERS "src/mz_strm_lzma.h")
+    list(APPEND MINIZIP_SRC "mz_strm_lzma.c")
+    list(APPEND MINIZIP_PUBLIC_HEADERS "mz_strm_lzma.h")

    set(LZMA_CHECK_SRC
        lib/liblzma/check/check.c
@@ -314,6 +322,10 @@ add_library(${PROJECT_NAME}
                ${BZIP2_SRC} ${BZIP2_PUBLIC_HEADERS}
                ${LZMA_SRC} ${LZMA_PUBLIC_HEADERS})

+if (MINGW AND BUILD_SHARED_LIBS)
+  set_target_properties(${PROJECT_NAME} PROPERTIES ARCHIVE_OUTPUT_NAME "minizip")
+endif ()
+
 set_target_properties(${PROJECT_NAME} PROPERTIES LINKER_LANGUAGE C PREFIX ""
                      POSITION_INDEPENDENT_CODE 1)
 if(USE_ZLIB)
@@ -342,7 +354,7 @@ install(FILES ${MINIZIP_PUBLIC_HEADERS} DESTINATION "${INSTALL_INC_DIR}")
 install(FILES ${MINIZIP_PC} DESTINATION "${INSTALL_PKGCONFIG_DIR}")

 if(BUILD_TEST)
-    add_executable(minizip "src/minizip.c")
+    add_executable(minizip "minizip.c")
    target_link_libraries(minizip ${PROJECT_NAME})

    install(TARGETS minizip
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
  s.name     = 'Minizip'
-  s.version  = '2.2.7'
+  s.version  = '2.3.0'
  s.license  = 'zlib'
  s.summary  = 'Minizip contrib in zlib with the latest bug fixes and advanced features'
  s.description = <<-DESC
@@ -17,7 +17,7 @@ DESC
  s.libraries = 'z'

  s.subspec 'Core' do |sp|
-    sp.source_files = 'src/{mz_os,mz_compat,mz_strm,mz_strm_mem,mz_strm_buf,mz_zip,mz_strm_crypt,mz_strm_posix,mz_strm_zlib}.{c,h}'
+    sp.source_files = '{mz_os,mz_compat,mz_strm,mz_strm_mem,mz_strm_buf,mz_zip,mz_strm_crypt,mz_strm_posix,mz_strm_zlib}.{c,h}'
  end

  s.subspec 'AES' do |sp|
@@ -1,6 +1,6 @@
-# Minizip 2.2.7
+# Minizip 2.3.0

-This library is a refactoring of the minizip contribution found in the zlib distribution that 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.
+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.

 Dev: ![Dev Branch Status](https://travis-ci.org/nmoinvaz/minizip.svg?branch=dev)
 Master: ![Master Branch Status](https://travis-ci.org/nmoinvaz/minizip.svg?branch=master)
@@ -30,12 +30,12 @@ cmake --build .
 | mz_strm_buf.\* | Buffered stream | No |
 | mz_strm_bzip.\* | BZIP2 stream using libbzip2 | No |
 | mz_strm_crypt.\* | PKWARE traditional encryption stream | No |
-| mz_strm_lzma.\* | LZMA stream using liblzma | No |
+| mz_strm_lzma.\* | LZMA stream using liblzma | zlib or liblzma |
 | mz_strm_mem.\* | Memory stream | Yes |
 | mz_strm_split.\* | Disk splitting stream | No |
 | mz_strm_posix.\* | File stream using Posix functions | Non-windows systems |
 | mz_strm_win32.\* | File stream using Win32 API functions | Windows systems |
-| mz_strm_zlib.\* | Deflate stream using zlib | Yes |
+| mz_strm_zlib.\* | Deflate stream using zlib | zlib or liblzma |
 | mz_zip.\* | Zip functionality | Yes |

 ## Features
@@ -54,7 +54,7 @@ cmake --build .

 ### Encryption

-#### [WinZIP AES Encryption](http://www.winzip.com/aes_info.htm)
+#### [WinZIP AES Encryption](https://www.winzip.com/aes_info.htm)

 + Requires ``cmake . -DUSE_AES=ON`` or ``#define HAVE_AES``
 + Requires Brian Gladman's [AES](https://github.com/BrianGladman/aes) and [SHA](https://github.com/BrianGladman/sha) libraries
@@ -81,7 +81,7 @@ This library has been refactored around streams.

 #### Memory Streaming

-To unzip from a zip file in memory create a memory stream and pass it to the unzip open functions.
+To unzip from a zip file in memory pass the memory stream to the open function.
 ```
 uint8_t *zip_buffer = NULL;
 int32_t zip_buffer_size = 0;
@@ -98,7 +98,7 @@ void *zip_handle = mz_zip_open(mem_stream, MZ_OPEN_MODE_READ);
 mz_stream_mem_delete(&mem_stream);
 ```

-To create a zip file in memory first create a growable memory stream and pass it to the zip open functions.
+To create a zip file in memory first create a growable memory stream and pass it to the open function.

 ```
 void *mem_stream = NULL;
@@ -135,7 +135,7 @@ void *zip_handle = mz_zip_open(buf_stream, MZ_OPEN_MODE_READ);

 #### Disk Splitting Stream

-To create an archive with multiple disks use the disk splitting stream and for zipping supply a disk size value in bytes.
+To create an archive with multiple disks use the disk splitting stream and supply a disk size value in bytes.

 ```
 void *stream = NULL;
@@ -150,13 +150,9 @@ mz_stream_set_base(split_stream, stream);

 mz_stream_open(split_stream, path..

-handle = mz_zip_open(split_stream, MZ_OPEN_MODE_WRITE);
+void *zip_handle = mz_zip_open(split_stream, MZ_OPEN_MODE_WRITE);
 ```

-The central directory is the only data stored in the .zip and doesn't follow disk size restrictions.
-
-When unzipping it will automatically determine when in needs to cross disk boundaries.
-
 ### Windows RT

 + Requires ``#define MZ_USE_WINRT_API``
@@ -166,3 +162,4 @@ When unzipping it will automatically determine when in needs to cross disk bound
 + Archives are required to have a central directory.
 + Central directory header values should be correct and it is necessary for the compressed size to be accurate for AES encryption.
 + Central directory encryption is not supported due to licensing restrictions mentioned by PKWARE in their zip appnote.
+ Central directory is the only data stored on the last disk of a split-disk archive and doesn't follow disk size restrictions.
@@ -1,687 +0,0 @@
-/*
-Copyright (c) 1998-2013, Brian Gladman, Worcester, UK. All rights reserved.
-
-The redistribution and use of this software (with or without changes)
-is allowed without the payment of fees or royalties provided that:
-
-  source code distributions include the above copyright notice, this
-  list of conditions and the following disclaimer;
-
-  binary distributions include the above copyright notice, this list
-  of conditions and the following disclaimer in their documentation.
-
-This software is provided 'as is' with no explicit or implied warranties
-in respect of its operation, including, but not limited to, correctness
-and fitness for purpose.
---------------------------------------------------------------------------
-Issue Date: 09/09/2014
-*/
-
-#include "aes_ni.h"
-
-#if defined( USE_INTEL_AES_IF_PRESENT )
-
-#if defined(_MSC_VER)
-
-#include <intrin.h>
-#pragma intrinsic(__cpuid)
-#define INLINE  __inline
-
-INLINE int has_aes_ni(void)
-{
-	static int test = -1;
-	if(test < 0)
-	{
-        int cpu_info[4];
-        __cpuid(cpu_info, 1);
-		test = cpu_info[2] & 0x02000000;
-	}
-	return test;
-}
-
-#elif defined( __GNUC__ )
-
-#include <cpuid.h>
-
-#if !defined(__clang__)
-#pragma GCC target ("ssse3")
-#pragma GCC target ("sse4.1")
-#pragma GCC target ("aes")
-#endif
-
-#include <x86intrin.h>
-#define INLINE  static __inline
-
-INLINE int has_aes_ni()
-{
-    static int test = -1;
-    if(test < 0)
-    {
-        unsigned int a, b, c, d;
-        if(!__get_cpuid(1, &a, &b, &c, &d))
-            test = 0;
-        else
-            test = (c & 0x2000000);
-    }
-    return test;
-}
-
-#else
-#error AES New Instructions require Microsoft, Intel, GNU C, or CLANG
-#endif
-
-INLINE __m128i aes_128_assist(__m128i t1, __m128i t2)
-{
-	__m128i t3;
-	t2 = _mm_shuffle_epi32(t2, 0xff);
-	t3 = _mm_slli_si128(t1, 0x4);
-	t1 = _mm_xor_si128(t1, t3);
-	t3 = _mm_slli_si128(t3, 0x4);
-	t1 = _mm_xor_si128(t1, t3);
-	t3 = _mm_slli_si128(t3, 0x4);
-	t1 = _mm_xor_si128(t1, t3);
-	t1 = _mm_xor_si128(t1, t2);
-	return t1;
-}
-
-AES_RETURN aes_ni(encrypt_key128)(const unsigned char *key, aes_encrypt_ctx cx[1])
-{
-	__m128i t1, t2;
-	__m128i *ks = (__m128i*)cx->ks;
-
-	if(!has_aes_ni())
-	{
-		return aes_xi(encrypt_key128)(key, cx);
-	}
-
-	t1 = _mm_loadu_si128((__m128i*)key);
-
-	ks[0] = t1;
-
-	t2 = _mm_aeskeygenassist_si128(t1, 0x1);
-	t1 = aes_128_assist(t1, t2);
-	ks[1] = t1;
-
-	t2 = _mm_aeskeygenassist_si128(t1, 0x2);
-	t1 = aes_128_assist(t1, t2);
-	ks[2] = t1;
-
-	t2 = _mm_aeskeygenassist_si128(t1, 0x4);
-	t1 = aes_128_assist(t1, t2);
-	ks[3] = t1;
-
-	t2 = _mm_aeskeygenassist_si128(t1, 0x8);
-	t1 = aes_128_assist(t1, t2);
-	ks[4] = t1;
-
-	t2 = _mm_aeskeygenassist_si128(t1, 0x10);
-	t1 = aes_128_assist(t1, t2);
-	ks[5] = t1;
-
-	t2 = _mm_aeskeygenassist_si128(t1, 0x20);
-	t1 = aes_128_assist(t1, t2);
-	ks[6] = t1;
-
-	t2 = _mm_aeskeygenassist_si128(t1, 0x40);
-	t1 = aes_128_assist(t1, t2);
-	ks[7] = t1;
-
-	t2 = _mm_aeskeygenassist_si128(t1, 0x80);
-	t1 = aes_128_assist(t1, t2);
-	ks[8] = t1;
-
-	t2 = _mm_aeskeygenassist_si128(t1, 0x1b);
-	t1 = aes_128_assist(t1, t2);
-	ks[9] = t1;
-
-	t2 = _mm_aeskeygenassist_si128(t1, 0x36);
-	t1 = aes_128_assist(t1, t2);
-	ks[10] = t1;
-
-	cx->inf.l = 0;
-	cx->inf.b[0] = 10 * 16;
-	return EXIT_SUCCESS;
-}
-
-INLINE void aes_192_assist(__m128i* t1, __m128i * t2, __m128i * t3)
-{
-	__m128i t4;
-	*t2 = _mm_shuffle_epi32(*t2, 0x55);
-	t4 = _mm_slli_si128(*t1, 0x4);
-	*t1 = _mm_xor_si128(*t1, t4);
-	t4 = _mm_slli_si128(t4, 0x4);
-	*t1 = _mm_xor_si128(*t1, t4);
-	t4 = _mm_slli_si128(t4, 0x4);
-	*t1 = _mm_xor_si128(*t1, t4);
-	*t1 = _mm_xor_si128(*t1, *t2);
-	*t2 = _mm_shuffle_epi32(*t1, 0xff);
-	t4 = _mm_slli_si128(*t3, 0x4);
-	*t3 = _mm_xor_si128(*t3, t4);
-	*t3 = _mm_xor_si128(*t3, *t2);
-}
-
-AES_RETURN aes_ni(encrypt_key192)(const unsigned char *key, aes_encrypt_ctx cx[1])
-{
-	__m128i t1, t2, t3;
-	__m128i *ks = (__m128i*)cx->ks;
-
-	if(!has_aes_ni())
-	{
-		return aes_xi(encrypt_key192)(key, cx);
-	}
-
-	t1 = _mm_loadu_si128((__m128i*)key);
-	t3 = _mm_loadu_si128((__m128i*)(key + 16));
-
-	ks[0] = t1;
-	ks[1] = t3;
-
-	t2 = _mm_aeskeygenassist_si128(t3, 0x1);
-	aes_192_assist(&t1, &t2, &t3);
-
-	ks[1] = _mm_castpd_si128(_mm_shuffle_pd(_mm_castsi128_pd(ks[1]), _mm_castsi128_pd(t1), 0));
-	ks[2] = _mm_castpd_si128(_mm_shuffle_pd(_mm_castsi128_pd(t1), _mm_castsi128_pd(t3), 1));
-
-	t2 = _mm_aeskeygenassist_si128(t3, 0x2);
-	aes_192_assist(&t1, &t2, &t3);
-	ks[3] = t1;
-	ks[4] = t3;
-
-	t2 = _mm_aeskeygenassist_si128(t3, 0x4);
-	aes_192_assist(&t1, &t2, &t3);
-	ks[4] = _mm_castpd_si128(_mm_shuffle_pd(_mm_castsi128_pd(ks[4]), _mm_castsi128_pd(t1), 0));
-	ks[5] = _mm_castpd_si128(_mm_shuffle_pd(_mm_castsi128_pd(t1), _mm_castsi128_pd(t3), 1));
-
-	t2 = _mm_aeskeygenassist_si128(t3, 0x8);
-	aes_192_assist(&t1, &t2, &t3);
-	ks[6] = t1;
-	ks[7] = t3;
-
-	t2 = _mm_aeskeygenassist_si128(t3, 0x10);
-	aes_192_assist(&t1, &t2, &t3);
-	ks[7] = _mm_castpd_si128(_mm_shuffle_pd(_mm_castsi128_pd(ks[7]), _mm_castsi128_pd(t1), 0));
-	ks[8] = _mm_castpd_si128(_mm_shuffle_pd(_mm_castsi128_pd(t1), _mm_castsi128_pd(t3), 1));
-
-	t2 = _mm_aeskeygenassist_si128(t3, 0x20);
-	aes_192_assist(&t1, &t2, &t3);
-	ks[9] = t1;
-	ks[10] = t3;
-
-	t2 = _mm_aeskeygenassist_si128(t3, 0x40);
-	aes_192_assist(&t1, &t2, &t3);
-	ks[10] = _mm_castpd_si128(_mm_shuffle_pd(_mm_castsi128_pd(ks[10]), _mm_castsi128_pd(t1), 0));
-	ks[11] = _mm_castpd_si128(_mm_shuffle_pd(_mm_castsi128_pd(t1), _mm_castsi128_pd(t3), 1));
-
-	t2 = _mm_aeskeygenassist_si128(t3, 0x80);
-	aes_192_assist(&t1, &t2, &t3);
-	ks[12] = t1;
-
-	cx->inf.l = 0;
-	cx->inf.b[0] = 12 * 16;
-	return EXIT_SUCCESS;
-}
-
-INLINE void aes_256_assist1(__m128i* t1, __m128i * t2)
-{
-	__m128i t4;
-	*t2 = _mm_shuffle_epi32(*t2, 0xff);
-	t4 = _mm_slli_si128(*t1, 0x4);
-	*t1 = _mm_xor_si128(*t1, t4);
-	t4 = _mm_slli_si128(t4, 0x4);
-	*t1 = _mm_xor_si128(*t1, t4);
-	t4 = _mm_slli_si128(t4, 0x4);
-	*t1 = _mm_xor_si128(*t1, t4);
-	*t1 = _mm_xor_si128(*t1, *t2);
-}
-
-INLINE void aes_256_assist2(__m128i* t1, __m128i * t3)
-{
-	__m128i t2, t4;
-	t4 = _mm_aeskeygenassist_si128(*t1, 0x0);
-	t2 = _mm_shuffle_epi32(t4, 0xaa);
-	t4 = _mm_slli_si128(*t3, 0x4);
-	*t3 = _mm_xor_si128(*t3, t4);
-	t4 = _mm_slli_si128(t4, 0x4);
-	*t3 = _mm_xor_si128(*t3, t4);
-	t4 = _mm_slli_si128(t4, 0x4);
-	*t3 = _mm_xor_si128(*t3, t4);
-	*t3 = _mm_xor_si128(*t3, t2);
-}
-
-AES_RETURN aes_ni(encrypt_key256)(const unsigned char *key, aes_encrypt_ctx cx[1])
-{
-	__m128i t1, t2, t3;
-	__m128i *ks = (__m128i*)cx->ks;
-
-	if(!has_aes_ni())
-	{
-		return aes_xi(encrypt_key256)(key, cx);
-	}
-
-	t1 = _mm_loadu_si128((__m128i*)key);
-	t3 = _mm_loadu_si128((__m128i*)(key + 16));
-
-	ks[0] = t1;
-	ks[1] = t3;
-
-	t2 = _mm_aeskeygenassist_si128(t3, 0x01);
-	aes_256_assist1(&t1, &t2);
-	ks[2] = t1;
-	aes_256_assist2(&t1, &t3);
-	ks[3] = t3;
-
-	t2 = _mm_aeskeygenassist_si128(t3, 0x02);
-	aes_256_assist1(&t1, &t2);
-	ks[4] = t1;
-	aes_256_assist2(&t1, &t3);
-	ks[5] = t3;
-
-	t2 = _mm_aeskeygenassist_si128(t3, 0x04);
-	aes_256_assist1(&t1, &t2);
-	ks[6] = t1;
-	aes_256_assist2(&t1, &t3);
-	ks[7] = t3;
-
-	t2 = _mm_aeskeygenassist_si128(t3, 0x08);
-	aes_256_assist1(&t1, &t2);
-	ks[8] = t1;
-	aes_256_assist2(&t1, &t3);
-	ks[9] = t3;
-
-	t2 = _mm_aeskeygenassist_si128(t3, 0x10);
-	aes_256_assist1(&t1, &t2);
-	ks[10] = t1;
-	aes_256_assist2(&t1, &t3);
-	ks[11] = t3;
-
-	t2 = _mm_aeskeygenassist_si128(t3, 0x20);
-	aes_256_assist1(&t1, &t2);
-	ks[12] = t1;
-	aes_256_assist2(&t1, &t3);
-	ks[13] = t3;
-
-	t2 = _mm_aeskeygenassist_si128(t3, 0x40);
-	aes_256_assist1(&t1, &t2);
-	ks[14] = t1;
-
-	cx->inf.l = 0;
-	cx->inf.b[0] = 14 * 16;
-	return EXIT_SUCCESS;
-}
-
-INLINE void enc_to_dec(aes_decrypt_ctx cx[1])
-{
-	__m128i *ks = (__m128i*)cx->ks;
-	int j;
-
-	for( j = 1 ; j < (cx->inf.b[0] >> 4) ; ++j )
-		ks[j] = _mm_aesimc_si128(ks[j]);
-}
-
-AES_RETURN aes_ni(decrypt_key128)(const unsigned char *key, aes_decrypt_ctx cx[1])
-{
-	if(!has_aes_ni())
-	{
-		return aes_xi(decrypt_key128)(key, cx);
-	}
-
-	if(aes_ni(encrypt_key128)(key, (aes_encrypt_ctx*)cx) == EXIT_SUCCESS)
-	{
-		enc_to_dec(cx);
-		return EXIT_SUCCESS;
-	}
-	else
-		return EXIT_FAILURE;
-
-}
-
-AES_RETURN aes_ni(decrypt_key192)(const unsigned char *key, aes_decrypt_ctx cx[1])
-{
-	if(!has_aes_ni())
-	{
-		return aes_xi(decrypt_key192)(key, cx);
-	}
-
-	if(aes_ni(encrypt_key192)(key, (aes_encrypt_ctx*)cx) == EXIT_SUCCESS)
-	{
-		enc_to_dec(cx);
-		return EXIT_SUCCESS;
-	}
-	else
-		return EXIT_FAILURE;
-}
-
-AES_RETURN aes_ni(decrypt_key256)(const unsigned char *key, aes_decrypt_ctx cx[1])
-{
-	if(!has_aes_ni())
-	{
-		return aes_xi(decrypt_key256)(key, cx);
-	}
-
-	if(aes_ni(encrypt_key256)(key, (aes_encrypt_ctx*)cx) == EXIT_SUCCESS)
-	{
-		enc_to_dec(cx);
-		return EXIT_SUCCESS;
-	}
-	else
-		return EXIT_FAILURE;
-}
-
-AES_RETURN aes_ni(encrypt)(const unsigned char *in, unsigned char *out, const aes_encrypt_ctx cx[1])
-{
-	__m128i *key = (__m128i*)cx->ks, t;
-
-	if(cx->inf.b[0] != 10 * 16 && cx->inf.b[0] != 12 * 16 && cx->inf.b[0] != 14 * 16)
-		return EXIT_FAILURE;
-
-	if(!has_aes_ni())
-	{
-		return aes_xi(encrypt)(in, out, cx);
-	}
-
-	t = _mm_xor_si128(_mm_loadu_si128((__m128i*)in), *(__m128i*)key);
-
-	switch(cx->inf.b[0])
-	{
-	case 14 * 16:
-		t = _mm_aesenc_si128(t, *(__m128i*)++key);
-		t = _mm_aesenc_si128(t, *(__m128i*)++key);
-	case 12 * 16:
-		t = _mm_aesenc_si128(t, *(__m128i*)++key);
-		t = _mm_aesenc_si128(t, *(__m128i*)++key);
-	case 10 * 16:
-		t = _mm_aesenc_si128(t, *(__m128i*)++key);
-		t = _mm_aesenc_si128(t, *(__m128i*)++key);
-		t = _mm_aesenc_si128(t, *(__m128i*)++key);
-		t = _mm_aesenc_si128(t, *(__m128i*)++key);
-		t = _mm_aesenc_si128(t, *(__m128i*)++key);
-		t = _mm_aesenc_si128(t, *(__m128i*)++key);
-		t = _mm_aesenc_si128(t, *(__m128i*)++key);
-		t = _mm_aesenc_si128(t, *(__m128i*)++key);
-		t = _mm_aesenc_si128(t, *(__m128i*)++key);
-		t = _mm_aesenclast_si128(t, *(__m128i*)++key);
-	}
-
-	_mm_storeu_si128(&((__m128i*)out)[0], t);
-	return EXIT_SUCCESS;
-}
-
-AES_RETURN aes_ni(decrypt)(const unsigned char *in, unsigned char *out, const aes_decrypt_ctx cx[1])
-{
-	__m128i *key = (__m128i*)cx->ks + (cx->inf.b[0] >> 4), t;
-
-	if(cx->inf.b[0] != 10 * 16 && cx->inf.b[0] != 12 * 16 && cx->inf.b[0] != 14 * 16)
-		return EXIT_FAILURE;
-
-	if(!has_aes_ni())
-	{
-		return aes_xi(decrypt)(in, out, cx);
-	}
-
-	t = _mm_xor_si128(_mm_loadu_si128((__m128i*)in), *(__m128i*)key);
-
-	switch(cx->inf.b[0])
-	{
-	case 14 * 16:
-		t = _mm_aesdec_si128(t, *(__m128i*)--key);
-		t = _mm_aesdec_si128(t, *(__m128i*)--key);
-	case 12 * 16:
-		t = _mm_aesdec_si128(t, *(__m128i*)--key);
-		t = _mm_aesdec_si128(t, *(__m128i*)--key);
-	case 10 * 16:
-		t = _mm_aesdec_si128(t, *(__m128i*)--key);
-		t = _mm_aesdec_si128(t, *(__m128i*)--key);
-		t = _mm_aesdec_si128(t, *(__m128i*)--key);
-		t = _mm_aesdec_si128(t, *(__m128i*)--key);
-		t = _mm_aesdec_si128(t, *(__m128i*)--key);
-		t = _mm_aesdec_si128(t, *(__m128i*)--key);
-		t = _mm_aesdec_si128(t, *(__m128i*)--key);
-		t = _mm_aesdec_si128(t, *(__m128i*)--key);
-		t = _mm_aesdec_si128(t, *(__m128i*)--key);
-		t = _mm_aesdeclast_si128(t, *(__m128i*)--key);
-	}
-
-	_mm_storeu_si128((__m128i*)out, t);
-	return EXIT_SUCCESS;
-}
-
-#ifdef ADD_AESNI_MODE_CALLS
-#ifdef USE_AES_CONTEXT
-
-AES_RETURN aes_CBC_encrypt(const unsigned char *in,
-	unsigned char *out,
-	unsigned char ivec[16],
-	unsigned long length,
-    const aes_encrypt_ctx cx[1])
-{
-	__m128i feedback, data, *key = (__m128i*)cx->ks;
-	int number_of_rounds = cx->inf.b[0] >> 4, j;
-    unsigned long i;
-    
-    if(number_of_rounds != 10 && number_of_rounds != 12 && number_of_rounds != 14)
-        return EXIT_FAILURE;
-
-    if(!has_aes_ni())
-    {
-        return aes_cbc_encrypt(in, out, length, ivec, cx);
-    }
-
-    if(length % 16)
-		length = length / 16 + 1;
-	else length /= 16;
-	feedback = _mm_loadu_si128((__m128i*)ivec);
-	for(i = 0; i < length; i++)
-	{
-		data = _mm_loadu_si128(&((__m128i*)in)[i]);
-		feedback = _mm_xor_si128(data, feedback);
-		feedback = _mm_xor_si128(feedback, ((__m128i*)key)[0]);
-		for(j = 1; j <number_of_rounds; j++)
-			feedback = _mm_aesenc_si128(feedback, ((__m128i*)key)[j]);
-		feedback = _mm_aesenclast_si128(feedback, ((__m128i*)key)[j]);
-		_mm_storeu_si128(&((__m128i*)out)[i], feedback);
-	}
-    return EXIT_SUCCESS;
-}
-
-AES_RETURN aes_CBC_decrypt(const unsigned char *in,
-    unsigned char *out,
-    unsigned char ivec[16],
-    unsigned long length,
-    const aes_decrypt_ctx cx[1])
-{
-    __m128i data, feedback, last_in, *key = (__m128i*)cx->ks;
-    int number_of_rounds = cx->inf.b[0] >> 4, j;
-    unsigned long i;
-
-    if(number_of_rounds != 10 && number_of_rounds != 12 && number_of_rounds != 14)
-        return EXIT_FAILURE;
-
-    if(!has_aes_ni())
-    {
-        return aes_cbc_decrypt(in, out, length, ivec, cx);
-    }
-
-    if(length % 16)
-        length = length / 16 + 1;
-    else length /= 16;
-    feedback = _mm_loadu_si128((__m128i*)ivec);
-    for(i = 0; i < length; i++)
-    {
-        last_in = _mm_loadu_si128(&((__m128i*)in)[i]);
-        data = _mm_xor_si128(last_in, ((__m128i*)key)[number_of_rounds]);
-        for(j = number_of_rounds - 1; j > 0; j--)
-        {
-            data = _mm_aesdec_si128(data, ((__m128i*)key)[j]);
-        }
-        data = _mm_aesdeclast_si128(data, ((__m128i*)key)[0]);
-        data = _mm_xor_si128(data, feedback);
-        _mm_storeu_si128(&((__m128i*)out)[i], data);
-        feedback = last_in;
-    }
-    return EXIT_SUCCESS;
-}
-
-static void ctr_inc(unsigned char *ctr_blk)
-{
-    uint32_t c;
-
-    c = *(uint32_t*)(ctr_blk + 8);
-    c++;
-    *(uint32_t*)(ctr_blk + 8) = c;
-
-    if(!c)
-        *(uint32_t*)(ctr_blk + 12) = *(uint32_t*)(ctr_blk + 12) + 1;
-}
-
-AES_RETURN AES_CTR_encrypt(const unsigned char *in,
-    unsigned char *out,
-    const unsigned char ivec[8],
-    const unsigned char nonce[4],
-    unsigned long length,
-    const aes_encrypt_ctx cx[1])
-{
-    __m128i ctr_block = { 0 }, *key = (__m128i*)cx->ks, tmp, ONE, BSWAP_EPI64;
-    int number_of_rounds = cx->inf.b[0] >> 4, j;
-    unsigned long i;
-
-    if(number_of_rounds != 10 && number_of_rounds != 12 && number_of_rounds != 14)
-        return EXIT_FAILURE;
-
-    if(!has_aes_ni())
-    {
-        unsigned char ctr_blk[16];
-        *(uint64_t*)ctr_blk = *(uint64_t*)ivec;
-        *(uint32_t*)(ctr_blk + 8) = *(uint32_t*)nonce;
-        return aes_ctr_crypt(in, out, length, (unsigned char*)ctr_blk, ctr_inc, cx);
-    }
-
-    if(length % 16)
-        length = length / 16 + 1;
-    else length /= 16;
-    ONE = _mm_set_epi32(0, 1, 0, 0);
-    BSWAP_EPI64 = _mm_setr_epi8(7, 6, 5, 4, 3, 2, 1, 0, 15, 14, 13, 12, 11, 10, 9, 8);
-#ifdef _MSC_VER
-    ctr_block = _mm_insert_epi64(ctr_block, *(long long*)ivec, 1);
-#else
-    ctr_block = _mm_set_epi64(*(__m64*)ivec, *(__m64*)&ctr_block);
-#endif
-    ctr_block = _mm_insert_epi32(ctr_block, *(long*)nonce, 1);
-    ctr_block = _mm_srli_si128(ctr_block, 4);
-    ctr_block = _mm_shuffle_epi8(ctr_block, BSWAP_EPI64);
-    ctr_block = _mm_add_epi64(ctr_block, ONE);
-    for(i = 0; i < length; i++)
-    {
-        tmp = _mm_shuffle_epi8(ctr_block, BSWAP_EPI64);
-        ctr_block = _mm_add_epi64(ctr_block, ONE);
-        tmp = _mm_xor_si128(tmp, ((__m128i*)key)[0]);
-        for(j = 1; j <number_of_rounds; j++)
-        {
-            tmp = _mm_aesenc_si128(tmp, ((__m128i*)key)[j]);
-        };
-        tmp = _mm_aesenclast_si128(tmp, ((__m128i*)key)[j]);
-        tmp = _mm_xor_si128(tmp, _mm_loadu_si128(&((__m128i*)in)[i]));
-        _mm_storeu_si128(&((__m128i*)out)[i], tmp);
-    }
-    return EXIT_SUCCESS;
-}
-
-#else
-
-void aes_CBC_encrypt(const unsigned char *in,
-    unsigned char *out,
-    unsigned char ivec[16],
-    unsigned long length,
-    unsigned char *key,
-    int number_of_rounds)
-{
-    __m128i feedback, data;
-    unsigned long i;
-    int j;
-    if(length % 16)
-        length = length / 16 + 1;
-    else length /= 16;
-    feedback = _mm_loadu_si128((__m128i*)ivec);
-    for(i = 0; i < length; i++)
-    {
-        data = _mm_loadu_si128(&((__m128i*)in)[i]);
-        feedback = _mm_xor_si128(data, feedback);
-        feedback = _mm_xor_si128(feedback, ((__m128i*)key)[0]);
-        for(j = 1; j <number_of_rounds; j++)
-            feedback = _mm_aesenc_si128(feedback, ((__m128i*)key)[j]);
-        feedback = _mm_aesenclast_si128(feedback, ((__m128i*)key)[j]);
-        _mm_storeu_si128(&((__m128i*)out)[i], feedback);
-    }
-}
-
-void aes_CBC_decrypt(const unsigned char *in,
-	unsigned char *out,
-	unsigned char ivec[16],
-	unsigned long length,
-	unsigned char *key,
-	int number_of_rounds)
-{
-	__m128i data, feedback, last_in;
-	unsigned long i;
-	int j;
-	if(length % 16)
-		length = length / 16 + 1;
-	else length /= 16;
-	feedback = _mm_loadu_si128((__m128i*)ivec);
-	for(i = 0; i < length; i++)
-	{
-		last_in = _mm_loadu_si128(&((__m128i*)in)[i]);
-		data = _mm_xor_si128(last_in, ((__m128i*)key)[0]);
-		for(j = 1; j <number_of_rounds; j++)
-		{
-			data = _mm_aesdec_si128(data, ((__m128i*)key)[j]);
-		}
-		data = _mm_aesdeclast_si128(data, ((__m128i*)key)[j]);
-		data = _mm_xor_si128(data, feedback);
-		_mm_storeu_si128(&((__m128i*)out)[i], data);
-		feedback = last_in;
-	}
-}
-
-void AES_CTR_encrypt(const unsigned char *in,
-	unsigned char *out,
-	const unsigned char ivec[8],
-	const unsigned char nonce[4],
-	unsigned long length,
-	const unsigned char *key,
-	int number_of_rounds)
-{
-	__m128i ctr_block = { 0 }, tmp, ONE, BSWAP_EPI64;
-	unsigned long i;
-	int j;
-	if(length % 16)
-		length = length / 16 + 1;
-	else length /= 16;
-	ONE = _mm_set_epi32(0, 1, 0, 0);
-	BSWAP_EPI64 = _mm_setr_epi8(7, 6, 5, 4, 3, 2, 1, 0, 15, 14, 13, 12, 11, 10, 9, 8);
-#ifdef _MSC_VER
-	ctr_block = _mm_insert_epi64(ctr_block, *(long long*)ivec, 1);
-#else
-	ctr_block = _mm_set_epi64(*(__m64*)ivec, *(__m64*)&ctr_block);
-#endif
-	ctr_block = _mm_insert_epi32(ctr_block, *(long*)nonce, 1);
-	ctr_block = _mm_srli_si128(ctr_block, 4);
-	ctr_block = _mm_shuffle_epi8(ctr_block, BSWAP_EPI64);
-	ctr_block = _mm_add_epi64(ctr_block, ONE);
-	for(i = 0; i < length; i++)
-	{
-		tmp = _mm_shuffle_epi8(ctr_block, BSWAP_EPI64);
-		ctr_block = _mm_add_epi64(ctr_block, ONE);
-		tmp = _mm_xor_si128(tmp, ((__m128i*)key)[0]);
-		for(j = 1; j <number_of_rounds; j++)
-		{
-			tmp = _mm_aesenc_si128(tmp, ((__m128i*)key)[j]);
-		};
-		tmp = _mm_aesenclast_si128(tmp, ((__m128i*)key)[j]);
-		tmp = _mm_xor_si128(tmp, _mm_loadu_si128(&((__m128i*)in)[i]));
-		_mm_storeu_si128(&((__m128i*)out)[i], tmp);
-	}
-}
-#endif
-#endif
-
-#endif
@@ -1,59 +0,0 @@
-/*
-Copyright (c) 1998-2013, Brian Gladman, Worcester, UK. All rights reserved.
-
-The redistribution and use of this software (with or without changes)
-is allowed without the payment of fees or royalties provided that:
-
-  source code distributions include the above copyright notice, this
-  list of conditions and the following disclaimer;
-
-  binary distributions include the above copyright notice, this list
-  of conditions and the following disclaimer in their documentation.
-
-This software is provided 'as is' with no explicit or implied warranties
-in respect of its operation, including, but not limited to, correctness
-and fitness for purpose.
---------------------------------------------------------------------------
-Issue Date: 13/11/2013
-*/
-
-#ifndef AES_NI_H
-#define AES_NI_H
-
-#define USE_AES_CONTEXT
-
-#include "aesopt.h"
-
-#if defined( USE_INTEL_AES_IF_PRESENT )
-
-/* map names in C code to make them internal ('name' -> 'aes_name_i') */
-#define aes_xi(x) aes_ ## x ## _i
-
-/* map names here to provide the external API ('name' -> 'aes_name') */
-#define aes_ni(x) aes_ ## x
-
-AES_RETURN aes_ni(encrypt_key128)(const unsigned char *key, aes_encrypt_ctx cx[1]);
-AES_RETURN aes_ni(encrypt_key192)(const unsigned char *key, aes_encrypt_ctx cx[1]);
-AES_RETURN aes_ni(encrypt_key256)(const unsigned char *key, aes_encrypt_ctx cx[1]);
-
-AES_RETURN aes_ni(decrypt_key128)(const unsigned char *key, aes_decrypt_ctx cx[1]);
-AES_RETURN aes_ni(decrypt_key192)(const unsigned char *key, aes_decrypt_ctx cx[1]);
-AES_RETURN aes_ni(decrypt_key256)(const unsigned char *key, aes_decrypt_ctx cx[1]);
-
-AES_RETURN aes_ni(encrypt)(const unsigned char *in, unsigned char *out, const aes_encrypt_ctx cx[1]);
-AES_RETURN aes_ni(decrypt)(const unsigned char *in, unsigned char *out, const aes_decrypt_ctx cx[1]);
-
-AES_RETURN aes_xi(encrypt_key128)(const unsigned char *key, aes_encrypt_ctx cx[1]);
-AES_RETURN aes_xi(encrypt_key192)(const unsigned char *key, aes_encrypt_ctx cx[1]);
-AES_RETURN aes_xi(encrypt_key256)(const unsigned char *key, aes_encrypt_ctx cx[1]);
-
-AES_RETURN aes_xi(decrypt_key128)(const unsigned char *key, aes_decrypt_ctx cx[1]);
-AES_RETURN aes_xi(decrypt_key192)(const unsigned char *key, aes_decrypt_ctx cx[1]);
-AES_RETURN aes_xi(decrypt_key256)(const unsigned char *key, aes_decrypt_ctx cx[1]);
-
-AES_RETURN aes_xi(encrypt)(const unsigned char *in, unsigned char *out, const aes_encrypt_ctx cx[1]);
-AES_RETURN aes_xi(decrypt)(const unsigned char *in, unsigned char *out, const aes_decrypt_ctx cx[1]);
-
-#endif
-
-#endif
@@ -188,7 +188,7 @@ Issue Date: 20/12/2007
 	built
 */

-#if 1 && defined( INTEL_AES_POSSIBLE ) && !defined( USE_INTEL_AES_IF_PRESENT )
+#if 0 && defined( INTEL_AES_POSSIBLE ) && !defined( USE_INTEL_AES_IF_PRESENT )
 #  define USE_INTEL_AES_IF_PRESENT
 #endif

@@ -1,5 +1,5 @@
 /* minizip.c
-   Version 2.2.7, January 30th, 2018
+   Version 2.3.0, May 3rd, 2018
   part of the MiniZip project

   Copyright (C) 2010-2018 Nathan Moinvaziri
@@ -47,7 +47,7 @@ void minizip_help()
           "  -o  Overwrite existing files\n" \
           "  -a  Append to existing zip file\n" \
           "  -u  Buffered reading and writing\n" \
-           "  -j  Exclude path of files\n" \
+           "  -i  Include full path of files\n" \
           "  -0  Store only\n" \
           "  -1  Compress faster\n" \
           "  -9  Compress better\n" \
@@ -68,7 +68,7 @@ void minizip_help()
 /***************************************************************************/

 typedef struct minizip_opt_s {
-    uint8_t exclude_path;
+    uint8_t include_path;
    int16_t compress_level;
    int16_t compress_method;
    uint8_t overwrite;
@@ -79,42 +79,27 @@ typedef struct minizip_opt_s {

 /***************************************************************************/

-int32_t minizip_add_file(void *handle, const char *path, const char *password, minizip_opt *options)
+int32_t minizip_add_path(void *handle, const char *path, const char *filenameinzip, const char *password, int16_t is_dir, minizip_opt *options)
 {
-    mz_zip_file file_info = { 0 };
+    mz_zip_file file_info;
    int32_t read = 0;
    int32_t written = 0;
    int32_t err = MZ_OK;
    int32_t err_close = MZ_OK;
    void *stream = NULL;
-    const char *filenameinzip = NULL;
    char buf[INT16_MAX];


-    // Construct the filename that our file will be stored in the zip as.
-    // The path name saved, should not include a leading slash.
-    // If it did, windows/xp and dynazip couldn't read the zip file. 
+    memset(&file_info, 0, sizeof(file_info));

-    filenameinzip = path;
+    // The path name saved, should not include a leading slash.
+    // If it did, windows/xp and dynazip couldn't read the zip file.
+
+    if (filenameinzip == NULL)
+        filenameinzip = path;
    while (filenameinzip[0] == '\\' || filenameinzip[0] == '/')
        filenameinzip += 1;

-    // Should the file be stored with any path info at all?
-    if (options->exclude_path)
-    {
-        const char *match = NULL;
-        const char *last_slash = NULL;
-
-        for (match = filenameinzip; *match; match += 1)
-        {
-            if (*match == '\\' || *match == '/')
-                last_slash = match;
-        }
-
-        if (last_slash != NULL)
-            filenameinzip = last_slash + 1; // base filename follows last slash
-    }
-    
    // Get information about the file on disk so we can store it in zip
    printf("Adding: %s\n", filenameinzip);

@@ -128,8 +113,9 @@ int32_t minizip_add_file(void *handle, const char *path, const char *password, m
        file_info.aes_version = MZ_AES_VERSION;
 #endif

-    mz_os_get_file_date(path, &file_info.modified_date, &file_info.accessed_date, 
+    mz_os_get_file_date(path, &file_info.modified_date, &file_info.accessed_date,
        &file_info.creation_date);
+    mz_os_get_file_attribs(path, &file_info.external_fa);

    // Add to zip
    err = mz_zip_entry_write_open(handle, &file_info, options->compress_level, password);
@@ -139,43 +125,45 @@ int32_t minizip_add_file(void *handle, const char *path, const char *password, m
        return err;
    }

-    mz_stream_os_create(&stream);
-
-    err = mz_stream_os_open(stream, path, MZ_OPEN_MODE_READ);
-
-    if (err == MZ_OK)
+    if (!is_dir)
    {
-        // Read contents of file and write it to zip
-        do
+        mz_stream_os_create(&stream);
+
+        err = mz_stream_os_open(stream, path, MZ_OPEN_MODE_READ);
+
+        if (err == MZ_OK)
        {
-            read = mz_stream_os_read(stream, buf, sizeof(buf));
-            if (read < 0)
+            // Read contents of file and write it to zip
+            do
            {
-                err = mz_stream_os_error(stream);
-                printf("Error %d in reading %s\n", err, filenameinzip);
-                break;
-            }
-            if (read == 0)
-                break;
+                read = mz_stream_os_read(stream, buf, sizeof(buf));
+                if (read < 0)
+                {
+                    err = mz_stream_os_error(stream);
+                    printf("Error %d in reading %s\n", err, filenameinzip);
+                    break;
+                }
+                if (read == 0)
+                    break;

-            written = mz_zip_entry_write(handle, buf, read);
-            if (written != read)
-            {
-                err = mz_stream_os_error(stream);
-                printf("Error in writing %s in the zip file (%d)\n", filenameinzip, err);
-                break;
-            }
+                written = mz_zip_entry_write(handle, buf, read);
+                if (written != read)
+                {
+                    err = mz_stream_os_error(stream);
+                    printf("Error in writing %s in the zip file (%d)\n", filenameinzip, err);
+                    break;
+                }
+            } while (err == MZ_OK);
+
+            mz_stream_os_close(stream);
+        }
+        else
+        {
+            printf("Error in opening %s for reading\n", path);
        }
-        while (err == MZ_OK);

-        mz_stream_os_close(stream);
+        mz_stream_os_delete(&stream);
    }
-    else
-    {
-        printf("Error in opening %s for reading\n", path);
-    }
-
-    mz_stream_os_delete(&stream);

    err_close = mz_zip_entry_close(handle);
    if (err_close != MZ_OK)
@@ -187,16 +175,51 @@ int32_t minizip_add_file(void *handle, const char *path, const char *password, m
    return err;
 }

-int32_t minizip_add(void *handle, const char *path, const char *password, minizip_opt *options, uint8_t recursive)
+int32_t minizip_add(void *handle, const char *path, const char *root_path, const char *password, minizip_opt *options, uint8_t recursive)
 {
    DIR *dir = NULL;
    struct dirent *entry = NULL;
-    int32_t err = 0;
+    int32_t err =  MZ_OK;
+    int16_t is_dir = 0;
    char full_path[320];
+    const char *filenameinzip = path;


-    if (mz_os_is_dir(path) != MZ_OK)
-        return minizip_add_file(handle, path, password, options);
+    if (mz_os_is_dir(path) == MZ_OK)
+        is_dir = 1;
+
+    // Construct the filename that our file will be stored in the zip as
+    if (root_path == NULL)
+        root_path = path;
+
+    // Should the file be stored with any path info at all?
+    if (!options->include_path)
+    {
+        if (!is_dir && root_path == path)
+        {
+            const char *match = NULL;
+            const char *last_slash = NULL;
+
+            for (match = filenameinzip; *match; match += 1)
+            {
+                if (*match == '\\' || *match == '/')
+                    last_slash = match;
+            }
+
+            if (last_slash != NULL)
+                filenameinzip = last_slash + 1; // base filename follows last slash
+        }
+        else
+        {
+            filenameinzip += strlen(root_path);
+        }
+    }
+
+    if (*filenameinzip != 0)
+        err = minizip_add_path(handle, path, filenameinzip, password, is_dir, options);
+
+    if (!is_dir)
+        return err;

    dir = mz_os_open_dir(path);

@@ -218,7 +241,7 @@ int32_t minizip_add(void *handle, const char *path, const char *password, minizi
        if (!recursive && mz_os_is_dir(full_path))
            continue;

-        err = minizip_add(handle, full_path, password, options, recursive);
+        err = minizip_add(handle, full_path, root_path, password, options, recursive);
        if (err != MZ_OK)
            return err;
    }
@@ -235,7 +258,7 @@ int32_t minizip_list(void *handle)
    uint32_t ratio = 0;
    int16_t level = 0;
    int32_t err = MZ_OK;
-    struct tm tmu_date = { 0 };
+    struct tm tmu_date;
    const char *string_method = NULL;
    char crypt = ' ';

@@ -248,8 +271,8 @@ int32_t minizip_list(void *handle)
        return err;
    }

-    printf("  Length  Method     Size Ratio   Date    Time   CRC-32     Name\n");
-    printf("  ------  ------     ---- -----   ----    ----   ------     ----\n");
+    printf("  Length  Method     Size  Attribs Ratio   Date    Time   CRC-32     Name\n");
+    printf("  ------  ------     ----  ------- -----   ----    ----   ------     ----\n");

    while (err == MZ_OK)
    {
@@ -261,9 +284,10 @@ int32_t minizip_list(void *handle)
            break;
        }

+        ratio = 0;
        if (file_info->uncompressed_size > 0)
            ratio = (uint32_t)((file_info->compressed_size * 100) / file_info->uncompressed_size);
-        
+
        // Display a '*' if the file is encrypted
        if (file_info->flag & MZ_ZIP_FLAG_ENCRYPTED)
            crypt = '*';
@@ -271,7 +295,7 @@ int32_t minizip_list(void *handle)
        switch (file_info->compression_method)
        {
        case MZ_COMPRESS_METHOD_RAW:
-            string_method = "Stored"; 
+            string_method = "Stored";
            break;
        case MZ_COMPRESS_METHOD_DEFLATE:
            level = (int16_t)((file_info->flag & 0x6) / 2);
@@ -296,9 +320,10 @@ int32_t minizip_list(void *handle)

        mz_zip_time_t_to_tm(file_info->modified_date, &tmu_date);

-        printf(" %7"PRIu64"  %6s%c %7"PRIu64" %3"PRIu32"%%  %2.2"PRIu32"-%2.2"PRIu32\
+        printf(" %7"PRIu64"  %6s%c %7"PRIu64" %8"PRIx32" %3"PRIu32"%%  %2.2"PRIu32"-%2.2"PRIu32\
               "-%2.2"PRIu32"  %2.2"PRIu32":%2.2"PRIu32"  %8.8"PRIx32"   %s\n",
-                file_info->uncompressed_size, string_method, crypt, file_info->compressed_size, ratio, 
+                file_info->uncompressed_size, string_method, crypt,
+                file_info->compressed_size, file_info->external_fa, ratio,
                (uint32_t)tmu_date.tm_mon + 1, (uint32_t)tmu_date.tm_mday,
                (uint32_t)tmu_date.tm_year % 100,
                (uint32_t)tmu_date.tm_hour, (uint32_t)tmu_date.tm_min,
@@ -329,7 +354,6 @@ int32_t minizip_extract_currentfile(void *handle, const char *destination, const
    int32_t written = 0;
    int32_t err = MZ_OK;
    int32_t err_close = MZ_OK;
-    uint8_t skip = 0;
    void *stream = NULL;
    char *match = NULL;
    char *filename = NULL;
@@ -355,22 +379,22 @@ int32_t minizip_extract_currentfile(void *handle, const char *destination, const

    // Construct output path
    out_path[0] = 0;
-    if (destination != NULL)
-        mz_path_combine(out_path, destination, sizeof(out_path));
-    if (options->exclude_path)
-        mz_path_combine(out_path, filename, sizeof(out_path));
+    if ((*file_info->filename == '/') || (file_info->filename[1] == ':'))
+    {
+        strncpy(out_path, file_info->filename, sizeof(out_path));
+    }
    else
+    {
+        if (destination != NULL)
+            mz_path_combine(out_path, destination, sizeof(out_path));
        mz_path_combine(out_path, file_info->filename, sizeof(out_path));
+    }

    // If zip entry is a directory then create it on disk
-    if (*filename == 0)
+    if (mz_zip_attrib_is_dir(file_info->external_fa, file_info->version_madeby) == MZ_OK)
    {
-        if (options->exclude_path == 0)
-        {
-            printf("Creating directory: %s\n", out_path);
-            mz_make_dir(out_path);
-        }
-
+        printf("Creating directory: %s\n", out_path);
+        mz_make_dir(out_path);
        return err;
    }

@@ -399,7 +423,7 @@ int32_t minizip_extract_currentfile(void *handle, const char *destination, const
        while ((rep != 'Y') && (rep != 'N') && (rep != 'A'));

        if (rep == 'N')
-            skip = 1;
+            return err;
        if (rep == 'A')
            options->overwrite = 1;
    }
@@ -407,11 +431,11 @@ int32_t minizip_extract_currentfile(void *handle, const char *destination, const
    mz_stream_os_create(&stream);

    // Create the file on disk so we can unzip to it
-    if ((skip == 0) && (err == MZ_OK))
+    if (err == MZ_OK)
    {
        // Some zips don't contain directory alone before file
        if ((mz_stream_os_open(stream, out_path, MZ_OPEN_MODE_CREATE) != MZ_OK) &&
-            (options->exclude_path == 0) && (filename != file_info->filename))
+            (filename != file_info->filename))
        {
            // Create the directory of the output path
            strncpy(directory, out_path, sizeof(directory));
@@ -460,7 +484,7 @@ int32_t minizip_extract_currentfile(void *handle, const char *destination, const

        // Set the time of the file that has been unzipped
        if (err == MZ_OK)
-            mz_os_set_file_date(out_path, file_info->modified_date, file_info->accessed_date, 
+            mz_os_set_file_date(out_path, file_info->modified_date, file_info->accessed_date,
                file_info->creation_date);
    }
    else
@@ -483,7 +507,6 @@ int32_t minizip_extract_currentfile(void *handle, const char *destination, const
 int32_t minizip_extract_all(void *handle, const char *destination, const char *password, minizip_opt *options)
 {
    int32_t err = MZ_OK;
-    

    err = mz_zip_goto_first_entry(handle);

@@ -580,8 +603,8 @@ int main(int argc, char *argv[])
                    buffered = 1;
                if ((c == 'o') || (c == 'O'))
                    options.overwrite = 1;
-                if ((c == 'j') || (c == 'J'))
-                    options.exclude_path = 1;
+                if ((c == 'i') || (c == 'I'))
+                    options.include_path = 1;
                if ((c >= '0') && (c <= '9'))
                {
                    options.compress_level = (c - '0');
@@ -694,7 +717,7 @@ int main(int argc, char *argv[])
    {
        mz_stream_set_base(split_stream, file_stream);
    }
-    
+
    mz_stream_split_set_prop_int64(split_stream, MZ_STREAM_PROP_DISK_SIZE, disk_size);

    err = mz_stream_open(split_stream, path, mode);
@@ -737,7 +760,7 @@ int main(int argc, char *argv[])

            // Go through command line args looking for files to add to zip
            for (i = path_arg + 1; (i < argc) && (err == MZ_OK); i += 1)
-                err = minizip_add(handle, argv[i], password, &options, 1);
+                err = minizip_add(handle, argv[i], NULL, password, &options, 1);

            mz_zip_set_version_madeby(handle, MZ_VERSION_MADEBY);
        }
@@ -8,6 +8,6 @@ Name: minizip
 Description: Minizip zip file manipulation library
 Version: @VERSION@

-Requires:
-Libs: -L${libdir} -L${sharedlibdir} -lz -lminizip
+Requires: zlib
+Libs: -L${libdir} -L${sharedlibdir} -lminizip
 Cflags: -I${includedir}
@@ -1,5 +1,5 @@
 /* mz.h -- Errors codes, zip flags and magic
-   Version 2.2.7, January 30th, 2018
+   Version 2.3.0, May 3rd, 2018
   part of the MiniZip project

   Copyright (C) 2010-2018 Nathan Moinvaziri
@@ -19,7 +19,7 @@ extern "C" {
 /***************************************************************************/

 // MZ_VERSION
-#define MZ_VERSION                      ("2.2.7")
+#define MZ_VERSION                      ("2.3.0")

 // MZ_ERROR
 #define MZ_OK                           (0)
@@ -71,12 +71,33 @@ extern "C" {
                                         MZ_ZIP_FLAG_DEFLATE_MAX)
 #define MZ_ZIP_FLAG_DATA_DESCRIPTOR     (1 << 3)

+// MZ_ZIP64
+#define MZ_ZIP64_AUTO                   (0)
+#define MZ_ZIP64_FORCE                  (1)
+#define MZ_ZIP64_DISABLE                (2)
+
+// MZ_HOST_SYSTEM
+#define MZ_HOST_SYSTEM_MSDOS            (0)
+#define MZ_HOST_SYSTEM_UNIX             (3)
+#define MZ_HOST_SYSTEM_WINDOWS_NTFS     (10)
+#define MZ_HOST_SYSTEM_OSX_DARWIN       (19)
+
 // MZ_AES
 #define MZ_AES_VERSION                  (1)
 #define MZ_AES_ENCRYPTION_MODE_128      (0x01)
 #define MZ_AES_ENCRYPTION_MODE_192      (0x02)
 #define MZ_AES_ENCRYPTION_MODE_256      (0x03)

+// MZ_UTILITY
+#define MZ_UNUSED(SYMBOL)               ((void)SYMBOL)
+
+#ifndef MZ_CUSTOM_ALLOC
+#define MZ_ALLOC(SIZE)                  (malloc(SIZE))
+#endif
+#ifndef MZ_CUSTOM_FREE
+#define MZ_FREE(PTR)                    (free(PTR))
+#endif
+
 /***************************************************************************/

 #ifdef __cplusplus
@@ -1,5 +1,5 @@
 /* mz_compat.c -- Backwards compatible interface for older versions
-   Version 2.2.7, January 30th, 2018
+   Version 2.3.0, May 3rd, 2018
   part of the MiniZip project

   Copyright (C) 2010-2018 Nathan Moinvaziri
@@ -50,7 +50,7 @@ extern zipFile ZEXPORT zipOpen2(const char *path, int append, const char **globa
    return zipOpen2_64(path, append, globalcomment, pzlib_filefunc_def);
 }

-extern zipFile ZEXPORT zipOpen2_64(const void *path, int append, const char **globalcomment, 
+extern zipFile ZEXPORT zipOpen2_64(const void *path, int append, const char **globalcomment,
    zlib_filefunc64_def *pzlib_filefunc_def)
 {
    mz_compat *compat = NULL;
@@ -59,8 +59,16 @@ extern zipFile ZEXPORT zipOpen2_64(const void *path, int append, const char **gl
    void *handle = NULL;
    void *stream = NULL;

-    if (mz_stream_create(&stream, (mz_stream_vtbl *)*pzlib_filefunc_def) == NULL)
-        return NULL;
+    if (pzlib_filefunc_def)
+    {
+        if (mz_stream_create(&stream, (mz_stream_vtbl *)*pzlib_filefunc_def) == NULL)
+            return NULL;
+    }
+    else
+    {
+        if (mz_stream_os_create(&stream) == NULL)
+            return NULL;
+    }

    switch (append)
    {
@@ -92,7 +100,7 @@ extern zipFile ZEXPORT zipOpen2_64(const void *path, int append, const char **gl
    if (globalcomment != NULL)
        mz_zip_get_comment(handle, globalcomment);

-    compat = (mz_compat *)malloc(sizeof(mz_compat));
+    compat = (mz_compat *)MZ_ALLOC(sizeof(mz_compat));
    compat->handle = handle;
    compat->stream = stream;

@@ -100,24 +108,35 @@ extern zipFile ZEXPORT zipOpen2_64(const void *path, int append, const char **gl
 }

 extern int ZEXPORT zipOpenNewFileInZip5(zipFile file, const char *filename, const zip_fileinfo *zipfi,
-    const void *extrafield_local, uint16_t size_extrafield_local, const void *extrafield_global,
-    uint16_t size_extrafield_global, const char *comment, uint16_t compression_method, int level, 
-    int raw, int windowBits, int memLevel, int strategy, const char *password, 
+    ZIP_UNUSED const void *extrafield_local, ZIP_UNUSED uint16_t size_extrafield_local, const void *extrafield_global,
+    uint16_t size_extrafield_global, const char *comment, uint16_t compression_method, int level,
+    int raw, ZIP_UNUSED int windowBits, ZIP_UNUSED int memLevel, ZIP_UNUSED int strategy, const char *password,
    ZIP_UNUSED uint32_t crc_for_crypting,  uint16_t version_madeby, uint16_t flag_base, int zip64)
 {
    mz_compat *compat = (mz_compat *)file;
    mz_zip_file file_info;
+    uint64_t dos_date = 0;

    if (compat == NULL)
-        return MZ_PARAM_ERROR;
+        return ZIP_PARAMERROR;
+
+    memset(&file_info, 0, sizeof(file_info));

    if (zipfi != NULL)
    {
-        file_info.modified_date = mz_zip_dosdate_to_time_t(zipfi->dos_date);
+        if (zipfi->dosDate != 0)
+            dos_date = zipfi->dosDate;
+        else
+            dos_date = mz_zip_tm_to_dosdate(&zipfi->tmz_date);
+
+        file_info.modified_date = mz_zip_dosdate_to_time_t(dos_date);
        file_info.external_fa = zipfi->external_fa;
        file_info.internal_fa = zipfi->internal_fa;
    }

+    if (filename == NULL)
+        filename = "-";
+
    file_info.compression_method = compression_method;
    file_info.filename = (char *)filename;
    //file_info.extrafield_local = extrafield_local;
@@ -127,8 +146,13 @@ extern int ZEXPORT zipOpenNewFileInZip5(zipFile file, const char *filename, cons
    file_info.version_madeby = version_madeby;
    file_info.comment = (char *)comment;
    file_info.flag = flag_base;
+    if (zip64)
+        file_info.zip64 = MZ_ZIP64_FORCE;
+    else
+        file_info.zip64 = MZ_ZIP64_DISABLE;
 #ifdef HAVE_AES
-    file_info.aes_version = MZ_AES_VERSION;
+    if (password)
+        file_info.aes_version = MZ_AES_VERSION;
 #endif

    if (raw)
@@ -139,45 +163,45 @@ extern int ZEXPORT zipOpenNewFileInZip5(zipFile file, const char *filename, cons

 extern int ZEXPORT zipOpenNewFileInZip4_64(zipFile file, const char *filename, const zip_fileinfo *zipfi,
    const void *extrafield_local, uint16_t size_extrafield_local, const void *extrafield_global,
-    uint16_t size_extrafield_global, const char *comment, uint16_t compression_method, int level, 
-    int raw, int windowBits, int memLevel,   int strategy, const char *password, 
-    ZIP_UNUSED uint32_t crc_for_crypting, uint16_t version_madeby, uint16_t flag_base, int zip64)
+    uint16_t size_extrafield_global, const char *comment, uint16_t compression_method, int level,
+    int raw, int windowBits, int memLevel,   int strategy, const char *password,
+    uint32_t crc_for_crypting, uint16_t version_madeby, uint16_t flag_base, int zip64)
 {
-    return zipOpenNewFileInZip5(file, filename, zipfi, extrafield_local, size_extrafield_local, 
-        extrafield_global, size_extrafield_global, comment, compression_method, level, raw, windowBits, 
+    return zipOpenNewFileInZip5(file, filename, zipfi, extrafield_local, size_extrafield_local,
+        extrafield_global, size_extrafield_global, comment, compression_method, level, raw, windowBits,
        memLevel, strategy, password, crc_for_crypting, version_madeby, flag_base, zip64);
 }

 extern int ZEXPORT zipOpenNewFileInZip4(zipFile file, const char *filename, const zip_fileinfo *zipfi,
    const void *extrafield_local, uint16_t size_extrafield_local, const void *extrafield_global,
-    uint16_t size_extrafield_global, const char *comment, uint16_t compression_method, int level, 
-    int raw, int windowBits, int memLevel, int strategy, const char *password, 
-    ZIP_UNUSED uint32_t crc_for_crypting, uint16_t version_madeby, uint16_t flag_base)
+    uint16_t size_extrafield_global, const char *comment, uint16_t compression_method, int level,
+    int raw, int windowBits, int memLevel, int strategy, const char *password,
+    uint32_t crc_for_crypting, uint16_t version_madeby, uint16_t flag_base)
 {
    return zipOpenNewFileInZip4_64(file, filename, zipfi, extrafield_local, size_extrafield_local,
-        extrafield_global, size_extrafield_global, comment, compression_method, level, raw, windowBits, 
+        extrafield_global, size_extrafield_global, comment, compression_method, level, raw, windowBits,
        memLevel, strategy, password, crc_for_crypting, version_madeby, flag_base, 0);
 }

 extern int ZEXPORT zipOpenNewFileInZip3(zipFile file, const char *filename, const zip_fileinfo *zipfi,
    const void *extrafield_local, uint16_t size_extrafield_local, const void *extrafield_global,
-    uint16_t size_extrafield_global, const char *comment, uint16_t compression_method, int level, 
-    int raw, int windowBits, int memLevel, int strategy, const char *password, 
-    ZIP_UNUSED uint32_t crc_for_crypting)
+    uint16_t size_extrafield_global, const char *comment, uint16_t compression_method, int level,
+    int raw, int windowBits, int memLevel, int strategy, const char *password,
+    uint32_t crc_for_crypting)
 {
    return zipOpenNewFileInZip4_64(file, filename, zipfi, extrafield_local, size_extrafield_local,
-        extrafield_global, size_extrafield_global, comment, compression_method, level, raw, windowBits, 
+        extrafield_global, size_extrafield_global, comment, compression_method, level, raw, windowBits,
        memLevel, strategy, password, crc_for_crypting, MZ_VERSION_MADEBY, 0, 0);
 }

 extern int ZEXPORT zipOpenNewFileInZip3_64(zipFile file, const char *filename, const zip_fileinfo *zipfi,
    const void *extrafield_local, uint16_t size_extrafield_local, const void *extrafield_global,
-    uint16_t size_extrafield_global, const char *comment, uint16_t compression_method, int level, 
-    int raw, int windowBits, int memLevel, int strategy, const char *password, 
-    ZIP_UNUSED uint32_t crc_for_crypting, int zip64)
+    uint16_t size_extrafield_global, const char *comment, uint16_t compression_method, int level,
+    int raw, int windowBits, int memLevel, int strategy, const char *password,
+    uint32_t crc_for_crypting, int zip64)
 {
    return zipOpenNewFileInZip4_64(file, filename, zipfi, extrafield_local, size_extrafield_local,
-        extrafield_global, size_extrafield_global, comment, compression_method, level, raw, windowBits, 
+        extrafield_global, size_extrafield_global, comment, compression_method, level, raw, windowBits,
        memLevel, strategy, password, crc_for_crypting, MZ_VERSION_MADEBY, 0, zip64);
 }

@@ -185,15 +209,22 @@ extern int ZEXPORT zipWriteInFileInZip(zipFile file, const void *buf, uint32_t l
 {
    mz_compat *compat = (mz_compat *)file;
    if (compat == NULL)
-        return MZ_PARAM_ERROR;
-    return mz_zip_entry_write(compat->handle, buf, len);
+        return ZIP_PARAMERROR;
+    if (mz_zip_entry_write(compat->handle, buf, len) != len)
+        return ZIP_ERRNO;
+    return ZIP_OK;
 }

 extern int ZEXPORT zipCloseFileInZipRaw(zipFile file, uint32_t uncompressed_size, uint32_t crc32)
+{
+    return zipCloseFileInZipRaw64(file, uncompressed_size, crc32);
+}
+
+extern int ZEXPORT zipCloseFileInZipRaw64(zipFile file, uint64_t uncompressed_size, uint32_t crc32)
 {
    mz_compat *compat = (mz_compat *)file;
    if (compat == NULL)
-        return MZ_PARAM_ERROR;
+        return ZIP_PARAMERROR;
    return mz_zip_entry_close_raw(compat->handle, uncompressed_size, crc32);
 }

@@ -223,7 +254,7 @@ extern int ZEXPORT zipClose2_64(zipFile file, const char *global_comment, uint16
    int32_t err = MZ_OK;

    if (compat == NULL)
-        return MZ_PARAM_ERROR;
+        return ZIP_PARAMERROR;

    if (global_comment != NULL)
        mz_zip_set_comment(compat->handle, global_comment);
@@ -237,7 +268,7 @@ extern int ZEXPORT zipClose2_64(zipFile file, const char *global_comment, uint16
        mz_stream_delete(&compat->stream);
    }

-    free(compat);
+    MZ_FREE(compat);

    return err;
 }
@@ -267,9 +298,17 @@ extern unzFile ZEXPORT unzOpen2_64(const void *path, zlib_filefunc64_def *pzlib_
    void *handle = NULL;
    void *stream = NULL;

-    if (mz_stream_create(&stream, (mz_stream_vtbl *)*pzlib_filefunc_def) == NULL)
-        return NULL;
-    
+    if (pzlib_filefunc_def)
+    {
+        if (mz_stream_create(&stream, (mz_stream_vtbl *)*pzlib_filefunc_def) == NULL)
+            return NULL;
+    }
+    else
+    {
+        if (mz_stream_os_create(&stream) == NULL)
+            return NULL;
+    }
+
    if (mz_stream_open(stream, path, mode) != MZ_OK)
    {
        mz_stream_delete(&stream);
@@ -284,7 +323,7 @@ extern unzFile ZEXPORT unzOpen2_64(const void *path, zlib_filefunc64_def *pzlib_
        return NULL;
    }

-    compat = (mz_compat *)malloc(sizeof(mz_compat));
+    compat = (mz_compat *)MZ_ALLOC(sizeof(mz_compat));
    compat->handle = handle;
    compat->stream = stream;

@@ -298,7 +337,7 @@ extern int ZEXPORT unzClose(unzFile file)
    int32_t err = MZ_OK;

    if (compat == NULL)
-        return MZ_PARAM_ERROR;
+        return UNZ_PARAMERROR;

    err = mz_zip_close(compat->handle);

@@ -308,7 +347,7 @@ extern int ZEXPORT unzClose(unzFile file)
        mz_stream_delete(&compat->stream);
    }

-    free(compat);
+    MZ_FREE(compat);

    return err;
 }
@@ -319,17 +358,18 @@ extern int ZEXPORT unzGetGlobalInfo(unzFile file, unz_global_info* pglobal_info3
    unz_global_info64 global_info64;
    int32_t err = MZ_OK;

+    memset(pglobal_info32, 0, sizeof(unz_global_info));
    if (compat == NULL)
-        return MZ_PARAM_ERROR;
+        return UNZ_PARAMERROR;

    err = unzGetGlobalInfo64(file, &global_info64);
-    if (err != UNZ_OK)
+    if (err == MZ_OK)
    {
        pglobal_info32->number_entry = (uint32_t)global_info64.number_entry;
        pglobal_info32->size_comment = global_info64.size_comment;
        pglobal_info32->number_disk_with_CD = global_info64.number_disk_with_CD;
    }
-    return MZ_OK;
+    return err;
 }

 extern int ZEXPORT unzGetGlobalInfo64(unzFile file, unz_global_info64 *pglobal_info)
@@ -338,12 +378,16 @@ extern int ZEXPORT unzGetGlobalInfo64(unzFile file, unz_global_info64 *pglobal_i
    const char *comment_ptr = NULL;
    int32_t err = MZ_OK;

+    memset(pglobal_info, 0, sizeof(unz_global_info64));
    if (compat == NULL)
-        return MZ_PARAM_ERROR;
+        return UNZ_PARAMERROR;
    err = mz_zip_get_comment(compat->handle, &comment_ptr);
    if (err == MZ_OK)
        pglobal_info->size_comment = (uint16_t)strlen(comment_ptr);
-    mz_zip_get_number_entry(compat->handle, (int64_t *)&pglobal_info->number_entry);
+    if ((err == MZ_OK) || (err == MZ_EXIST_ERROR))
+        err = mz_zip_get_number_entry(compat->handle, (int64_t *)&pglobal_info->number_entry);
+    if (err == MZ_OK)
+        err = mz_zip_get_disk_number_with_cd(compat->handle, &pglobal_info->number_disk_with_CD);
    return err;
 }

@@ -354,7 +398,7 @@ extern int ZEXPORT unzGetGlobalComment(unzFile file, char *comment, uint16_t com
    int32_t err = MZ_OK;

    if (comment == NULL || comment_size == 0)
-        return MZ_PARAM_ERROR;
+        return UNZ_PARAMERROR;
    err = mz_zip_get_comment(compat->handle, &comment_ptr);
    if (err == MZ_OK)
        strncpy(comment, comment_ptr, comment_size);
@@ -365,7 +409,7 @@ extern int ZEXPORT unzOpenCurrentFile3(unzFile file, int *method, int *level, in
 {
    mz_compat *compat = (mz_compat *)file;
    if (compat == NULL)
-        return MZ_PARAM_ERROR;
+        return UNZ_PARAMERROR;
    if (method != NULL)
        *method = 0;
    if (level != NULL)
@@ -392,7 +436,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 UNZ_PARAMERROR;
    return mz_zip_entry_read(compat->handle, buf, len);
 }

@@ -400,7 +444,7 @@ extern int ZEXPORT unzCloseCurrentFile(unzFile file)
 {
    mz_compat *compat = (mz_compat *)file;
    if (compat == NULL)
-        return MZ_PARAM_ERROR;
+        return UNZ_PARAMERROR;
    return mz_zip_entry_close(compat->handle);
 }

@@ -413,7 +457,8 @@ extern int ZEXPORT unzGetCurrentFileInfo(unzFile file, unz_file_info *pfile_info
    int32_t err = MZ_OK;

    if (compat == NULL)
-        return MZ_PARAM_ERROR;
+        return UNZ_PARAMERROR;
+
    err = mz_zip_entry_get_info(compat->handle, &file_info);

    if ((err == MZ_OK) && (pfile_info != NULL))
@@ -422,7 +467,9 @@ extern int ZEXPORT unzGetCurrentFileInfo(unzFile file, unz_file_info *pfile_info
        pfile_info->version_needed = file_info->version_needed;
        pfile_info->flag = file_info->flag;
        pfile_info->compression_method = file_info->compression_method;
-        pfile_info->dos_date = mz_zip_time_t_to_dos_date(file_info->modified_date);
+        pfile_info->dosDate = mz_zip_time_t_to_dos_date(file_info->modified_date);
+        mz_zip_time_t_to_tm(file_info->modified_date, &pfile_info->tmu_date);
+        pfile_info->tmu_date.tm_year += 1900;
        pfile_info->crc = file_info->crc;

        pfile_info->size_filename = file_info->filename_size;
@@ -470,7 +517,7 @@ extern int ZEXPORT unzGetCurrentFileInfo64(unzFile file, unz_file_info64 * pfile
    int32_t err = MZ_OK;

    if (compat == NULL)
-        return MZ_PARAM_ERROR;
+        return UNZ_PARAMERROR;

    err = mz_zip_entry_get_info(compat->handle, &file_info);

@@ -480,7 +527,9 @@ extern int ZEXPORT unzGetCurrentFileInfo64(unzFile file, unz_file_info64 * pfile
        pfile_info->version_needed = file_info->version_needed;
        pfile_info->flag = file_info->flag;
        pfile_info->compression_method = file_info->compression_method;
-        pfile_info->dos_date = mz_zip_time_t_to_dos_date(file_info->modified_date);
+        pfile_info->dosDate = mz_zip_time_t_to_dos_date(file_info->modified_date);
+        mz_zip_time_t_to_tm(file_info->modified_date, &pfile_info->tmu_date);
+        pfile_info->tmu_date.tm_year += 1900;
        pfile_info->crc = file_info->crc;

        pfile_info->size_filename = file_info->filename_size;
@@ -529,7 +578,7 @@ extern int ZEXPORT unzGoToFirstFile(unzFile file)
 {
    mz_compat *compat = (mz_compat *)file;
    if (compat == NULL)
-        return MZ_PARAM_ERROR;
+        return UNZ_PARAMERROR;
    return mz_zip_goto_first_entry(compat->handle);
 }

@@ -537,7 +586,7 @@ extern int ZEXPORT unzGoToNextFile(unzFile file)
 {
    mz_compat *compat = (mz_compat *)file;
    if (compat == NULL)
-        return MZ_PARAM_ERROR;
+        return UNZ_PARAMERROR;
    return mz_zip_goto_next_entry(compat->handle);
 }

@@ -545,10 +594,45 @@ extern int ZEXPORT unzLocateFile(unzFile file, const char *filename, unzFileName
 {
    mz_compat *compat = (mz_compat *)file;
    if (compat == NULL)
-        return MZ_PARAM_ERROR;
+        return UNZ_PARAMERROR;
    return mz_zip_locate_entry(compat->handle, filename, filename_compare_func);
 }

+extern int32_t ZEXPORT unzGetOffset(unzFile file)
+{
+    return (int32_t)unzGetOffset64(file);
+}
+
+extern int64_t ZEXPORT unzGetOffset64(unzFile file)
+{
+    mz_compat *compat = (mz_compat *)file;
+    if (compat == NULL)
+        return UNZ_PARAMERROR;
+    return mz_zip_get_entry(compat->handle);
+}
+
+extern int ZEXPORT unzSetOffset(unzFile file, uint32_t pos)
+{
+    return unzSetOffset64(file, pos);
+}
+
+extern int ZEXPORT unzSetOffset64(unzFile file, uint64_t pos)
+{
+    mz_compat *compat = (mz_compat *)file;
+    if (compat == NULL)
+        return UNZ_PARAMERROR;
+    return (int)mz_zip_goto_entry(compat->handle, pos);
+}
+
+extern int ZEXPORT unzGetLocalExtrafield(unzFile file, voidp buf, unsigned len)  // TODO
+{
+    MZ_UNUSED(file);
+    MZ_UNUSED(buf);
+    MZ_UNUSED(len);
+
+    return 0;
+}
+
 /***************************************************************************/

 void fill_fopen_filefunc(zlib_filefunc_def *pzlib_filefunc_def)
@@ -587,4 +671,3 @@ void fill_win32_filefunc64W(zlib_filefunc64_def *pzlib_filefunc_def)
    if (pzlib_filefunc_def != NULL)
        *pzlib_filefunc_def = mz_stream_os_get_interface();
 }
-
@@ -1,5 +1,5 @@
 /* mz_compat.h -- Backwards compatible interface for older versions
-   Version 2.2.7, January 30th, 2018
+   Version 2.3.0, May 3rd, 2018
   part of the MiniZip project

   Copyright (C) 2010-2018 Nathan Moinvaziri
@@ -79,11 +79,17 @@ typedef void *zlib_filefunc_def;
 typedef void *zlib_filefunc64_def;
 typedef const char *zipcharpc;

+typedef struct tm tm_unz;
+typedef struct tm tm_zip;
+
+typedef uint64_t ZPOS64_T;
+
 /***************************************************************************/

 typedef struct
 {
-    uint32_t    dos_date;
+    uint32_t    dosDate;
+    struct tm   tmz_date;
    uint16_t    internal_fa;        // internal file attributes        2 bytes
    uint32_t    external_fa;        // external file attributes        4 bytes
 } zip_fileinfo;
@@ -109,7 +115,7 @@ extern zipFile ZEXPORT zipOpen(const char *path, int append);
 extern zipFile ZEXPORT zipOpen64(const void *path, int append);
 extern zipFile ZEXPORT zipOpen2(const char *path, int append, const char **globalcomment,
    zlib_filefunc_def *pzlib_filefunc_def);
-extern zipFile ZEXPORT zipOpen2_64(const void *path, int append, const char **globalcomment, 
+extern zipFile ZEXPORT zipOpen2_64(const void *path, int append, const char **globalcomment,
    zlib_filefunc64_def *pzlib_filefunc_def);

 extern int ZEXPORT zipOpenNewFileInZip3(zipFile file, const char *filename, const zip_fileinfo *zipfi,
@@ -141,6 +147,7 @@ extern int ZEXPORT zipOpenNewFileInZip5(zipFile file, const char *filename, cons
 extern int ZEXPORT zipWriteInFileInZip(zipFile file, const void *buf, uint32_t len);

 extern int ZEXPORT zipCloseFileInZipRaw(zipFile file, uint32_t uncompressed_size, uint32_t crc32);
+extern int ZEXPORT zipCloseFileInZipRaw64(zipFile file, uint64_t uncompressed_size, uint32_t crc32);
 extern int ZEXPORT zipCloseFileInZip(zipFile file);
 extern int ZEXPORT zipCloseFileInZip64(zipFile file);

@@ -175,35 +182,36 @@ typedef voidp unzFile;

 typedef struct unz_global_info64_s
 {
-    uint64_t number_entry;          // total number of entries in the central dir on this disk 
+    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 size_comment;          // size of the global comment of the zipfile 
+    uint16_t size_comment;          // size of the global comment of the zipfile
 } unz_global_info64;

 typedef struct unz_global_info_s
 {
-    uint32_t number_entry;          // total number of entries in the central dir on this disk 
+    uint32_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 size_comment;          // size of the global comment of the zipfile 
+    uint16_t size_comment;          // size of the global comment of the zipfile
 } unz_global_info;

 typedef struct unz_file_info64_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 size_filename;         // filename length                 2 bytes 
-    uint16_t size_file_extra;       // extra field length              2 bytes 
-    uint16_t size_file_comment;     // file comment length             2 bytes 
+    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 dosDate;               // last mod file date in Dos fmt   4 bytes
+    struct tm tmu_date;
+    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 size_filename;         // filename length                 2 bytes
+    uint16_t size_file_extra;       // extra field length              2 bytes
+    uint16_t size_file_comment;     // 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 
+    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;

@@ -212,20 +220,21 @@ typedef struct unz_file_info64_s

 typedef struct unz_file_info_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 
-    uint32_t compressed_size;       // compressed size                 4 bytes 
-    uint32_t uncompressed_size;     // uncompressed size               4 bytes 
-    uint16_t size_filename;         // filename length                 2 bytes 
-    uint16_t size_file_extra;       // extra field length              2 bytes 
-    uint16_t size_file_comment;     // file comment length             2 bytes 
+    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 dosDate;               // last mod file date in Dos fmt   4 bytes
+    struct tm tmu_date;
+    uint32_t crc;                   // crc-32                          4 bytes
+    uint32_t compressed_size;       // compressed size                 4 bytes
+    uint32_t uncompressed_size;     // uncompressed size               4 bytes
+    uint16_t size_filename;         // filename length                 2 bytes
+    uint16_t size_file_extra;       // extra field length              2 bytes
+    uint16_t size_file_comment;     // file comment length             2 bytes

-    uint16_t disk_num_start;        // disk number start               2 bytes 
-    uint16_t internal_fa;           // internal file attributes        2 bytes 
+    uint16_t disk_num_start;        // disk number start               2 bytes
+    uint16_t internal_fa;           // internal file attributes        2 bytes
    uint32_t external_fa;           // external file attributes        4 bytes

    uint64_t disk_offset;
@@ -264,6 +273,12 @@ extern int ZEXPORT unzGoToFirstFile(unzFile file);
 extern int ZEXPORT unzGoToNextFile(unzFile file);
 extern int ZEXPORT unzLocateFile(unzFile file, const char *filename, unzFileNameComparer filename_compare_func);

+extern int64_t ZEXPORT unzGetOffset64(unzFile file);
+extern int32_t ZEXPORT unzGetOffset(unzFile file);
+extern int ZEXPORT unzSetOffset64(unzFile file, uint64_t pos);
+extern int ZEXPORT unzSetOffset(unzFile file, uint32_t pos);
+extern int ZEXPORT unzGetLocalExtrafield(unzFile file, voidp buf, unsigned len);
+
 /***************************************************************************/

 void fill_fopen_filefunc(zlib_filefunc_def *pzlib_filefunc_def);
@@ -1,5 +1,5 @@
 /* mz_os.c -- System functions
-   Version 2.2.7, January 30th, 2018
+   Version 2.3.0, May 3rd, 2018
   part of the MiniZip project

   Copyright (C) 2010-2018 Nathan Moinvaziri
@@ -40,7 +40,7 @@ int32_t mz_make_dir(const char *path)
    if (len <= 0)
        return 0;

-    current_dir = (char *)malloc(len + 1);
+    current_dir = (char *)MZ_ALLOC(len + 1);
    if (current_dir == NULL)
        return MZ_MEM_ERROR;

@@ -71,7 +71,7 @@ int32_t mz_make_dir(const char *path)
        }
    }

-    free(current_dir);
+    MZ_FREE(current_dir);
    return err;
 }

@@ -149,4 +149,4 @@ int32_t mz_get_file_crc(const char *path, uint32_t *result_crc)
    mz_stream_os_delete(&stream);

    return err;
-}
+}
@@ -1,5 +1,5 @@
 /* mz_os.h -- System functions
-   Version 2.2.7, January 30th, 2018
+   Version 2.3.0, May 3rd, 2018
   part of the MiniZip project

   Copyright (C) 2010-2018 Nathan Moinvaziri
@@ -32,6 +32,21 @@ extern "C" {

 /***************************************************************************/

+#ifdef HAVE_LZMA
+#define MZ_VERSION_MADEBY_ZIP_VERSION (63)
+#elif HAVE_AES
+#define MZ_VERSION_MADEBY_ZIP_VERSION (51)
+#elif HAVE_BZIP2
+#define MZ_VERSION_MADEBY_ZIP_VERSION (46)
+#else
+#define MZ_VERSION_MADEBY_ZIP_VERSION (45)
+#endif
+
+#define MZ_VERSION_MADEBY             ((MZ_VERSION_MADEBY_HOST_SYSTEM << 8) | \
+                                       (MZ_VERSION_MADEBY_ZIP_VERSION))
+
+/***************************************************************************/
+
 int32_t mz_make_dir(const char *path);
 // Creates a directory recursively

@@ -1,5 +1,5 @@
 /* mz_os_posix.c -- System functions for posix
-   Version 2.2.7, January 30th, 2018
+   Version 2.3.0, May 3rd, 2018
   part of the MiniZip project

   Copyright (C) 2010-2018 Nathan Moinvaziri
@@ -69,7 +69,6 @@ int32_t mz_posix_get_file_date(const char *path, time_t *modified_date, time_t *
    size_t len = 0;
    int32_t err = MZ_INTERNAL_ERROR;

-
    memset(&stat_info, 0, sizeof(stat_info));

    if (strcmp(path, "-") != 0)
@@ -108,6 +107,7 @@ int32_t mz_posix_set_file_date(const char *path, time_t modified_date, time_t ac
    ut.actime = accessed_date;
    ut.modtime = modified_date;
    // Creation date not supported
+    (void)creation_date;

    if (utime(path, &ut) != 0)
        return MZ_INTERNAL_ERROR;
@@ -115,6 +115,28 @@ int32_t mz_posix_set_file_date(const char *path, time_t modified_date, time_t ac
    return MZ_OK;
 }

+int32_t mz_posix_get_file_attribs(const char *path, int32_t *attributes)
+{
+    struct stat stat_info;
+    int32_t err = MZ_OK;
+
+    memset(&stat_info, 0, sizeof(stat_info));
+    if (stat(path, &stat_info) == -1)
+        err = MZ_INTERNAL_ERROR;
+    *attributes = stat_info.st_mode;
+    return err;
+}
+
+int32_t mz_posix_set_file_attribs(const char *path, int32_t attributes)
+{
+    int32_t err = MZ_OK;
+
+    if (chmod(path, attributes) == -1)
+        err = MZ_INTERNAL_ERROR;
+
+    return err;
+}
+
 int32_t mz_posix_make_dir(const char *path)
 {
    int32_t err = 0;
@@ -1,5 +1,5 @@
 /* mz_os_posix.h -- System functions for posix
-   Version 2.2.7, January 30th, 2018
+   Version 2.3.0, May 3rd, 2018
   part of the MiniZip project

   Copyright (C) 2010-2018 Nathan Moinvaziri
@@ -23,9 +23,9 @@ extern "C" {
 /***************************************************************************/

 #if defined(__APPLE__)
-#define MZ_VERSION_MADEBY (19)
+#define MZ_VERSION_MADEBY_HOST_SYSTEM   (MZ_HOST_SYSTEM_OSX_DARWIN)
 #elif defined(unix)
-#define MZ_VERSION_MADEBY (3)
+#define MZ_VERSION_MADEBY_HOST_SYSTEM   (MZ_HOST_SYSTEM_UNIX)
 #endif

 /***************************************************************************/
@@ -35,25 +35,29 @@ int32_t mz_posix_file_exists(const char *path);
 int64_t mz_posix_get_file_size(const char *path);
 int32_t mz_posix_get_file_date(const char *path, time_t *modified_date, time_t *accessed_date, time_t *creation_date);
 int32_t mz_posix_set_file_date(const char *path, time_t modified_date, time_t accessed_date, time_t creation_date);
+int32_t mz_posix_get_file_attribs(const char *path, int32_t *attributes);
+int32_t mz_posix_set_file_attribs(const char *path, int32_t attributes);
 int32_t mz_posix_make_dir(const char *path);
 DIR*    mz_posix_open_dir(const char *path);
-struct 
+struct
 dirent* mz_posix_read_dir(DIR *dir);
 int32_t mz_posix_close_dir(DIR *dir);
 int32_t mz_posix_is_dir(const char *path);

 /***************************************************************************/

-#define mz_os_rand           mz_posix_rand
-#define mz_os_file_exists    mz_posix_file_exists
-#define mz_os_get_file_size  mz_posix_get_file_size
-#define mz_os_get_file_date  mz_posix_get_file_date
-#define mz_os_set_file_date  mz_posix_set_file_date
-#define mz_os_make_dir       mz_posix_make_dir
-#define mz_os_open_dir       mz_posix_open_dir
-#define mz_os_read_dir       mz_posix_read_dir
-#define mz_os_close_dir      mz_posix_close_dir
-#define mz_os_is_dir         mz_posix_is_dir
+#define mz_os_rand              mz_posix_rand
+#define mz_os_file_exists       mz_posix_file_exists
+#define mz_os_get_file_size     mz_posix_get_file_size
+#define mz_os_get_file_date     mz_posix_get_file_date
+#define mz_os_set_file_date     mz_posix_set_file_date
+#define mz_os_get_file_attribs  mz_posix_get_file_attribs
+#define mz_os_set_file_attribs  mz_posix_set_file_attribs
+#define mz_os_make_dir          mz_posix_make_dir
+#define mz_os_open_dir          mz_posix_open_dir
+#define mz_os_read_dir          mz_posix_read_dir
+#define mz_os_close_dir         mz_posix_close_dir
+#define mz_os_is_dir            mz_posix_is_dir

 /***************************************************************************/

@@ -1,5 +1,5 @@
 /* mz_os_win32.c -- System functions for Windows
-   Version 2.2.7, January 30th, 2018
+   Version 2.3.0, May 3rd, 2018
   part of the MiniZip project

   Copyright (C) 2010-2018 Nathan Moinvaziri
@@ -75,7 +75,7 @@ wchar_t *mz_win32_unicode_path_create(const char *path)
    uint32_t path_wide_size = 0;

    path_wide_size = MultiByteToWideChar(CP_UTF8, 0, path, -1, NULL, 0);
-    path_wide = (wchar_t *)malloc((path_wide_size + 1) * sizeof(wchar_t));
+    path_wide = (wchar_t *)MZ_ALLOC((path_wide_size + 1) * sizeof(wchar_t));
    memset(path_wide, 0, sizeof(wchar_t) * (path_wide_size + 1));

    MultiByteToWideChar(CP_UTF8, 0, path, -1, path_wide, path_wide_size);
@@ -87,7 +87,7 @@ void mz_win32_unicode_path_delete(wchar_t **path)
 {
    if (path != NULL)
    {
-        free(*path);
+        MZ_FREE(*path);
        *path = NULL;
    }
 }
@@ -159,7 +159,7 @@ int32_t mz_win32_get_file_date(const char *path, time_t *modified_date, time_t *

    path_wide = mz_win32_unicode_path_create(path);
    handle = FindFirstFileW(path_wide, &ff32);
-    free(path_wide);
+    MZ_FREE(path_wide);

    if (handle != INVALID_HANDLE_VALUE)
    {
@@ -213,6 +213,34 @@ int32_t mz_win32_set_file_date(const char *path, time_t modified_date, time_t ac
    return err;
 }

+int32_t mz_win32_get_file_attribs(const char *path, int32_t *attributes)
+{
+    wchar_t *path_wide = NULL;
+    int32_t err = MZ_OK;
+
+    path_wide = mz_win32_unicode_path_create(path);
+    *attributes = GetFileAttributesW(path_wide);
+    MZ_FREE(path_wide);
+
+    if (*attributes == INVALID_FILE_ATTRIBUTES)
+        err = MZ_INTERNAL_ERROR;
+
+    return err;
+}
+
+int32_t mz_win32_set_file_attribs(const char *path, int32_t attributes)
+{
+    wchar_t *path_wide = NULL;
+    int32_t err = MZ_OK;
+
+    path_wide = mz_win32_unicode_path_create(path);
+    if (SetFileAttributesW(path_wide, attributes) == 0)
+        err = MZ_INTERNAL_ERROR;
+    MZ_FREE(path_wide);
+
+    return err;
+}
+
 int32_t mz_win32_make_dir(const char *path)
 {
    wchar_t *path_wide = NULL;
@@ -249,7 +277,7 @@ DIR *mz_win32_open_dir(const char *path)
    if (handle == INVALID_HANDLE_VALUE)
        return NULL;

-    dir_int = (DIR_int *)malloc(sizeof(DIR_int));
+    dir_int = (DIR_int *)MZ_ALLOC(sizeof(DIR_int));
    dir_int->find_handle = handle;
    dir_int->end = 0;

@@ -269,9 +297,9 @@ struct dirent* mz_win32_read_dir(DIR *dir)
    if (dir_int->end)
        return NULL;

-    WideCharToMultiByte(CP_UTF8, 0, dir_int->find_data.cFileName, -1, 
+    WideCharToMultiByte(CP_UTF8, 0, dir_int->find_data.cFileName, -1,
        dir_int->entry.d_name, sizeof(dir_int->entry.d_name), NULL, NULL);
-    
+
    if (FindNextFileW(dir_int->find_handle, &dir_int->find_data) == 0)
    {
        if (GetLastError() != ERROR_NO_MORE_FILES)
@@ -279,7 +307,7 @@ struct dirent* mz_win32_read_dir(DIR *dir)

        dir_int->end = 1;
    }
- 
+
    return &dir_int->entry;
 }

@@ -293,7 +321,7 @@ int32_t mz_win32_close_dir(DIR *dir)
    dir_int = (DIR_int *)dir;
    if (dir_int->find_handle != INVALID_HANDLE_VALUE)
        FindClose(dir_int->find_handle);
-    free(dir_int);
+    MZ_FREE(dir_int);
    return MZ_OK;
 }

@@ -313,4 +341,4 @@ int32_t mz_win32_is_dir(const char *path)
    }

    return MZ_EXIST_ERROR;
-}
+}
@@ -1,5 +1,5 @@
 /* mz_os_win32.h -- System functions for Windows
-   Version 2.2.7, January 30th, 2018
+   Version 2.3.0, May 3rd, 2018
   part of the MiniZip project

   Copyright (C) 2010-2018 Nathan Moinvaziri
@@ -20,7 +20,7 @@ extern "C" {

 /***************************************************************************/

-#define MZ_VERSION_MADEBY (10)
+#define MZ_VERSION_MADEBY_HOST_SYSTEM   (MZ_HOST_SYSTEM_WINDOWS_NTFS)

 /***************************************************************************/

@@ -36,25 +36,29 @@ int32_t mz_win32_file_exists(const char *path);
 int64_t mz_win32_get_file_size(const char *path);
 int32_t mz_win32_get_file_date(const char *path, time_t *modified_date, time_t *accessed_date, time_t *creation_date);
 int32_t mz_win32_set_file_date(const char *path, time_t modified_date, time_t accessed_date, time_t creation_date);
+int32_t mz_win32_get_file_attribs(const char *path, int32_t *attributes);
+int32_t mz_win32_set_file_attribs(const char *path, int32_t attributes);
 int32_t mz_win32_make_dir(const char *path);
 DIR*    mz_win32_open_dir(const char *path);
-struct 
+struct
 dirent* mz_win32_read_dir(DIR *dir);
 int32_t mz_win32_close_dir(DIR *dir);
 int32_t mz_win32_is_dir(const char *path);

 /***************************************************************************/

-#define mz_os_rand           mz_win32_rand
-#define mz_os_file_exists    mz_win32_file_exists
-#define mz_os_get_file_size  mz_win32_get_file_size
-#define mz_os_get_file_date  mz_win32_get_file_date
-#define mz_os_set_file_date  mz_win32_set_file_date
-#define mz_os_make_dir       mz_win32_make_dir
-#define mz_os_open_dir       mz_win32_open_dir
-#define mz_os_read_dir       mz_win32_read_dir
-#define mz_os_close_dir      mz_win32_close_dir
-#define mz_os_is_dir         mz_win32_is_dir
+#define mz_os_rand              mz_win32_rand
+#define mz_os_file_exists       mz_win32_file_exists
+#define mz_os_get_file_size     mz_win32_get_file_size
+#define mz_os_get_file_date     mz_win32_get_file_date
+#define mz_os_set_file_date     mz_win32_set_file_date
+#define mz_os_get_file_attribs  mz_win32_get_file_attribs
+#define mz_os_set_file_attribs  mz_win32_set_file_attribs
+#define mz_os_make_dir          mz_win32_make_dir
+#define mz_os_open_dir          mz_win32_open_dir
+#define mz_os_read_dir          mz_win32_read_dir
+#define mz_os_close_dir         mz_win32_close_dir
+#define mz_os_is_dir            mz_win32_is_dir

 /***************************************************************************/

@@ -1,5 +1,5 @@
 /* mz_strm.c -- Stream interface
-   Version 2.2.7, January 30th, 2018
+   Version 2.3.0, May 3rd, 2018
   part of the MiniZip project

   Copyright (C) 2010-2018 Nathan Moinvaziri
@@ -270,7 +270,7 @@ void mz_stream_delete(void **stream)

 /***************************************************************************/

-mz_stream_vtbl mz_stream_crc32_vtbl = {
+static mz_stream_vtbl mz_stream_crc32_vtbl = {
    mz_stream_crc32_open,
    mz_stream_crc32_is_open,
    mz_stream_crc32_read,
@@ -281,7 +281,8 @@ mz_stream_vtbl mz_stream_crc32_vtbl = {
    mz_stream_crc32_error,
    mz_stream_crc32_create,
    mz_stream_crc32_delete,
-    mz_stream_crc32_get_prop_int64
+    mz_stream_crc32_get_prop_int64,
+    NULL
 };

 /***************************************************************************/
@@ -301,6 +302,10 @@ typedef struct mz_stream_crc32_s {
 int32_t mz_stream_crc32_open(void *stream, const char *path, int32_t mode)
 {
    mz_stream_crc32 *crc32 = (mz_stream_crc32 *)stream;
+
+    MZ_UNUSED(path);
+    MZ_UNUSED(mode);
+
    crc32->initialized = 1;
    crc32->value = 0;
    return MZ_OK;
@@ -393,7 +398,7 @@ void *mz_stream_crc32_create(void **stream)
 {
    mz_stream_crc32 *crc32 = NULL;

-    crc32 = (mz_stream_crc32 *)malloc(sizeof(mz_stream_crc32));
+    crc32 = (mz_stream_crc32 *)MZ_ALLOC(sizeof(mz_stream_crc32));
    if (crc32 != NULL)
    {
        memset(crc32, 0, sizeof(mz_stream_crc32));
@@ -412,7 +417,7 @@ void mz_stream_crc32_delete(void **stream)
        return;
    crc32 = (mz_stream_crc32 *)*stream;
    if (crc32 != NULL)
-        free(crc32);
+        MZ_FREE(crc32);
    *stream = NULL;
 }

@@ -434,6 +439,10 @@ typedef struct mz_stream_raw_s {

 int32_t mz_stream_raw_open(void *stream, const char *path, int32_t mode)
 {
+    MZ_UNUSED(stream);
+    MZ_UNUSED(path);
+    MZ_UNUSED(mode);
+
    return MZ_OK;
 }

@@ -486,6 +495,8 @@ int32_t mz_stream_raw_seek(void *stream, int64_t offset, int32_t origin)

 int32_t mz_stream_raw_close(void *stream)
 {
+    MZ_UNUSED(stream);
+
    return MZ_OK;
 }

@@ -524,7 +535,7 @@ int32_t mz_stream_raw_set_prop_int64(void *stream, int32_t prop, int64_t value)

 /***************************************************************************/

-mz_stream_vtbl mz_stream_raw_vtbl = {
+static mz_stream_vtbl mz_stream_raw_vtbl = {
    mz_stream_raw_open,
    mz_stream_raw_is_open,
    mz_stream_raw_read,
@@ -545,7 +556,7 @@ void *mz_stream_raw_create(void **stream)
 {
    mz_stream_raw *raw = NULL;

-    raw = (mz_stream_raw *)malloc(sizeof(mz_stream_raw));
+    raw = (mz_stream_raw *)MZ_ALLOC(sizeof(mz_stream_raw));
    if (raw != NULL)
    {
        memset(raw, 0, sizeof(mz_stream_raw));
@@ -564,6 +575,6 @@ void mz_stream_raw_delete(void **stream)
        return;
    raw = (mz_stream_raw *)*stream;
    if (raw != NULL)
-        free(raw);
+        MZ_FREE(raw);
    *stream = NULL;
 }
@@ -1,5 +1,5 @@
 /* mz_strm.h -- Stream interface
-   Version 2.2.7, January 30th, 2018
+   Version 2.3.0, May 3rd, 2018
   part of the MiniZip project

   Copyright (C) 2010-2018 Nathan Moinvaziri
@@ -1,5 +1,5 @@
 /* mz_strm_aes.c -- Stream for WinZip AES encryption
-   Version 2.2.7, January 30th, 2018
+   Version 2.3.0, May 3rd, 2018
   part of the MiniZip project

   Copyright (C) 2010-2018 Nathan Moinvaziri
@@ -38,7 +38,7 @@

 /***************************************************************************/

-mz_stream_vtbl mz_stream_aes_vtbl = {
+static mz_stream_vtbl mz_stream_aes_vtbl = {
    mz_stream_aes_open,
    mz_stream_aes_is_open,
    mz_stream_aes_read,
@@ -49,7 +49,8 @@ mz_stream_vtbl mz_stream_aes_vtbl = {
    mz_stream_aes_error,
    mz_stream_aes_create,
    mz_stream_aes_delete,
-    mz_stream_aes_get_prop_int64
+    mz_stream_aes_get_prop_int64,
+    NULL
 };

 /***************************************************************************/
@@ -66,7 +67,7 @@ typedef struct mz_stream_aes_s {
    const char      *password;
    aes_encrypt_ctx encr_ctx[1];
    hmac_ctx        auth_ctx[1];
-    uint8_t         nonce[AES_BLOCK_SIZE]; 
+    uint8_t         nonce[AES_BLOCK_SIZE];
    uint8_t         encr_bfr[AES_BLOCK_SIZE];
    uint32_t        encr_pos;
 } mz_stream_aes;
@@ -299,10 +300,10 @@ int32_t mz_stream_aes_get_prop_int64(void *stream, int32_t prop, int64_t *value)
    mz_stream_aes *aes = (mz_stream_aes *)stream;
    switch (prop)
    {
-    case MZ_STREAM_PROP_TOTAL_IN: 
+    case MZ_STREAM_PROP_TOTAL_IN:
        *value = aes->total_in;
        return MZ_OK;
-    case MZ_STREAM_PROP_TOTAL_OUT: 
+    case MZ_STREAM_PROP_TOTAL_OUT:
        *value = aes->total_out;
        return MZ_OK;
    case MZ_STREAM_PROP_HEADER_SIZE:
@@ -319,7 +320,7 @@ void *mz_stream_aes_create(void **stream)
 {
    mz_stream_aes *aes = NULL;

-    aes = (mz_stream_aes *)malloc(sizeof(mz_stream_aes));
+    aes = (mz_stream_aes *)MZ_ALLOC(sizeof(mz_stream_aes));
    if (aes != NULL)
    {
        memset(aes, 0, sizeof(mz_stream_aes));
@@ -339,7 +340,7 @@ void mz_stream_aes_delete(void **stream)
        return;
    aes = (mz_stream_aes *)*stream;
    if (aes != NULL)
-        free(aes);
+        MZ_FREE(aes);
    *stream = NULL;
 }

@@ -1,5 +1,5 @@
 /* mz_strm_aes.h -- Stream for WinZIP AES encryption
-   Version 2.2.7, January 30th, 2018
+   Version 2.3.0, May 3rd, 2018
   part of the MiniZip project

   Copyright (C) 2010-2018 Nathan Moinvaziri
@@ -1,5 +1,5 @@
 /* mz_strm_buf.c -- Stream for buffering reads/writes
-   Version 2.2.7, January 30th, 2018
+   Version 2.3.0, May 3rd, 2018
   part of the MiniZip project

   This version of ioapi is designed to buffer IO.
@@ -31,7 +31,7 @@

 /***************************************************************************/

-mz_stream_vtbl mz_stream_buffered_vtbl = {
+static mz_stream_vtbl mz_stream_buffered_vtbl = {
    mz_stream_buffered_open,
    mz_stream_buffered_is_open,
    mz_stream_buffered_read,
@@ -41,7 +41,9 @@ mz_stream_vtbl mz_stream_buffered_vtbl = {
    mz_stream_buffered_close,
    mz_stream_buffered_error,
    mz_stream_buffered_create,
-    mz_stream_buffered_delete
+    mz_stream_buffered_delete,
+    NULL,
+    NULL
 };

 /***************************************************************************/
@@ -89,7 +91,7 @@ static int32_t mz_stream_buffered_flush(void *stream, int32_t *written)

    while (bytes_left_to_write > 0)
    {
-        bytes_written = mz_stream_write(buffered->stream.base, 
+        bytes_written = mz_stream_write(buffered->stream.base,
            buffered->writebuf + (bytes_to_write - bytes_left_to_write), bytes_left_to_write);

        if (bytes_written != bytes_left_to_write)
@@ -97,7 +99,7 @@ static int32_t mz_stream_buffered_flush(void *stream, int32_t *written)

        buffered->writebuf_misses += 1;

-        mz_stream_buffered_print(stream, "write flush [%d:%d len %d]\n", 
+        mz_stream_buffered_print(stream, "write flush [%d:%d len %d]\n",
            bytes_to_write, bytes_left_to_write, buffered->writebuf_len);

        total_bytes_written += bytes_written;
@@ -124,7 +126,7 @@ int32_t mz_stream_buffered_read(void *stream, void *buf, int32_t size)
    mz_stream_buffered_print(stream, "read [size %ld pos %lld]\n", size, buffered->position);

    if (buffered->writebuf_len > 0)
-        mz_stream_buffered_print(stream, "switch from write to read, not yet supported [%lld]\n", 
+        mz_stream_buffered_print(stream, "switch from write to read, not yet supported [%lld]\n",
            buffered->position);

    while (bytes_left_to_read > 0)
@@ -146,7 +148,7 @@ int32_t mz_stream_buffered_read(void *stream, void *buf, int32_t size)
            buffered->readbuf_len += bytes_read;
            buffered->position += bytes_read;

-            mz_stream_buffered_print(stream, "filled [read %d/%d buf %d:%d pos %lld]\n", 
+            mz_stream_buffered_print(stream, "filled [read %d/%d buf %d:%d pos %lld]\n",
                bytes_read, bytes_to_read, buffered->readbuf_pos, buffered->readbuf_len, buffered->position);

            if (bytes_read == 0)
@@ -167,7 +169,7 @@ int32_t mz_stream_buffered_read(void *stream, void *buf, int32_t size)
            buffered->readbuf_hits += 1;
            buffered->readbuf_pos += bytes_to_copy;

-            mz_stream_buffered_print(stream, "emptied [copied %d remaining %d buf %d:%d pos %lld]\n", 
+            mz_stream_buffered_print(stream, "emptied [copied %d remaining %d buf %d:%d pos %lld]\n",
                bytes_to_copy, bytes_left_to_read, buffered->readbuf_pos, buffered->readbuf_len, buffered->position);
        }
    }
@@ -185,7 +187,7 @@ int32_t mz_stream_buffered_write(void *stream, const void *buf, int32_t size)
    int32_t bytes_flushed = 0;


-    mz_stream_buffered_print(stream, "write [size %ld len %d pos %lld]\n", 
+    mz_stream_buffered_print(stream, "write [size %ld len %d pos %lld]\n",
        size, buffered->writebuf_len, buffered->position);

    if (buffered->readbuf_len > 0)
@@ -221,9 +223,9 @@ int32_t mz_stream_buffered_write(void *stream, const void *buf, int32_t size)
            continue;
        }

-        memcpy(buffered->writebuf + buffered->writebuf_pos, (char *)buf + (bytes_to_write - bytes_left_to_write), bytes_to_copy);
+        memcpy(buffered->writebuf + buffered->writebuf_pos, (const char *)buf + (bytes_to_write - bytes_left_to_write), bytes_to_copy);

-        mz_stream_buffered_print(stream, "write copy [remaining %d write %d:%d len %d]\n", 
+        mz_stream_buffered_print(stream, "write copy [remaining %d write %d:%d len %d]\n",
            bytes_to_copy, bytes_to_write, bytes_left_to_write, buffered->writebuf_len);

        bytes_left_to_write -= bytes_to_copy;
@@ -274,7 +276,7 @@ int32_t mz_stream_buffered_seek(void *stream, int64_t offset, int32_t origin)
                }
            }

-            if ((buffered->readbuf_len > 0) && (offset < buffered->position) && 
+            if ((buffered->readbuf_len > 0) && (offset < buffered->position) &&
                (offset >= buffered->position - buffered->readbuf_len))
            {
                buffered->readbuf_pos = (uint32_t)(offset - (buffered->position - buffered->readbuf_len));
@@ -341,11 +343,11 @@ int32_t mz_stream_buffered_close(void *stream)
    mz_stream_buffered_print(stream, "close\n");

    if (buffered->readbuf_hits + buffered->readbuf_misses > 0)
-        mz_stream_buffered_print(stream, "read efficency %.02f%%\n", 
+        mz_stream_buffered_print(stream, "read efficency %.02f%%\n",
            (buffered->readbuf_hits / ((float)buffered->readbuf_hits + buffered->readbuf_misses)) * 100);

    if (buffered->writebuf_hits + buffered->writebuf_misses > 0)
-        mz_stream_buffered_print(stream, "write efficency %.02f%%\n", 
+        mz_stream_buffered_print(stream, "write efficency %.02f%%\n",
            (buffered->writebuf_hits / ((float)buffered->writebuf_hits + buffered->writebuf_misses)) * 100);

    return mz_stream_close(buffered->stream.base);
@@ -361,7 +363,7 @@ void *mz_stream_buffered_create(void **stream)
 {
    mz_stream_buffered *buffered = NULL;

-    buffered = (mz_stream_buffered *)malloc(sizeof(mz_stream_buffered));
+    buffered = (mz_stream_buffered *)MZ_ALLOC(sizeof(mz_stream_buffered));
    if (buffered != NULL)
    {
        memset(buffered, 0, sizeof(mz_stream_buffered));
@@ -380,7 +382,7 @@ void mz_stream_buffered_delete(void **stream)
        return;
    buffered = (mz_stream_buffered *)*stream;
    if (buffered != NULL)
-        free(buffered);
+        MZ_FREE(buffered);
    *stream = NULL;
 }

@@ -1,5 +1,5 @@
 /* mz_strm_buf.h -- Stream for buffering reads/writes
-   Version 2.2.7, January 30th, 2018
+   Version 2.3.0, May 3rd, 2018
   part of the MiniZip project

   This version of ioapi is designed to buffer IO.
@@ -1,5 +1,5 @@
 /* mz_strm_bzip.c -- Stream for bzip inflate/deflate
-   Version 2.2.7, January 30th, 2018
+   Version 2.3.0, May 3rd, 2018
   part of the MiniZip project

   Copyright (C) 2010-2018 Nathan Moinvaziri
@@ -23,7 +23,7 @@

 /***************************************************************************/

-mz_stream_vtbl mz_stream_bzip_vtbl = {
+static mz_stream_vtbl mz_stream_bzip_vtbl = {
    mz_stream_bzip_open,
    mz_stream_bzip_is_open,
    mz_stream_bzip_read,
@@ -61,6 +61,7 @@ int32_t mz_stream_bzip_open(void *stream, const char *path, int32_t mode)
 {
    mz_stream_bzip *bzip = (mz_stream_bzip *)stream;

+    MZ_UNUSED(path);

    bzip->bzstream.bzalloc = 0;
    bzip->bzstream.bzfree = 0;
@@ -136,7 +137,7 @@ int32_t mz_stream_bzip_read(void *stream, void *buf, int32_t size)
            {
                if ((bzip->max_total_in - bzip->total_in) < sizeof(bzip->buffer))
                    bytes_to_read = (int32_t)(bzip->max_total_in - bzip->total_in);
-            }    
+            }

            read = mz_stream_read(bzip->stream.base, bzip->buffer, bytes_to_read);

@@ -153,13 +154,13 @@ int32_t mz_stream_bzip_read(void *stream, void *buf, int32_t size)
        }

        total_in_before = bzip->bzstream.avail_in;
-        total_out_before = bzip->bzstream.total_out_lo32 + 
+        total_out_before = bzip->bzstream.total_out_lo32 +
                (((uint64_t)bzip->bzstream.total_out_hi32) << 32);

        err = BZ2_bzDecompress(&bzip->bzstream);

        total_in_after = bzip->bzstream.avail_in;
-        total_out_after = bzip->bzstream.total_out_lo32 + 
+        total_out_after = bzip->bzstream.total_out_lo32 +
                (((uint64_t)bzip->bzstream.total_out_hi32) << 32);

        in_bytes = (uint32_t)(total_in_before - total_in_after);
@@ -222,12 +223,12 @@ static int32_t mz_stream_bzip_compress(void *stream, int flush)
            bzip->buffer_len = 0;
        }

-        total_out_before = bzip->bzstream.total_out_lo32 + 
+        total_out_before = bzip->bzstream.total_out_lo32 +
                (((uint64_t)bzip->bzstream.total_out_hi32) << 32);

        err = BZ2_bzCompress(&bzip->bzstream, flush);

-        total_out_after = bzip->bzstream.total_out_lo32 + 
+        total_out_after = bzip->bzstream.total_out_lo32 +
                (((uint64_t)bzip->bzstream.total_out_hi32) << 32);

        out_bytes = (uint32_t)(total_out_after - total_out_before);
@@ -265,11 +266,17 @@ int32_t mz_stream_bzip_write(void *stream, const void *buf, int32_t size)

 int64_t mz_stream_bzip_tell(void *stream)
 {
+    MZ_UNUSED(stream);
+
    return MZ_STREAM_ERROR;
 }

 int32_t mz_stream_bzip_seek(void *stream, int64_t offset, int32_t origin)
 {
+    MZ_UNUSED(stream);
+    MZ_UNUSED(offset);
+    MZ_UNUSED(origin);
+
    return MZ_STREAM_ERROR;
 }

@@ -342,7 +349,7 @@ void *mz_stream_bzip_create(void **stream)
 {
    mz_stream_bzip *bzip = NULL;

-    bzip = (mz_stream_bzip *)malloc(sizeof(mz_stream_bzip));
+    bzip = (mz_stream_bzip *)MZ_ALLOC(sizeof(mz_stream_bzip));
    if (bzip != NULL)
    {
        memset(bzip, 0, sizeof(mz_stream_bzip));
@@ -362,7 +369,7 @@ void mz_stream_bzip_delete(void **stream)
        return;
    bzip = (mz_stream_bzip *)*stream;
    if (bzip != NULL)
-        free(bzip);
+        MZ_FREE(bzip);
    *stream = NULL;
 }

@@ -373,4 +380,5 @@ void *mz_stream_bzip_get_interface(void)

 extern void bz_internal_error(int errcode)
 {
+    MZ_UNUSED(errcode);
 }
@@ -1,5 +1,5 @@
 /* mz_strm_bzip.h -- Stream for bzip inflate/deflate
-   Version 2.2.7, January 30th, 2018
+   Version 2.3.0, May 3rd, 2018
   part of the MiniZip project

   Copyright (C) 2010-2018 Nathan Moinvaziri
@@ -1,5 +1,5 @@
 /* mz_strm_crypt.c -- Code for traditional PKWARE encryption
-   Version 2.2.7, January 30th, 2018
+   Version 2.3.0, May 3rd, 2018
   part of the MiniZip project

   Copyright (C) 2010-2018 Nathan Moinvaziri
@@ -40,7 +40,7 @@

 /***************************************************************************/

-mz_stream_vtbl mz_stream_crypt_vtbl = {
+static mz_stream_vtbl mz_stream_crypt_vtbl = {
    mz_stream_crypt_open,
    mz_stream_crypt_is_open,
    mz_stream_crypt_read,
@@ -51,7 +51,8 @@ mz_stream_vtbl mz_stream_crypt_vtbl = {
    mz_stream_crypt_error,
    mz_stream_crypt_create,
    mz_stream_crypt_delete,
-    mz_stream_crypt_get_prop_int64
+    mz_stream_crypt_get_prop_int64,
+    NULL
 };

 /***************************************************************************/
@@ -64,7 +65,7 @@ typedef struct mz_stream_crypt_s {
    int64_t         total_in;
    int64_t         total_out;
    uint32_t        keys[3];          // keys defining the pseudo-random sequence
-    const z_crc_t   *crc_32_tab;
+    const uint32_t  *crc_32_tab;
    uint8_t         verify1;
    uint8_t         verify2;
    const char      *password;
@@ -90,7 +91,7 @@ static uint8_t mz_stream_crypt_decrypt_byte(uint32_t *keys)
    return (uint8_t)(((temp * (temp ^ 1)) >> 8) & 0xff);
 }

-static uint8_t mz_stream_crypt_update_keys(uint32_t *keys, const z_crc_t *crc_32_tab, int32_t c)
+static uint8_t mz_stream_crypt_update_keys(uint32_t *keys, const uint32_t *crc_32_tab, int32_t c)
 {
    #define CRC32(c, b) ((*(crc_32_tab+(((uint32_t)(c) ^ (b)) & 0xff))) ^ ((c) >> 8))

@@ -104,7 +105,7 @@ static uint8_t mz_stream_crypt_update_keys(uint32_t *keys, const z_crc_t *crc_32
    return (uint8_t)c;
 }

-static void mz_stream_crypt_init_keys(const char *password, uint32_t *keys, const z_crc_t *crc_32_tab)
+static void mz_stream_crypt_init_keys(const char *password, uint32_t *keys, const uint32_t *crc_32_tab)
 {
    *(keys+0) = 305419896L;
    *(keys+1) = 591751049L;
@@ -151,11 +152,11 @@ int32_t mz_stream_crypt_open(void *stream, const char *path, int32_t mode)
    {
        // First generate RAND_HEAD_LEN - 2 random bytes.
        mz_os_rand(header, RAND_HEAD_LEN - 2);
-        
+
        // Encrypt random header (last two bytes is high word of crc)
        for (i = 0; i < RAND_HEAD_LEN - 2; i++)
            header[i] = (uint8_t)zencode(crypt->keys, crypt->crc_32_tab, header[i], t);
-        
+
        header[i++] = (uint8_t)zencode(crypt->keys, crypt->crc_32_tab, crypt->verify1, t);
        header[i++] = (uint8_t)zencode(crypt->keys, crypt->crc_32_tab, crypt->verify2, t);

@@ -213,7 +214,7 @@ int32_t mz_stream_crypt_read(void *stream, void *buf, int32_t size)
 int32_t mz_stream_crypt_write(void *stream, const void *buf, int32_t size)
 {
    mz_stream_crypt *crypt = (mz_stream_crypt *)stream;
-    uint8_t *buf_ptr = (uint8_t *)buf;
+    const uint8_t *buf_ptr = (const uint8_t *)buf;
    uint32_t written = 0;
    uint16_t t = 0;
    int32_t i = 0;
@@ -296,7 +297,7 @@ void *mz_stream_crypt_create(void **stream)
 {
    mz_stream_crypt *crypt = NULL;

-    crypt = (mz_stream_crypt *)malloc(sizeof(mz_stream_crypt));
+    crypt = (mz_stream_crypt *)MZ_ALLOC(sizeof(mz_stream_crypt));
    if (crypt != NULL)
    {
        memset(crypt, 0, sizeof(mz_stream_crypt));
@@ -315,11 +316,11 @@ void mz_stream_crypt_delete(void **stream)
        return;
    crypt = (mz_stream_crypt *)*stream;
    if (crypt != NULL)
-        free(crypt);
+        MZ_FREE(crypt);
    *stream = NULL;
 }

 void *mz_stream_crypt_get_interface(void)
 {
    return (void *)&mz_stream_crypt_vtbl;
-}
+}
@@ -1,5 +1,5 @@
 /* mz_strm_crypt.h -- Code for traditional PKWARE encryption
-   Version 2.2.7, January 30th, 2018
+   Version 2.3.0, May 3rd, 2018
   part of the MiniZip project

   Copyright (C) 2010-2018 Nathan Moinvaziri
@@ -1,5 +1,5 @@
 /* mz_strm_lzma.c -- Stream for lzma inflate/deflate
-   Version 2.2.7, January 30th, 2018
+   Version 2.3.0, May 3rd, 2018
   part of the MiniZip project

   Copyright (C) 2010-2018 Nathan Moinvaziri
@@ -28,7 +28,7 @@

 /***************************************************************************/

-mz_stream_vtbl mz_stream_lzma_vtbl = {
+static mz_stream_vtbl mz_stream_lzma_vtbl = {
    mz_stream_lzma_open,
    mz_stream_lzma_is_open,
    mz_stream_lzma_read,
@@ -55,6 +55,7 @@ typedef struct mz_stream_lzma_s {
    int64_t     total_in;
    int64_t     total_out;
    int64_t     max_total_in;
+    int64_t     max_total_out;
    int8_t      initialized;
    uint32_t    preset;
 } mz_stream_lzma;
@@ -65,11 +66,15 @@ int32_t mz_stream_lzma_open(void *stream, const char *path, int32_t mode)
 {
    mz_stream_lzma *lzma = (mz_stream_lzma *)stream;
    lzma_filter filters[LZMA_FILTERS_MAX + 1];
-    lzma_options_lzma opt_lzma = { 0 };
+    lzma_options_lzma opt_lzma;
    uint32_t size = 0;
    uint8_t major = 0;
    uint8_t minor = 0;

+    MZ_UNUSED(path);
+
+    memset(&opt_lzma, 0, sizeof(opt_lzma));
+
    lzma->lstream.total_in = 0;
    lzma->lstream.total_out = 0;

@@ -91,7 +96,7 @@ int32_t mz_stream_lzma_open(void *stream, const char *path, int32_t mode)
        filters[1].id = LZMA_VLI_UNKNOWN;

        lzma_properties_size(&size, (lzma_filter *)&filters);
-        
+
        mz_stream_write_uint8(lzma->stream.base, LZMA_VERSION_MAJOR);
        mz_stream_write_uint8(lzma->stream.base, LZMA_VERSION_MINOR);
        mz_stream_write_uint16(lzma->stream.base, (uint16_t)size);
@@ -113,7 +118,7 @@ int32_t mz_stream_lzma_open(void *stream, const char *path, int32_t mode)

        lzma->error = lzma_alone_decoder(&lzma->lstream, UINT64_MAX);
    }
-    
+
    if (lzma->error != LZMA_OK)
        return MZ_STREAM_ERROR;

@@ -159,7 +164,7 @@ int32_t mz_stream_lzma_read(void *stream, void *buf, int32_t size)
                if ((lzma->max_total_in - lzma->total_in) < sizeof(lzma->buffer))
                    bytes_to_read = (int32_t)(lzma->max_total_in - lzma->total_in);
            }
-            
+
            read = mz_stream_read(lzma->stream.base, lzma->buffer, bytes_to_read);

            if (read < 0)
@@ -181,7 +186,9 @@ int32_t mz_stream_lzma_read(void *stream, void *buf, int32_t size)

        total_in_after = lzma->lstream.avail_in;
        total_out_after = lzma->lstream.total_out;
-        
+        if ((lzma->max_total_out != -1) && (int64_t)total_out_after > lzma->max_total_out)
+            total_out_after = lzma->max_total_out;
+
        in_bytes = (uint32_t)(total_in_before - total_in_after);
        out_bytes = (uint32_t)(total_out_after - total_out_before);

@@ -277,11 +284,17 @@ int32_t mz_stream_lzma_write(void *stream, const void *buf, int32_t size)

 int64_t mz_stream_lzma_tell(void *stream)
 {
+    MZ_UNUSED(stream);
+
    return MZ_STREAM_ERROR;
 }

 int32_t mz_stream_lzma_seek(void *stream, int64_t offset, int32_t origin)
 {
+    MZ_UNUSED(stream);
+    MZ_UNUSED(offset);
+    MZ_UNUSED(origin);
+
    return MZ_STREAM_ERROR;
 }

@@ -346,6 +359,11 @@ int32_t mz_stream_lzma_set_prop_int64(void *stream, int32_t prop, int64_t value)
    case MZ_STREAM_PROP_TOTAL_IN_MAX:
        lzma->max_total_in = value;
        return MZ_OK;
+    case MZ_STREAM_PROP_TOTAL_OUT_MAX:
+        if (value < -1)
+            return MZ_PARAM_ERROR;
+        lzma->max_total_out = value;
+        return MZ_OK;
    }
    return MZ_EXIST_ERROR;
 }
@@ -354,12 +372,13 @@ void *mz_stream_lzma_create(void **stream)
 {
    mz_stream_lzma *lzma = NULL;

-    lzma = (mz_stream_lzma *)malloc(sizeof(mz_stream_lzma));
+    lzma = (mz_stream_lzma *)MZ_ALLOC(sizeof(mz_stream_lzma));
    if (lzma != NULL)
    {
        memset(lzma, 0, sizeof(mz_stream_lzma));
        lzma->stream.vtbl = &mz_stream_lzma_vtbl;
        lzma->preset = LZMA_PRESET_DEFAULT;
+        lzma->max_total_out = -1;
    }
    if (stream != NULL)
        *stream = lzma;
@@ -374,7 +393,7 @@ void mz_stream_lzma_delete(void **stream)
        return;
    lzma = (mz_stream_lzma *)*stream;
    if (lzma != NULL)
-        free(lzma);
+        MZ_FREE(lzma);
    *stream = NULL;
 }

@@ -391,4 +410,4 @@ static int32_t mz_stream_lzma_crc32(int32_t value, const void *buf, int32_t size
 void *mz_stream_lzma_get_crc32_update(void)
 {
    return (void *)mz_stream_lzma_crc32;
-}
+}
@@ -1,5 +1,5 @@
 /* mz_strm_lzma.h -- Stream for lzma inflate/deflate
-   Version 2.2.7, January 30th, 2018
+   Version 2.3.0, May 3rd, 2018
   part of the MiniZip project

   Copyright (C) 2010-2018 Nathan Moinvaziri
@@ -1,9 +1,9 @@
 /* mz_strm_mem.c -- Stream for memory access
-   Version 2.2.7, January 30th, 2018
+   Version 2.3.0, May 3rd, 2018
   part of the MiniZip project

   This interface is designed to access memory rather than files.
-   We do use a region of memory to put data in to and take it out of. 
+   We do use a region of memory to put data in to and take it out of.

   Based on Unzip ioapi.c version 0.22, May 19th, 2003

@@ -28,7 +28,7 @@

 /***************************************************************************/

-mz_stream_vtbl mz_stream_mem_vtbl = {
+static mz_stream_vtbl mz_stream_mem_vtbl = {
    mz_stream_mem_open,
    mz_stream_mem_is_open,
    mz_stream_mem_read,
@@ -38,7 +38,9 @@ mz_stream_vtbl mz_stream_mem_vtbl = {
    mz_stream_mem_close,
    mz_stream_mem_error,
    mz_stream_mem_create,
-    mz_stream_mem_delete
+    mz_stream_mem_delete,
+    NULL,
+    NULL
 };

 /***************************************************************************/
@@ -46,7 +48,7 @@ mz_stream_vtbl mz_stream_mem_vtbl = {
 typedef struct mz_stream_mem_s {
    mz_stream   stream;
    int32_t     mode;
-    char        *buffer;    // Memory buffer pointer 
+    char        *buffer;    // Memory buffer pointer
    int32_t     size;       // Size of the memory buffer
    int32_t     limit;      // Furthest we've written
    int32_t     position;   // Current position in the memory
@@ -62,11 +64,11 @@ static void mz_stream_mem_set_size(void *stream, int32_t size)
    char *new_buf = NULL;


-    new_buf = (char *)malloc(new_size);
+    new_buf = (char *)MZ_ALLOC(new_size);
    if (mem->buffer)
    {
        memcpy(new_buf, mem->buffer, mem->size);
-        free(mem->buffer);
+        MZ_FREE(mem->buffer);
    }

    mem->buffer = new_buf;
@@ -77,6 +79,7 @@ int32_t mz_stream_mem_open(void *stream, const char *path, int32_t mode)
 {
    mz_stream_mem *mem = (mz_stream_mem *)stream;

+    MZ_UNUSED(path);

    mem->mode = mode;
    mem->limit = 0;
@@ -189,12 +192,16 @@ int32_t mz_stream_mem_seek(void *stream, int64_t offset, int32_t origin)

 int32_t mz_stream_mem_close(void *stream)
 {
+    MZ_UNUSED(stream);
+
    // We never return errors
    return MZ_OK;
 }

 int32_t mz_stream_mem_error(void *stream)
 {
+    MZ_UNUSED(stream);
+
    // We never return errors
    return MZ_OK;
 }
@@ -231,7 +238,7 @@ void *mz_stream_mem_create(void **stream)
 {
    mz_stream_mem *mem = NULL;

-    mem = (mz_stream_mem *)malloc(sizeof(mz_stream_mem));
+    mem = (mz_stream_mem *)MZ_ALLOC(sizeof(mz_stream_mem));
    if (mem != NULL)
    {
        memset(mem, 0, sizeof(mz_stream_mem));
@@ -253,8 +260,8 @@ void mz_stream_mem_delete(void **stream)
    if (mem != NULL)
    {
        if ((mem->mode & MZ_OPEN_MODE_CREATE) && (mem->buffer != NULL))
-            free(mem->buffer);
-        free(mem);
+            MZ_FREE(mem->buffer);
+        MZ_FREE(mem);
    }
    *stream = NULL;
 }
@@ -262,4 +269,4 @@ void mz_stream_mem_delete(void **stream)
 void *mz_stream_mem_get_interface(void)
 {
    return (void *)&mz_stream_mem_vtbl;
-}
+}
@@ -1,5 +1,5 @@
 /* mz_strm_mem.h -- Stream for memory access
-   Version 2.2.7, January 30th, 2018
+   Version 2.3.0, May 3rd, 2018
   part of MiniZip project

   Copyright (C) 2010-2018 Nathan Moinvaziri
@@ -1,5 +1,5 @@
 /* mz_strm_posix.c -- Stream for filesystem access for posix/linux
-   Version 2.2.7, January 30th, 2018
+   Version 2.3.0, May 3rd, 2018
   part of the MiniZip project

   Copyright (C) 2010-2018 Nathan Moinvaziri
@@ -50,7 +50,7 @@

 /***************************************************************************/

-mz_stream_vtbl mz_stream_posix_vtbl = {
+static mz_stream_vtbl mz_stream_posix_vtbl = {
    mz_stream_posix_open,
    mz_stream_posix_is_open,
    mz_stream_posix_read,
@@ -60,7 +60,9 @@ mz_stream_vtbl mz_stream_posix_vtbl = {
    mz_stream_posix_close,
    mz_stream_posix_error,
    mz_stream_posix_create,
-    mz_stream_posix_delete
+    mz_stream_posix_delete,
+    NULL,
+    NULL
 };

 /***************************************************************************/
@@ -85,7 +87,7 @@ int32_t mz_stream_posix_open(void *stream, const char *path, int32_t mode)
    if ((mode & MZ_OPEN_MODE_READWRITE) == MZ_OPEN_MODE_READ)
        mode_fopen = "rb";
    else if (mode & MZ_OPEN_MODE_APPEND)
-        mode_fopen = "ab";
+        mode_fopen = "r+b";
    else if (mode & MZ_OPEN_MODE_CREATE)
        mode_fopen = "wb";
    else
@@ -201,7 +203,7 @@ void *mz_stream_posix_create(void **stream)
 {
    mz_stream_posix *posix = NULL;

-    posix = (mz_stream_posix *)malloc(sizeof(mz_stream_posix));
+    posix = (mz_stream_posix *)MZ_ALLOC(sizeof(mz_stream_posix));
    if (posix != NULL)
    {
        memset(posix, 0, sizeof(mz_stream_posix));
@@ -209,7 +211,7 @@ void *mz_stream_posix_create(void **stream)
    }
    if (stream != NULL)
        *stream = posix;
- 
+
    return posix;
 }

@@ -220,7 +222,7 @@ void mz_stream_posix_delete(void **stream)
        return;
    posix = (mz_stream_posix *)*stream;
    if (posix != NULL)
-        free(posix);
+        MZ_FREE(posix);
    *stream = NULL;
 }

@@ -1,5 +1,5 @@
 /* mz_strm_posix.h -- Stream for filesystem access for posix/linux
-   Version 2.2.7, January 30th, 2018
+   Version 2.3.0, May 3rd, 2018
   part of the MiniZip project

   Copyright (C) 2010-2018 Nathan Moinvaziri
@@ -1,5 +1,5 @@
 /* mz_strm_split.c -- Stream for split files
-   Version 2.2.7, January 30th, 2018
+   Version 2.3.0, May 3rd, 2018
   part of the MiniZip project

   Copyright (C) 2010-2018 Nathan Moinvaziri
@@ -29,7 +29,7 @@

 /***************************************************************************/

-mz_stream_vtbl mz_stream_split_vtbl = {
+static mz_stream_vtbl mz_stream_split_vtbl = {
    mz_stream_split_open,
    mz_stream_split_is_open,
    mz_stream_split_read,
@@ -181,11 +181,11 @@ int32_t mz_stream_split_open(void *stream, const char *path, int32_t mode)
    split->mode = mode;

    split->path_cd_size = strlen(path) + 1;
-    split->path_cd = (char *)malloc(split->path_cd_size);
+    split->path_cd = (char *)MZ_ALLOC(split->path_cd_size);
    strncpy(split->path_cd, path, split->path_cd_size);

    split->path_disk_size = strlen(path) + 10;
-    split->path_disk = (char *)malloc(split->path_disk_size);
+    split->path_disk = (char *)MZ_ALLOC(split->path_disk_size);
    strncpy(split->path_disk, path, split->path_disk_size);

    if (mode & MZ_OPEN_MODE_WRITE)
@@ -281,11 +281,11 @@ int32_t mz_stream_split_write(void *stream, const void *buf, int32_t size)
                    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;
-        
+
        bytes_left -= written;
        buf_ptr += written;
        split->total_out += written;
@@ -368,7 +368,7 @@ void *mz_stream_split_create(void **stream)
 {
    mz_stream_split *split = NULL;

-    split = (mz_stream_split *)malloc(sizeof(mz_stream_split));
+    split = (mz_stream_split *)MZ_ALLOC(sizeof(mz_stream_split));
    if (split != NULL)
    {
        memset(split, 0, sizeof(mz_stream_split));
@@ -389,11 +389,11 @@ void mz_stream_split_delete(void **stream)
    if (split != NULL)
    {
        if (split->path_cd)
-            free(split->path_cd);
+            MZ_FREE(split->path_cd);
        if (split->path_disk)
-            free(split->path_disk);
+            MZ_FREE(split->path_disk);

-        free(split);
+        MZ_FREE(split);
    }
    *stream = NULL;
 }
@@ -1,5 +1,5 @@
 /* mz_strm_split.h -- Stream for split files
-   Version 2.2.7, January 30th, 2018
+   Version 2.3.0, May 3rd, 2018
   part of MiniZip project

   Copyright (C) 2010-2018 Nathan Moinvaziri
@@ -1,5 +1,5 @@
 /* mz_strm_win32.c -- Stream for filesystem access for windows
-   Version 2.2.7, January 30th, 2018
+   Version 2.3.0, May 3rd, 2018
   part of the MiniZip project

   Copyright (C) 2010-2018 Nathan Moinvaziri
@@ -40,7 +40,7 @@

 /***************************************************************************/

-mz_stream_vtbl mz_stream_win32_vtbl = {
+static mz_stream_vtbl mz_stream_win32_vtbl = {
    mz_stream_win32_open,
    mz_stream_win32_is_open,
    mz_stream_win32_read,
@@ -50,7 +50,9 @@ mz_stream_vtbl mz_stream_win32_vtbl = {
    mz_stream_win32_close,
    mz_stream_win32_error,
    mz_stream_win32_create,
-    mz_stream_win32_delete
+    mz_stream_win32_delete,
+    NULL,
+    NULL
 };

 /***************************************************************************/
@@ -82,7 +84,6 @@ int32_t mz_stream_win32_open(void *stream, const char *path, int32_t mode)
    {
        desired_access = GENERIC_READ;
        creation_disposition = OPEN_EXISTING;
-        share_mode &= FILE_SHARE_WRITE;
    }
    else if (mode & MZ_OPEN_MODE_APPEND)
    {
@@ -100,7 +101,7 @@ int32_t mz_stream_win32_open(void *stream, const char *path, int32_t mode)
    }

    path_wide_size = MultiByteToWideChar(CP_UTF8, 0, path, -1, NULL, 0);
-    path_wide = (wchar_t *)malloc((path_wide_size + 1) * sizeof(wchar_t));
+    path_wide = (wchar_t *)MZ_ALLOC((path_wide_size + 1) * sizeof(wchar_t));
    memset(path_wide, 0, sizeof(wchar_t) * (path_wide_size + 1));

    MultiByteToWideChar(CP_UTF8, 0, path, -1, path_wide, path_wide_size);
@@ -111,7 +112,7 @@ int32_t mz_stream_win32_open(void *stream, const char *path, int32_t mode)
    win32->handle = CreateFileW(path_wide, desired_access, share_mode, NULL, creation_disposition, flags_attribs, NULL);
 #endif

-    free(path_wide);
+    MZ_FREE(path_wide);

    if (mz_stream_win32_is_open(stream) != MZ_OK)
    {
@@ -122,7 +123,7 @@ int32_t mz_stream_win32_open(void *stream, const char *path, int32_t mode)
    if (mode & MZ_OPEN_MODE_APPEND)
        return mz_stream_win32_seek(stream, 0, MZ_SEEK_END);

-    return MZ_OK; 
+    return MZ_OK;
 }

 int32_t mz_stream_win32_is_open(void *stream)
@@ -262,7 +263,7 @@ void *mz_stream_win32_create(void **stream)
 {
    mz_stream_win32 *win32 = NULL;

-    win32 = (mz_stream_win32 *)malloc(sizeof(mz_stream_win32));
+    win32 = (mz_stream_win32 *)MZ_ALLOC(sizeof(mz_stream_win32));
    if (win32 != NULL)
    {
        memset(win32, 0, sizeof(mz_stream_win32));
@@ -281,11 +282,11 @@ void mz_stream_win32_delete(void **stream)
        return;
    win32 = (mz_stream_win32 *)*stream;
    if (win32 != NULL)
-        free(win32);
+        MZ_FREE(win32);
    *stream = NULL;
 }

 void *mz_stream_win32_get_interface(void)
 {
    return (void *)&mz_stream_win32_vtbl;
-}
+}
@@ -1,5 +1,5 @@
 /* mz_sstrm_win32.h -- Stream for filesystem access for windows
-   Version 2.2.7, January 30th, 2018
+   Version 2.3.0, May 3rd, 2018
   part of the MiniZip project

   Copyright (C) 2010-2018 Nathan Moinvaziri
@@ -1,5 +1,5 @@
 /* mz_strm_zlib.c -- Stream for zlib inflate/deflate
-   Version 2.2.7, January 30th, 2018
+   Version 2.3.0, May 3rd, 2018
   part of the MiniZip project

   Copyright (C) 2010-2018 Nathan Moinvaziri
@@ -33,7 +33,7 @@

 /***************************************************************************/

-mz_stream_vtbl mz_stream_zlib_vtbl = {
+static mz_stream_vtbl mz_stream_zlib_vtbl = {
    mz_stream_zlib_open,
    mz_stream_zlib_is_open,
    mz_stream_zlib_read,
@@ -70,6 +70,7 @@ int32_t mz_stream_zlib_open(void *stream, const char *path, int32_t mode)
 {
    mz_stream_zlib *zlib = (mz_stream_zlib *)stream;

+    MZ_UNUSED(path);

    zlib->zstream.data_type = Z_BINARY;
    zlib->zstream.zalloc = Z_NULL;
@@ -180,7 +181,7 @@ int32_t mz_stream_zlib_read(void *stream, void *buf, int32_t size)

        if (err == Z_STREAM_END)
            break;
- 
+
        if (err != Z_OK)
        {
            zlib->error = err;
@@ -267,11 +268,17 @@ int32_t mz_stream_zlib_write(void *stream, const void *buf, int32_t size)

 int64_t mz_stream_zlib_tell(void *stream)
 {
+    MZ_UNUSED(stream);
+
    return MZ_STREAM_ERROR;
 }

 int32_t mz_stream_zlib_seek(void *stream, int64_t offset, int32_t origin)
 {
+    MZ_UNUSED(stream);
+    MZ_UNUSED(offset);
+    MZ_UNUSED(origin);
+
    return MZ_STREAM_ERROR;
 }

@@ -342,7 +349,7 @@ void *mz_stream_zlib_create(void **stream)
 {
    mz_stream_zlib *zlib = NULL;

-    zlib = (mz_stream_zlib *)malloc(sizeof(mz_stream_zlib));
+    zlib = (mz_stream_zlib *)MZ_ALLOC(sizeof(mz_stream_zlib));
    if (zlib != NULL)
    {
        memset(zlib, 0, sizeof(mz_stream_zlib));
@@ -362,7 +369,7 @@ void mz_stream_zlib_delete(void **stream)
        return;
    zlib = (mz_stream_zlib *)*stream;
    if (zlib != NULL)
-        free(zlib);
+        MZ_FREE(zlib);
    *stream = NULL;
 }

@@ -1,5 +1,5 @@
 /* mz_strm_zlib.h -- Stream for zlib inflate/deflate
-   Version 2.2.7, January 30th, 2018
+   Version 2.3.0, May 3rd, 2018
   part of the MiniZip project

   Copyright (C) 2010-2018 Nathan Moinvaziri
@@ -1,5 +1,5 @@
 /* zip.c -- Zip manipulation
-   Version 2.2.7, January 30th, 2018
+   Version 2.3.0, May 3rd, 2018
   part of the MiniZip project

   Copyright (C) 2010-2018 Nathan Moinvaziri
@@ -85,7 +85,7 @@ typedef struct mz_zip_s
    uint64_t cd_offset;             // offset of start of central directory
    uint64_t cd_size;               // size of the central directory

-    uint16_t entry_scanned; 
+    uint16_t entry_scanned;
    uint16_t entry_opened;          // 1 if a file in the zip is currently writ.
    uint64_t entry_read;

@@ -312,7 +312,7 @@ static int32_t mz_zip_read_cd(void *handle)

    if ((err == MZ_OK) && (comment_size > 0))
    {
-        zip->comment = (char *)malloc(comment_size + 1);
+        zip->comment = (char *)MZ_ALLOC(comment_size + 1);
        if (zip->comment)
        {
            if (mz_stream_read(zip->stream, zip->comment, comment_size) != comment_size)
@@ -336,7 +336,7 @@ static int32_t mz_zip_write_cd(void *handle)

    if (zip == NULL)
        return MZ_PARAM_ERROR;
-    
+
    if (mz_stream_get_prop_int64(zip->stream, MZ_STREAM_PROP_DISK_NUMBER, &disk_number) == MZ_OK)
        zip->disk_number_with_cd = (uint32_t)disk_number;
    if (mz_stream_get_prop_int64(zip->stream, MZ_STREAM_PROP_DISK_SIZE, &disk_size) == MZ_OK && disk_size > 0)
@@ -347,11 +347,11 @@ static int32_t mz_zip_write_cd(void *handle)
    mz_stream_seek(zip->cd_mem_stream, 0, MZ_SEEK_END);
    zip->cd_size = (uint32_t)mz_stream_tell(zip->cd_mem_stream);
    mz_stream_seek(zip->cd_mem_stream, 0, MZ_SEEK_SET);
-    
+
    err = mz_stream_copy(zip->stream, zip->cd_mem_stream, (int32_t)zip->cd_size);

    // Write the ZIP64 central directory header
-    if (zip->cd_offset >= UINT32_MAX || zip->number_entry > UINT32_MAX)
+    if (zip->cd_offset >= UINT32_MAX || zip->number_entry > UINT16_MAX)
    {
        zip64_eocd_pos_inzip = mz_stream_tell(zip->stream);

@@ -395,12 +395,12 @@ static int32_t mz_zip_write_cd(void *handle)
            err = mz_stream_write_uint64(zip->stream, zip64_eocd_pos_inzip);
        // Number of the disk with the start of the central directory
        if (err == MZ_OK)
-            err = mz_stream_write_uint32(zip->stream, zip->disk_number_with_cd);
+            err = mz_stream_write_uint32(zip->stream, zip->disk_number_with_cd + 1);
    }

    // Write the central directory header

-    // Signature 
+    // Signature
    if (err == MZ_OK)
        err = mz_stream_write_uint32(zip->stream, MZ_ZIP_MAGIC_ENDHEADER);
    // Number of this disk
@@ -456,7 +456,7 @@ extern void* mz_zip_open(void *stream, int32_t mode)
    int32_t err = MZ_OK;


-    zip = (mz_zip *)malloc(sizeof(mz_zip));
+    zip = (mz_zip *)MZ_ALLOC(sizeof(mz_zip));
    if (zip == NULL)
        return NULL;

@@ -558,9 +558,9 @@ extern int32_t mz_zip_close(void *handle)
    }

    if (zip->comment)
-        free(zip->comment);
+        MZ_FREE(zip->comment);

-    free(zip);
+    MZ_FREE(zip);

    return err;
 }
@@ -583,9 +583,9 @@ extern int32_t mz_zip_set_comment(void *handle, const char *comment)
    if (zip == NULL || comment == NULL)
        return MZ_PARAM_ERROR;
    if (zip->comment != NULL)
-        free(zip->comment);
+        MZ_FREE(zip->comment);
    comment_size = (uint16_t)(strlen(comment) + 1);
-    zip->comment = (char *)malloc(comment_size);
+    zip->comment = (char *)MZ_ALLOC(comment_size);
    strncpy(zip->comment, comment, comment_size);
    return MZ_OK;
 }
@@ -608,27 +608,6 @@ extern int32_t mz_zip_set_version_madeby(void *handle, uint16_t version_madeby)
    return MZ_OK;
 }

-static int16_t mz_zip_entry_get_version_needed(int16_t zip64, mz_zip_file *file_info)
-{
-    int16_t version_needed = 20;
-
-    if (file_info == NULL)
-        return MZ_PARAM_ERROR;
-    if (file_info->version_needed > 0)
-        version_needed = file_info->version_needed;
-    if (zip64)
-        version_needed = 45;
-#ifdef HAVE_AES
-    if ((file_info->flag & MZ_ZIP_FLAG_ENCRYPTED) && (file_info->aes_version))
-        version_needed = 51;
-#endif
-#ifdef HAVE_LZMA
-    if (file_info->compression_method == MZ_COMPRESS_METHOD_LZMA)
-        version_needed = 63;
-#endif
-    return version_needed;
-}
-
 // Get info about the current file in the zip file
 static int32_t mz_zip_entry_read_header(void *stream, uint8_t local, mz_zip_file *file_info, void *file_info_stream)
 {
@@ -662,7 +641,7 @@ static int32_t mz_zip_entry_read_header(void *stream, uint8_t local, mz_zip_file
        err = MZ_FORMAT_ERROR;
    else if ((!local) && (magic != MZ_ZIP_MAGIC_CENTRALHEADER))
        err = MZ_FORMAT_ERROR;
-    
+
    // Read header fields
    if (err == MZ_OK)
    {
@@ -755,7 +734,7 @@ static int32_t mz_zip_entry_read_header(void *stream, uint8_t local, mz_zip_file
                if ((err == MZ_OK) && (file_info->disk_offset == UINT32_MAX))
                    err = mz_stream_read_uint64(file_info_stream, &value64);
                file_info->disk_offset = value64;
-                if ((err == MZ_OK) && (file_info->disk_number == UINT32_MAX))
+                if ((err == MZ_OK) && (file_info->disk_number == UINT16_MAX))
                    err = mz_stream_read_uint32(file_info_stream, &file_info->disk_number);
            }
            // NTFS extra field
@@ -770,17 +749,17 @@ static int32_t mz_zip_entry_read_header(void *stream, uint8_t local, mz_zip_file
                    if (err == MZ_OK)
                        err = mz_stream_read_uint16(file_info_stream, &ntfs_attrib_size);

-                    if (ntfs_attrib_id == 0x01 && ntfs_attrib_size >= 8)
+                    if ((ntfs_attrib_id == 0x01) && (ntfs_attrib_size == 24))
                    {
                        err = mz_stream_read_uint64(file_info_stream, &ntfs_time);
                        mz_zip_ntfs_to_unix_time(ntfs_time, &file_info->modified_date);

-                        if ((err == MZ_OK) && (ntfs_attrib_size >= 16))
+                        if (err == MZ_OK)
                        {
                            err = mz_stream_read_uint64(file_info_stream, &ntfs_time);
                            mz_zip_ntfs_to_unix_time(ntfs_time, &file_info->accessed_date);
                        }
-                        if ((err == MZ_OK) && (ntfs_attrib_size >= 24))
+                        if (err == MZ_OK)
                        {
                            err = mz_stream_read_uint64(file_info_stream, &ntfs_time);
                            mz_zip_ntfs_to_unix_time(ntfs_time, &file_info->creation_date);
@@ -852,13 +831,16 @@ static int32_t mz_zip_entry_write_header(void *stream, uint8_t local, mz_zip_fil
    uint16_t extrafield_zip64_size = 0;
    uint16_t extrafield_ntfs_size = 0;
    uint16_t filename_size = 0;
+    uint16_t filename_length = 0;
    uint16_t comment_size = 0;
+    uint16_t version_needed = 0;
    uint8_t zip64 = 0;
    int32_t err = MZ_OK;

    if (file_info == NULL)
        return MZ_PARAM_ERROR;

+    // Calculate extra field sizes
    extrafield_size = file_info->extrafield_size;

    if (file_info->uncompressed_size >= UINT32_MAX)
@@ -868,8 +850,19 @@ static int32_t mz_zip_entry_write_header(void *stream, uint8_t local, mz_zip_fil
    if (file_info->disk_offset >= UINT32_MAX)
        extrafield_zip64_size += 8;

-    // Use 64-bit data descriptor if we don't know uncompressed size ahead of time
-    zip64 = (local && file_info->uncompressed_size == 0) || (extrafield_zip64_size > 0);
+    if (file_info->zip64 == MZ_ZIP64_AUTO)
+    {
+        // If uncompressed size is unknown, assume zip64 for 64-bit data descriptors
+        zip64 = (local && file_info->uncompressed_size == 0) || (extrafield_zip64_size > 0);
+    }
+    else if (file_info->zip64 == MZ_ZIP64_FORCE)
+        zip64 = 1;
+    else if (file_info->zip64 == MZ_ZIP64_DISABLE)
+    {
+        // Zip64 extension is required to zip file
+        if (extrafield_zip64_size > 0)
+            return MZ_PARAM_ERROR;
+    }

    if (zip64)
    {
@@ -881,23 +874,15 @@ static int32_t mz_zip_entry_write_header(void *stream, uint8_t local, mz_zip_fil
        extrafield_size += 4 + 7;
 #endif
    // NTFS timestamps
-    if (file_info->modified_date != 0)
-        extrafield_ntfs_size += 8;
-    if (file_info->accessed_date != 0)
-        extrafield_ntfs_size += 8;
-    if (file_info->creation_date != 0)
-        extrafield_ntfs_size += 8;
-
-    if (extrafield_ntfs_size > 4)
+    if ((file_info->modified_date != 0) &&
+        (file_info->accessed_date != 0) &&
+        (file_info->creation_date != 0))
    {
-        extrafield_ntfs_size += 4 + 4;
-
+        extrafield_ntfs_size += 8 + 8 + 8 + 4 + 2 + 2;
        extrafield_size += 4;
        extrafield_size += extrafield_ntfs_size;
    }

-    file_info->version_needed = mz_zip_entry_get_version_needed(zip64, file_info);
-
    if (local)
        err = mz_stream_write_uint32(stream, MZ_ZIP_MAGIC_LOCALHEADER);
    else
@@ -907,8 +892,26 @@ static int32_t mz_zip_entry_write_header(void *stream, uint8_t local, mz_zip_fil
            err = mz_stream_write_uint16(stream, file_info->version_madeby);
    }

+    // Calculate version needed to extract
    if (err == MZ_OK)
-        err = mz_stream_write_uint16(stream, file_info->version_needed);
+    {
+        version_needed = file_info->version_needed;
+        if (version_needed == 0)
+        {
+            version_needed = 20;
+            if (zip64)
+                version_needed = 45;
+#ifdef HAVE_AES
+            if ((file_info->flag & MZ_ZIP_FLAG_ENCRYPTED) && (file_info->aes_version))
+                version_needed = 51;
+#endif
+#ifdef HAVE_LZMA
+            if (file_info->compression_method == MZ_COMPRESS_METHOD_LZMA)
+                version_needed = 63;
+#endif
+        }
+        err = mz_stream_write_uint16(stream, version_needed);
+    }
    if (err == MZ_OK)
        err = mz_stream_write_uint16(stream, file_info->flag);
    if (err == MZ_OK)
@@ -944,9 +947,20 @@ static int32_t mz_zip_entry_write_header(void *stream, uint8_t local, mz_zip_fil
            err = mz_stream_write_uint32(stream, (uint32_t)file_info->uncompressed_size);
    }

-    filename_size = (uint16_t)strlen(file_info->filename);
+    filename_length = (uint16_t)strlen(file_info->filename);
    if (err == MZ_OK)
+    {
+        filename_size = filename_length;
+        if (mz_zip_attrib_is_dir(file_info->external_fa, file_info->version_madeby) == MZ_OK)
+        {
+            if ((file_info->filename[filename_length - 1] == '/') || 
+                (file_info->filename[filename_length - 1] == '\\'))
+                filename_length -= 1;
+            else
+                filename_size += 1;
+        }
        err = mz_stream_write_uint16(stream, filename_size);
+    }
    if (err == MZ_OK)
        err = mz_stream_write_uint16(stream, extrafield_size);

@@ -973,8 +987,14 @@ static int32_t mz_zip_entry_write_header(void *stream, uint8_t local, mz_zip_fil

    if (err == MZ_OK)
    {
-        if (mz_stream_write(stream, file_info->filename, filename_size) != filename_size)
+        if (mz_stream_write(stream, file_info->filename, filename_length) != filename_length)
            err = MZ_STREAM_ERROR;
+        if (err == MZ_OK)
+        {
+            // Ensure that directories have a slash appended to them for compatibility
+            if (mz_zip_attrib_is_dir(file_info->external_fa, file_info->version_madeby) == MZ_OK)
+                err = mz_stream_write_uint8(stream, '/');
+        }
    }
    if (err == MZ_OK)
    {
@@ -1006,17 +1026,17 @@ static int32_t mz_zip_entry_write_header(void *stream, uint8_t local, mz_zip_fil
            err = mz_stream_write_uint16(stream, 0x01);
        if (err == MZ_OK)
            err = mz_stream_write_uint16(stream, extrafield_ntfs_size - 8);
-        if ((err == MZ_OK) && (file_info->modified_date != 0))
+        if (err == MZ_OK)
        {
            mz_zip_unix_to_ntfs_time(file_info->modified_date, &ntfs_time);
            err = mz_stream_write_uint64(stream, ntfs_time);
        }
-        if ((err == MZ_OK) && (file_info->accessed_date != 0))
+        if (err == MZ_OK)
        {
            mz_zip_unix_to_ntfs_time(file_info->accessed_date, &ntfs_time);
            err = mz_stream_write_uint64(stream, ntfs_time);
        }
-        if ((err == MZ_OK) && (file_info->creation_date != 0))
+        if (err == MZ_OK)
        {
            mz_zip_unix_to_ntfs_time(file_info->creation_date, &ntfs_time);
            err = mz_stream_write_uint64(stream, ntfs_time);
@@ -1079,10 +1099,10 @@ static int32_t mz_zip_entry_open_int(void *handle, int16_t compression_method, i
        return MZ_PARAM_ERROR;
    }

-    if ((zip->file_info.flag & MZ_ZIP_FLAG_ENCRYPTED) && (password == NULL))
+    if ((zip->file_info.flag & MZ_ZIP_FLAG_ENCRYPTED) && (password == NULL) && (zip->compression_method != MZ_COMPRESS_METHOD_RAW))
        return MZ_PARAM_ERROR;

-    if ((err == MZ_OK) && (zip->file_info.flag & MZ_ZIP_FLAG_ENCRYPTED))
+    if ((err == MZ_OK) && (zip->file_info.flag & MZ_ZIP_FLAG_ENCRYPTED) && (zip->compression_method != MZ_COMPRESS_METHOD_RAW))
    {
 #ifdef HAVE_AES
        if (zip->file_info.aes_version)
@@ -1159,7 +1179,7 @@ static int32_t mz_zip_entry_open_int(void *handle, int16_t compression_method, i
        }
        else
        {
-            if (zip->file_info.flag & MZ_ZIP_FLAG_ENCRYPTED || zip->compression_method == MZ_COMPRESS_METHOD_RAW)
+            if (zip->compression_method == MZ_COMPRESS_METHOD_RAW || zip->file_info.flag & MZ_ZIP_FLAG_ENCRYPTED)
            {
                max_total_in = zip->file_info.compressed_size;
                if (mz_stream_get_prop_int64(zip->crypt_stream, MZ_STREAM_PROP_FOOTER_SIZE, &footer_size) == MZ_OK)
@@ -1168,6 +1188,11 @@ static int32_t mz_zip_entry_open_int(void *handle, int16_t compression_method, i
                    max_total_in -= total_in;
                mz_stream_set_prop_int64(zip->compress_stream, MZ_STREAM_PROP_TOTAL_IN_MAX, max_total_in);
            }
+            if (zip->compression_method == MZ_COMPRESS_METHOD_LZMA && (zip->file_info.flag & MZ_ZIP_FLAG_LZMA_EOS_MARKER) == 0)
+            {
+                mz_stream_set_prop_int64(zip->compress_stream, MZ_STREAM_PROP_TOTAL_IN_MAX, zip->file_info.compressed_size);
+                mz_stream_set_prop_int64(zip->compress_stream, MZ_STREAM_PROP_TOTAL_OUT_MAX, zip->file_info.uncompressed_size);
+            }
        }

        mz_stream_set_base(zip->compress_stream, zip->crypt_stream);
@@ -1216,7 +1241,7 @@ extern int32_t mz_zip_entry_read_open(void *handle, int16_t raw, const char *pas
        return MZ_PARAM_ERROR;
    if (zip->entry_scanned == 0)
        return MZ_PARAM_ERROR;
-    if ((zip->file_info.flag & MZ_ZIP_FLAG_ENCRYPTED) && (password == NULL))
+    if ((zip->file_info.flag & MZ_ZIP_FLAG_ENCRYPTED) && (password == NULL) && (!raw))
        return MZ_PARAM_ERROR;

    if (zip->file_info.disk_number == zip->disk_number_with_cd)
@@ -1238,8 +1263,7 @@ extern int32_t mz_zip_entry_read_open(void *handle, int16_t raw, const char *pas
    return err;
 }

-extern int32_t mz_zip_entry_write_open(void *handle, const mz_zip_file *file_info,
-    int16_t compress_level, const char *password)
+extern int32_t mz_zip_entry_write_open(void *handle, const mz_zip_file *file_info, int16_t compress_level, const char *password)
 {
    mz_zip *zip = (mz_zip *)handle;
    int64_t disk_number = 0;
@@ -1264,8 +1288,6 @@ extern int32_t mz_zip_entry_write_open(void *handle, const mz_zip_file *file_inf
    memcpy(&zip->file_info, file_info, sizeof(mz_zip_file));

    compression_method = zip->file_info.compression_method;
-    if (compress_level == 0)
-        compression_method = MZ_COMPRESS_METHOD_RAW;

    if (compression_method == MZ_COMPRESS_METHOD_DEFLATE)
    {
@@ -1288,8 +1310,8 @@ extern int32_t mz_zip_entry_write_open(void *handle, const mz_zip_file *file_inf
    else
        zip->file_info.flag &= ~MZ_ZIP_FLAG_ENCRYPTED;

-    if (mz_stream_get_prop_int64(zip->stream, MZ_STREAM_PROP_DISK_NUMBER, &disk_number) == MZ_OK)
-        zip->file_info.disk_number = (uint32_t)disk_number;
+    mz_stream_get_prop_int64(zip->stream, MZ_STREAM_PROP_DISK_NUMBER, &disk_number);
+    zip->file_info.disk_number = (uint32_t)disk_number;

    zip->file_info.disk_offset = mz_stream_tell(zip->stream);
    zip->file_info.crc = 0;
@@ -1300,6 +1322,9 @@ extern int32_t mz_zip_entry_write_open(void *handle, const mz_zip_file *file_inf
        zip->file_info.aes_encryption_mode = MZ_AES_ENCRYPTION_MODE_256;
 #endif

+    if ((compress_level == 0) || (mz_zip_attrib_is_dir(zip->file_info.external_fa, zip->file_info.version_madeby) == MZ_OK))
+        compression_method = MZ_COMPRESS_METHOD_RAW;
+
    if (err == MZ_OK)
        err = mz_zip_entry_write_header(zip->stream, 1, &zip->file_info);
    if (err == MZ_OK)
@@ -1450,7 +1475,7 @@ static int32_t mz_zip_goto_next_entry_int(void *handle)
    zip->entry_scanned = 0;

    mz_stream_set_prop_int64(zip->cd_stream, MZ_STREAM_PROP_DISK_NUMBER, -1);
-    
+
    err = mz_stream_seek(zip->cd_stream, zip->cd_current_pos, MZ_SEEK_SET);
    if (err == MZ_OK)
        err = mz_zip_entry_read_header(zip->cd_stream, 0, &zip->file_info, zip->file_info_stream);
@@ -1468,6 +1493,40 @@ extern int32_t mz_zip_get_number_entry(void *handle, int64_t *number_entry)
    return MZ_OK;
 }

+extern int32_t mz_zip_get_disk_number_with_cd(void *handle, uint32_t *disk_number_with_cd)
+{
+    mz_zip *zip = (mz_zip *)handle;
+    if (zip == NULL || disk_number_with_cd == NULL)
+        return MZ_PARAM_ERROR;
+    *disk_number_with_cd = zip->disk_number_with_cd;
+    return MZ_OK;
+}
+
+extern int64_t mz_zip_get_entry(void *handle)
+{
+    mz_zip *zip = (mz_zip *)handle;
+
+    if (zip == NULL)
+        return MZ_PARAM_ERROR;
+
+    return zip->cd_current_pos;
+}
+
+extern int32_t mz_zip_goto_entry(void *handle, uint64_t cd_pos)
+{
+    mz_zip *zip = (mz_zip *)handle;
+
+    if (zip == NULL)
+        return MZ_PARAM_ERROR;
+
+    if (cd_pos < zip->cd_start_pos || cd_pos > zip->cd_start_pos + zip->cd_size)
+        return MZ_PARAM_ERROR;
+
+    zip->cd_current_pos = cd_pos;
+
+    return mz_zip_goto_next_entry_int(handle);
+}
+
 extern int32_t mz_zip_goto_first_entry(void *handle)
 {
    mz_zip *zip = (mz_zip *)handle;
@@ -1521,10 +1580,30 @@ extern int32_t mz_zip_locate_entry(void *handle, const char *filename, mz_filena

 /***************************************************************************/

+int32_t mz_zip_attrib_is_dir(int32_t attributes, int32_t version_madeby)
+{
+    int32_t host_system = (uint8_t)(version_madeby >> 8);
+
+    if (host_system == MZ_HOST_SYSTEM_MSDOS || host_system == MZ_HOST_SYSTEM_WINDOWS_NTFS)
+    {
+        if ((attributes & 0x10) == 0x10) // FILE_ATTRIBUTE_DIRECTORY
+            return MZ_OK;
+    }
+    else if (host_system == MZ_HOST_SYSTEM_UNIX || host_system == MZ_HOST_SYSTEM_OSX_DARWIN)
+    {
+        if ((attributes & 00170000) == 0040000) // S_ISDIR
+            return MZ_OK;
+    }
+
+    return MZ_EXIST_ERROR;
+}
+
+/***************************************************************************/
+
 static int32_t mz_zip_invalid_date(const struct tm *ptm)
 {
 #define datevalue_in_range(min, max, value) ((min) <= (value) && (value) <= (max))
-    return (!datevalue_in_range(0, 207, ptm->tm_year) ||
+    return (!datevalue_in_range(0, 127 + 80, ptm->tm_year) ||  // 1980-based year, allow 80 extra
            !datevalue_in_range(0, 11, ptm->tm_mon) ||
            !datevalue_in_range(1, 31, ptm->tm_mday) ||
            !datevalue_in_range(0, 23, ptm->tm_hour) ||
@@ -1574,9 +1653,13 @@ int32_t mz_zip_time_t_to_tm(time_t unix_time, struct tm *ptm)
    struct tm *ltm = NULL;
    if (ptm == NULL)
        return MZ_PARAM_ERROR;
-    ltm = localtime(&unix_time);
+    ltm = localtime(&unix_time);  // Returns a 1900-based year
    if (ltm == NULL)
+    {
+        // Invalid date stored, so don't return it
+        memset(ptm, 0, sizeof(struct tm));
        return MZ_INTERNAL_ERROR;
+    }
    memcpy(ptm, ltm, sizeof(struct tm));
    return MZ_OK;
 }
@@ -1590,7 +1673,7 @@ uint32_t mz_zip_time_t_to_dos_date(time_t unix_time)

 uint32_t mz_zip_tm_to_dosdate(const struct tm *ptm)
 {
-    struct tm fixed_tm = { 0 };
+    struct tm fixed_tm;

    // Years supported:

@@ -1602,12 +1685,12 @@ uint32_t mz_zip_tm_to_dosdate(const struct tm *ptm)
    memcpy(&fixed_tm, ptm, sizeof(struct tm));
    if (fixed_tm.tm_year >= 1980) // range [1980, 2107]
        fixed_tm.tm_year -= 1980;
-    else if (fixed_tm.tm_year >= 80) // range [80, 99]
+    else if (fixed_tm.tm_year >= 80) // range [80, 207]
        fixed_tm.tm_year -= 80;
    else // range [00, 79]
        fixed_tm.tm_year += 20;

-    if (mz_zip_invalid_date(ptm))
+    if (mz_zip_invalid_date(&fixed_tm))
        return 0;

    return (uint32_t)(((fixed_tm.tm_mday) + (32 * (fixed_tm.tm_mon + 1)) + (512 * fixed_tm.tm_year)) << 16) |
@@ -1,5 +1,5 @@
 /* mz_zip.h -- Zip manipulation
-   Version 2.2.7, January 30th, 2018
+   Version 2.3.0, May 3rd, 2018
   part of the MiniZip project

   Copyright (C) 2010-2018 Nathan Moinvaziri
@@ -30,9 +30,9 @@ extern "C" {

 typedef struct mz_zip_file_s
 {
-    uint16_t version_madeby;            // version made by 
+    uint16_t version_madeby;            // version made by
    uint16_t version_needed;            // version needed to extract
-    uint16_t flag;                      // general purpose bit flag 
+    uint16_t flag;                      // general purpose bit flag
    uint16_t compression_method;        // compression method
    time_t   modified_date;             // last modified date in unix time
    time_t   accessed_date;             // last accessed date in unix time
@@ -47,6 +47,7 @@ typedef struct mz_zip_file_s
    uint64_t disk_offset;               // relative offset of local header
    uint16_t internal_fa;               // internal file attributes
    uint32_t external_fa;               // external file attributes
+    uint16_t zip64;                     // zip64 extension mode

    char     *filename;                 // filename string
    uint8_t  *extrafield;               // extrafield data
@@ -108,19 +109,31 @@ extern int32_t mz_zip_entry_close(void *handle);
 extern int32_t mz_zip_get_number_entry(void *handle, int64_t *number_entry);
 // Get the total number of entries

+extern int32_t mz_zip_get_disk_number_with_cd(void *handle, uint32_t *disk_number_with_cd);
+// Get the the disk number containing the central directory record
+
+extern int64_t mz_zip_get_entry(void *handle);
+// Return offset of the current entry in the zip file
+
+extern int32_t mz_zip_goto_entry(void *handle, uint64_t cd_pos);
+// Go to specified entry in the zip file
+
 extern int32_t mz_zip_goto_first_entry(void *handle);
-// Go to the first entry in the zip file 
+// Go to the first entry in the zip file

 extern int32_t 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

 typedef int32_t (*mz_filename_compare_cb)(void *handle, const char *filename1, const char *filename2);
-extern int32_t mz_zip_locate_entry(void *handle, const char *filename, 
+extern int32_t mz_zip_locate_entry(void *handle, const char *filename,
    mz_filename_compare_cb filename_compare_cb);
 // Locate the file with the specified name in the zip file or MZ_END_LIST if not found

 /***************************************************************************/

+int32_t  mz_zip_attrib_is_dir(int32_t attributes, int32_t version_madeby);
+// Checks to see if the attribute is a directory based on platform
+
 int32_t  mz_zip_dosdate_to_tm(uint64_t dos_date, struct tm *ptm);
 // Convert dos date/time format to struct tm

@@ -128,7 +141,7 @@ time_t   mz_zip_dosdate_to_time_t(uint64_t dos_date);
 // Convert dos date/time format to time_t

 int32_t  mz_zip_time_t_to_tm(time_t unix_time, struct tm *ptm);
-// Convert time_t to time struct 
+// Convert time_t to time struct

 uint32_t mz_zip_time_t_to_dos_date(time_t unix_time);
 // Convert time_t to dos date/time format
Author	SHA1	Message	Date
Nathan Moinvaziri	a4b83e8e95	Version 2.3.0.	2018-05-03 17:59:04 -07:00
Nathan Moinvaziri	121e088a7d	Add back auto detection of zip64. #258	2018-05-03 17:57:20 -07:00
Nathan Moinvaziri	46f714348e	Simplification & fixed formatting. #258	2018-05-03 17:24:32 -07:00
Nathan Moinvaziri	a56a08cf79	Allow configuration of zip64 support. #258	2018-05-03 09:35:37 -07:00
Nathan Moinvaziri	8a50b4b5df	Merge pull request #261 from vszakats/ws2 whitespace fixes	2018-05-02 20:09:48 -07:00
Nathan Moinvaziri	37ceb026db	Merge branch 'dev' into ws2	2018-05-02 20:09:25 -07:00
Nathan Moinvaziri	586300a787	Use MZ_UNUSED where applicable. #262	2018-05-02 20:07:45 -07:00
Nathan Moinvaziri	92c8d77cfb	Merge pull request #262 from vszakats/warn2 silence various warnings	2018-05-02 20:04:57 -07:00
Nathan Moinvaziri	c546a57f90	Fixed wrong defined MZ_ALLOC and MZ_FREE. #249	2018-05-02 20:02:30 -07:00
Nathan Moinvaziri	5244fc00c4	Added MZ_UNUSED #262 Added #define for malloc and free. #249	2018-05-02 20:01:35 -07:00
Viktor Szakats	4c76400cce	silence various warnings - unused parameters - trivial const stripping cases - missing NULL initializers from vtbls - missing static scope for vtbls Missing newlines at EOF addressed in a separate PR. It's be nice to replace `ZIP_UNUSED var` and `(void)var` with a global and non-gcc-specific solution, such as: #define MZ_UNUSED(symbol) (void)symbol	2018-05-02 21:40:29 +00:00
Nathan Moinvaziri	240b3b6709	Added comment for slash appending for dirs.	2018-05-02 13:38:14 -07:00
Nathan Moinvaziri	e54582384a	Remove any existing slash at the end of filename.	2018-05-02 13:07:03 -07:00
Nathan Moinvaziri	3ad1a92279	Append slash to directories for compatibility. #257	2018-05-02 13:04:41 -07:00
Viktor Szakats	447dd06750	whitespace fixes - remove line-ending spaces - always have a file-ending newline - remove duplicate file-ending newlines	2018-05-02 19:59:38 +00:00
Nathan Moinvaziri	4827f71a08	Fixed formatting.	2018-05-02 10:50:47 -07:00
Nathan Moinvaziri	bb3b75bc09	Fixed directory compression method. Move zip attribute detection to mz_zip. #257	2018-05-02 10:48:51 -07:00
Nathan Moinvaziri	b7bd0421c5	Merge branch 'dev' of https://github.com/nmoinvaz/minizip into dev	2018-05-02 09:55:15 -07:00
Nathan Moinvaziri	9a3ae75a48	Fixed print out of directories. #257	2018-05-02 09:54:44 -07:00
Nathan Moinvaziri	120bea1a6f	Merge pull request #260 from vszakats/castwarn fix cast warning (seen with LLVM/Clang)	2018-05-02 09:26:21 -07:00
Nathan Moinvaziri	4a41245099	Added msdos host system and dir detection.	2018-05-02 09:24:09 -07:00
Viktor Szakats	0f0535fcaa	fix cast warning (seen with LLVM/Clang) ``` mz_compat.c:390:62: warning: passing 'uint32_t ' (aka 'unsigned int ') to parameter of type 'int32_t ' (aka 'int ') converts between pointers to integer types with different sign [-Wpointer-sign] err = mz_zip_get_disk_number_with_cd(compat->handle, &pglobal_info->number_disk_with_CD); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ mz_zip.h:112:70: note: passing argument to parameter 'disk_number_with_cd' here extern int32_t mz_zip_get_disk_number_with_cd(void handle, int32_t disk_number_with_cd); ^ ```	2018-05-02 13:15:58 +00:00
Nathan Moinvaziri	8d8deb4e5d	Added listing of attributes.	2018-05-01 21:54:15 -07:00
Nathan Moinvaziri	83bce6e82a	Allow version_needed to be less than customized. #258	2018-05-01 18:10:17 -07:00
Nathan Moinvaziri	739f03f951	Updated comment.	2018-05-01 13:57:28 -07:00
Nathan Moinvaziri	7583be518c	Fixed is directory check on linux.	2018-05-01 13:55:28 -07:00
Nathan Moinvaziri	0619c3e6c4	Merge branch 'dev' of https://github.com/nmoinvaz/minizip into dev	2018-05-01 13:51:13 -07:00
Nathan Moinvaziri	e33916b608	Added support for directory entries in minizip. #257 Added support for file attributes.	2018-05-01 13:45:08 -07:00
Nathan Moinvaziri	596f19f79e	Merge pull request #256 from vszakats/rawlzmaflag fix to set MZ_ZIP_FLAG_LZMA_EOS_MARKER flag in raw mode	2018-04-30 09:34:30 -07:00
Viktor Szakats	2884e67a1a	fix to set MZ_ZIP_FLAG_LZMA_EOS_MARKER flag in raw mode in function mz_zip_entry_write_open() Fixes https://github.com/nmoinvaz/minizip/issues/255	2018-04-30 08:16:09 +00:00
Nathan Moinvaziri	ae5740b19c	Merge pull request #253 from vszakats/eolws remove whitespace @ eol	2018-04-24 08:50:47 -07:00
Nathan Moinvaziri	b14ded7d01	Merge pull request #254 from vszakats/patch-1 README.md: switch an URL to use HTTPS	2018-04-24 08:49:48 -07:00
Viktor Szakats	914049d19c	README.md: switch an URL to use HTTPS	2018-04-24 14:20:35 +02:00
Viktor Szakats	915b82e95b	remove whitespace @ eol	2018-04-24 10:02:39 +00:00
Nathan Moinvaziri	0f09a00810	Fixed formatting.	2018-04-23 18:48:30 -07:00
Nathan Moinvaziri	f5f23217b3	Fixed formatting.	2018-04-23 18:46:09 -07:00
Nathan Moinvaziri	5d362f43eb	Merge pull request #252 from vszakats/fixes improve compatibility with original minizip	2018-04-23 18:31:31 -07:00
Viktor Szakats	ce26dba5ba	improve compatibility with original minizip * Fix NULL pointer dereference when calling zipOpen() or unzOpen2() with NULL filefunc table. * Rename dos_date to dosDate in zip/unzip structures to be compatible with original minizip. * Add tm struct timestamps to zip/unzip structures and populate them with the dosDate value for unzip and use the value passed into it on zip, if dosDate is zero (mimicing original minizip behaviour.) * Change zipWriteInFileInZip() return value to be a status code (ZIP_OK or ZIP_ERRNO) instead of the number of bytes written. This way it's minizip compatible. * Add zipCloseFileInZipRaw64() compatibility wrapper. * Add these compatibility functions: unzGetOffset() unzGetOffset64() unzSetOffset() unzSetOffset64() * Add stub for compatibility: unzGetLocalExtrafield() It will always return zero for now. * Add original minizip types for compatiblity: tm_unz, tm_zip, ZPOS64_T * Add these minizip (non-compatiblity) APIs: mz_zip_get_entry() mz_zip_goto_entry() * zipOpenNewFileInZip() to use the default filename of "-" if filename parameter was NULL. For minizip compatibility. Fix mz_zip_entry_open_int() and mz_zip_entry_read_open() failing with MZ_PARAM_ERROR in raw mode * Add/cleanup some date-related comments * mz_zip_time_t_to_tm() to clear the `tm` structure in case localtime() call failed. * Fix mz_zip_tm_to_dosdate() to do the date validation on the normalized date (the year in particular), not on the raw value passed by the caller. This makes it work correctly when year is passed as-is, such as 1990. The reference minizip was the version that comes with the latest zlib, currently at 1.2.11.	2018-04-23 22:38:05 +00:00
Nathan Moinvaziri	ad8e3dd4b1	Version 2.2.9.	2018-04-18 20:54:52 -07:00
Nathan Moinvaziri	53e1d650e5	Fixed append mode does not work under linux. #250	2018-04-18 20:51:00 -07:00
Nathan Moinvaziri	bcd64ca3b8	Merge branch 'dev'	2018-03-27 20:44:10 -07:00
Nathan Moinvaziri	078f20290f	Don't add gitignore.	2018-03-27 20:41:18 -07:00
Nathan Moinvaziri	9c98a6b180	Don't use z_crc_t typedef.	2018-03-27 20:40:21 -07:00
Nathan Moinvaziri	a30ff41e9d	Remove unnecessary aes files.	2018-03-27 20:39:54 -07:00
Nathan Moinvaziri	a43eb98099	Remove src directory.	2018-03-27 20:37:53 -07:00
Nathan Moinvaziri	8d8a987eea	Fixed overflow when getting the disk number with cd. #248	2018-03-19 18:23:13 -07:00
Nathan Moinvaziri	c5f0063c75	Version 2.2.8.	2018-03-15 11:14:11 -07:00
Nathan Moinvaziri	d57eb5de40	Merge branch 'master' into dev	2018-03-15 11:12:35 -07:00
Nathan Moinvaziri	672dc834f1	Merge pull request #240 from juanii/fix_233 Fixes #233	2018-03-15 10:43:52 -07:00
Nathan Moinvaziri	5e8f4d7d88	Fixed formatting.	2018-03-15 10:43:18 -07:00
Nathan Moinvaziri	68a48aa20e	Merge pull request #247 from tonytheodore/master Minor fixes for mingw cross-compilation	2018-03-13 14:54:55 -07:00
Tony Theodore	b5ac94fd24	Use `Requires: zlib` to fix pkg-config ordering of static libs	2018-03-13 20:14:45 +11:00
Tony Theodore	b4020169b7	Fix naming with automatic `lib` prefix on mingw shared build	2018-03-13 20:11:13 +11:00
Nathan Moinvaziri	b8f38540c2	Define HAVE_ZLIB #244	2018-03-09 01:19:48 -08:00
Nathan Moinvaziri	d65cd2ea9d	Merge pull request #246 from jthorniley/pkgconfig-linux-only Make pkg-config build dependency linux only	2018-03-05 19:12:32 -08:00
James Thorniley	6cd3054608	Make pkg-config build dependency linux only	2018-03-05 10:51:11 +00:00
Nathan Moinvaziri	f44494aad2	Merge pull request #243 from jhudsonWA/master Fix Unknown type name 'z_crc_t' in minizip 2.x	2018-02-21 18:49:48 -08:00
Nathan Moinvaziri	7c5ccae39c	Fixed formatting.	2018-02-21 18:49:20 -08:00
Joshua Hudson	82df346497	Update mz_strm_crypt.c fix Unknown type name 'z_crc_t'	2018-02-21 17:18:09 -08:00
Nathan Moinvaziri	225c627f7d	Update README.md	2018-02-16 23:11:45 -08:00
Nathan Moinvaziri	db8158a5cc	Merge pull request #242 from juanii/master Fix compat layer's unzGetGlobalInfo() for archives without global com…	2018-02-14 17:30:27 -08:00
juanii	62090966b1	Removed unnecessary assignment to size_comment.	2018-02-14 22:27:08 -03:00
juanii	dec6a65a64	Merge remote-tracking branch 'upstream/master'	2018-02-14 15:37:29 -03:00
juanii	7d7b1c9554	Fix compat layer's unzGetGlobalInfo() for archives without global comment.	2018-02-14 15:30:31 -03:00
Nathan Moinvaziri	a4a4a1c665	Merge pull request #241 from juanii/fix_237 Fixes #237	2018-02-13 20:01:26 -08:00
juanii	b8887e9179	Fixes #237	2018-02-14 00:51:05 -03:00
Nathan Moinvaziri	c0cc7df743	Merge pull request #236 from juanii/master Fix: unzGetGlobalInfo failed with MZ_EXIST_ERROR if there was no comment in ZIP file.	2018-02-13 17:23:37 -08:00
Nathan Moinvaziri	c5e2d27028	Initialize values to zero when retrieving global info	2018-02-13 17:05:04 -08:00
Nathan Moinvaziri	bb7b62fcb4	Merge pull request #238 from juanii/fix_ntfs_extra_field Fix ntfs extra field	2018-02-13 15:31:48 -08:00
Nathan Moinvaziri	e56962c624	Fixed formatting	2018-02-13 15:31:15 -08:00
Nathan Moinvaziri	d9e159a395	Fixed formatting	2018-02-13 15:30:30 -08:00
juanii	4578b9dd33	Remove unnecessary assignment.	2018-02-12 15:18:26 -03:00
Nathan Moinvaziri	b44f9c07b8	Merge pull request #239 from juanii/fix_disk_number Fix: Field disk_number is 16bit, will never contain UINT32_MAX.	2018-02-12 07:21:23 -08:00
juanii	55bcdaf3c4	Fixes #233	2018-02-11 20:55:57 -03:00
juanii	8f6f2ad5fb	mz_compat: Init file_info struct to zeroes	2018-02-11 14:39:57 -03:00
juanii	7063b0e2e9	Read NTFS extra field only if all (modify, access, creation) timestamps are present.	2018-02-11 14:39:57 -03:00
juanii	3679a3dcdc	Add NTFS extra field only if all (modified, accessed, creation) timestamps are present.	2018-02-11 14:39:57 -03:00
juanii	4ae7992c2e	Fix: Field disk_number is 16bit, will never contain UINT32_MAX.	2018-02-11 14:29:36 -03:00
juanii	566b978768	Fix: unzGetGlobalInfo failed with MZ_EXIST_ERROR if there was no comment in ZIP file.	2018-02-10 15:08:21 -03:00
Nathan Moinvaziri	7a3820c539	Merge pull request #234 from juanii/master ZIP64 format is required if number of entries in archive is greater than 65535.	2018-02-09 17:36:53 -08:00
Nathan Moinvaziri	bca5f2761d	Fixed formatting.	2018-02-09 17:33:49 -08:00
Nathan Moinvaziri	f7d49e2d7c	Merge pull request #235 from rip-nsk/fix_zipOpenNewFileInZip5 fix zipOpenNewFileInZip5	2018-02-08 19:59:53 -08:00
Nathan Moinvaziri	f8b3d67c67	Fixed formatting	2018-02-08 19:59:33 -08:00
rip.nsk	2043f834b0	fix zipOpenNewFileInZip5	2018-02-08 14:08:06 -08:00
juanii	c65486db27	Proper value for "total number of disk" field in ZIP64 CD locator	2018-02-08 17:07:07 -03:00
juanii	30589b5419	Host system must be placed in high byte of "version made by" field. ZIP version in lower byte.	2018-02-08 14:43:02 -03:00
juanii	3f59ffc209	ZIP64 format is required if number of entries in archive is greater than 65535.	2018-02-08 12:44:17 -03:00
Nathan Moinvaziri	d487d78b30	Merge pull request #232 from rip-nsk/Use_Z_PREFIX_if_needed Check zlib is compiled with zprefix and use Z_PREFIX if needed.	2018-02-05 17:56:40 -08:00
Nathan Moinvaziri	1d5b57bd9b	Merge pull request #231 from rip-nsk/keep_FILE_SHARE_READ_if_MZ_OPEN_MODE_READ keep FILE_SHARE_READ if MZ_OPEN_MODE_READ	2018-02-05 17:51:21 -08:00
rip.nsk	9e89bb1ee0	Check zlib is compiled with zprefix and use Z_PREFIX if needed.	2018-02-05 12:42:03 -08:00
rip.nsk	6c717b6558	keep FILE_SHARE_READ if MZ_OPEN_MODE_READ	2018-02-05 12:33:30 -08:00