Version 2.8.9.

zlib-ng · Jul 4, 2019 · 32fd805 · 32fd805
1 parent 84498c7
commit 32fd805
Show file tree

Hide file tree

Showing 49 changed files with 265 additions and 266 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -34,7 +34,7 @@ endif()
 enable_language(C)
 
 # Minizip library version
-set(VERSION "2.8.8")
+set(VERSION "2.8.9")
 
 # Minizip api version
 set(SOVERSION "2.5")

diff --git a/Minizip.podspec b/Minizip.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name     = 'Minizip'
-  s.version  = '2.8.8'
+  s.version  = '2.8.9'
   s.license  = 'zlib'
   s.summary  = 'Minizip contrib in zlib with the latest bug fixes and advanced features'
   s.description = <<-DESC

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
-# minizip 2.8.8
+# minizip 2.8.9
 
-minizip is a zip manipulation library written in C that is supported on Windows, macOS, and Linux. 
+minizip is a zip manipulation library written in C that is supported on Windows, macOS, and Linux.
 
 [![License: Zlib](https://img.shields.io/badge/license-zlib-lightgrey.svg)](https://github.com/nmoinvaz/minizip/blob/master/LICENSE)
 [![Code Quality: Cpp](https://img.shields.io/lgtm/grade/cpp/g/nmoinvaz/minizip.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/nmoinvaz/minizip/context:cpp)
@@ -119,6 +119,6 @@ cmake --build .
 
 Thanks go out to all the people who have taken the time to contribute code reviews, testing and/or patches. This project would not have been as good without you.
 
-Thanks to [Gilles Vollant](https://www.winimage.com/zLibDll/minizip.html) on which this work is originally based on. 
+Thanks to [Gilles Vollant](https://www.winimage.com/zLibDll/minizip.html) on which this work is originally based on.
 
 The [ZIP format](https://github.com/nmoinvaz/minizip/blob/master/doc/appnote.txt) was defined by Phil Katz of PKWARE.
diff --git a/minigzip.c b/minigzip.c
@@ -1,5 +1,5 @@
 /* minigzip.c
-   Version 2.8.8, May 22, 2019
+   Version 2.8.9, July 4, 2019
    part of the MiniZip project
 
    Copyright (C) 2010-2019 Nathan Moinvaziri

diff --git a/minizip.c b/minizip.c
@@ -1,5 +1,5 @@
 /* minizip.c
-   Version 2.8.8, May 22, 2019
+   Version 2.8.9, July 4, 2019
    part of the MiniZip project
 
    Copyright (C) 2010-2019 Nathan Moinvaziri
@@ -183,7 +183,7 @@ int32_t minizip_list(const char *path)
         /* Print entry information */
         printf("%12"PRId64" %12"PRId64"  %3"PRIu32"%% %6s%c %8"PRIx32" %2.2"PRIu32\
                "-%2.2"PRIu32"-%2.2"PRIu32" %2.2"PRIu32":%2.2"PRIu32" %8.8"PRIx32"   %s\n",
-                file_info->compressed_size, file_info->uncompressed_size, ratio, 
+                file_info->compressed_size, file_info->uncompressed_size, ratio,
                 string_method, crypt, file_info->external_fa,
                 (uint32_t)tmu_date.tm_mon + 1, (uint32_t)tmu_date.tm_mday,
                 (uint32_t)tmu_date.tm_year % 100,
@@ -214,7 +214,7 @@ int32_t minizip_add_entry_cb(void *handle, void *userdata, mz_zip_file *file_inf
 {
     MZ_UNUSED(handle);
     MZ_UNUSED(userdata);
-    
+
     /* Print the current file we are trying to compress */
     printf("Adding %s\n", file_info->filename);
     return MZ_OK;
@@ -227,7 +227,7 @@ int32_t minizip_add_progress_cb(void *handle, void *userdata, mz_zip_file *file_
     uint8_t raw = 0;
 
     MZ_UNUSED(userdata);
-    
+
     mz_zip_writer_get_raw(handle, &raw);
 
     if (raw && file_info->compressed_size > 0)
@@ -237,7 +237,7 @@ int32_t minizip_add_progress_cb(void *handle, void *userdata, mz_zip_file *file_
 
     /* Print the progress of the current compress operation */
     if (options->verbose)
-        printf("%s - %"PRId64" / %"PRId64" (%.02f%%)\n", file_info->filename, position, 
+        printf("%s - %"PRId64" / %"PRId64" (%.02f%%)\n", file_info->filename, position,
             file_info->uncompressed_size, progress);
     return MZ_OK;
 }
@@ -247,7 +247,7 @@ int32_t minizip_add_overwrite_cb(void *handle, void *userdata, const char *path)
     minizip_opt *options = (minizip_opt *)userdata;
 
     MZ_UNUSED(handle);
-    
+
     if (options->overwrite == 0)
     {
         /* If ask the user what to do because append and overwrite args not set */
@@ -340,7 +340,7 @@ int32_t minizip_extract_entry_cb(void *handle, void *userdata, mz_zip_file *file
     MZ_UNUSED(handle);
     MZ_UNUSED(userdata);
     MZ_UNUSED(path);
-    
+
     /* Print the current entry extracting */
     printf("Extracting %s\n", file_info->filename);
     return MZ_OK;
@@ -353,7 +353,7 @@ int32_t minizip_extract_progress_cb(void *handle, void *userdata, mz_zip_file *f
     uint8_t raw = 0;
 
     MZ_UNUSED(userdata);
-    
+
     mz_zip_reader_get_raw(handle, &raw);
 
     if (raw && file_info->compressed_size > 0)
@@ -363,7 +363,7 @@ int32_t minizip_extract_progress_cb(void *handle, void *userdata, mz_zip_file *f
 
     /* Print the progress of the current extraction */
     if (options->verbose)
-        printf("%s - %"PRId64" / %"PRId64" (%.02f%%)\n", file_info->filename, position, 
+        printf("%s - %"PRId64" / %"PRId64" (%.02f%%)\n", file_info->filename, position,
             file_info->uncompressed_size, progress);
 
     return MZ_OK;
@@ -375,7 +375,7 @@ int32_t minizip_extract_overwrite_cb(void *handle, void *userdata, mz_zip_file *
 
     MZ_UNUSED(handle);
     MZ_UNUSED(file_info);
-    
+
     /* Verify if we want to overwrite current entry on disk */
     if (options->overwrite == 0)
     {
@@ -718,7 +718,7 @@ int main(int argc, const char *argv[])
             path_arg = i;
     }
     printf("\n");
-    
+
     if (err == MZ_SUPPORT_ERROR)
     {
         printf("Feature not supported\n");

diff --git a/mz.h b/mz.h
@@ -1,5 +1,5 @@
 /* mz.h -- Errors codes, zip flags and magic
-   Version 2.8.8, May 22, 2019
+   Version 2.8.9, July 4, 2019
    part of the MiniZip project
 
    Copyright (C) 2010-2019 Nathan Moinvaziri
@@ -15,7 +15,7 @@
 /***************************************************************************/
 
 /* MZ_VERSION */
-#define MZ_VERSION                      ("2.8.8")
+#define MZ_VERSION                      ("2.8.9")
 
 /* MZ_ERROR */
 #define MZ_OK                           (0)  /* zlib */
@@ -230,7 +230,7 @@ typedef unsigned long long uint64_t;
 #ifndef INT16_MAX
 #  define INT16_MAX   32767
 #endif
-#ifndef INT32_MAX 
+#ifndef INT32_MAX
 #  define INT32_MAX   2147483647L
 #endif
 #ifndef INT64_MAX
@@ -239,8 +239,8 @@ typedef unsigned long long uint64_t;
 #ifndef UINT16_MAX
 #  define UINT16_MAX  65535U
 #endif
-#ifndef UINT32_MAX 
-#  define UINT32_MAX  4294967295UL 
+#ifndef UINT32_MAX
+#  define UINT32_MAX  4294967295UL
 #endif
 #ifndef UINT64_MAX
 #  define UINT64_MAX  18446744073709551615ULL

diff --git a/mz_compat.c b/mz_compat.c
@@ -1,5 +1,5 @@
 /* mz_compat.c -- Backwards compatible interface for older versions
-   Version 2.8.8, May 22, 2019
+   Version 2.8.9, July 4, 2019
    part of the MiniZip project
 
    Copyright (C) 2010-2019 Nathan Moinvaziri
@@ -245,7 +245,7 @@ int zipOpenNewFileInZip3_64(zipFile file, const char *filename, const zip_filein
 
 int zipOpenNewFileInZip2(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, 
+    uint16_t size_extrafield_global, const char *comment, uint16_t compression_method, int level,
     int raw)
 {
     return zipOpenNewFileInZip4_64(file, filename, zipfi, extrafield_local, size_extrafield_local,
@@ -255,7 +255,7 @@ int zipOpenNewFileInZip2(zipFile file, const char *filename, const zip_fileinfo
 
 int zipOpenNewFileInZip2_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, 
+    uint16_t size_extrafield_global, const char *comment, uint16_t compression_method, int level,
     int raw, int zip64)
 {
     return zipOpenNewFileInZip4_64(file, filename, zipfi, extrafield_local, size_extrafield_local,
@@ -274,7 +274,7 @@ int zipOpenNewFileInZip(zipFile file, const char *filename, const zip_fileinfo *
 
 int zipOpenNewFileInZip_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, 
+    uint16_t size_extrafield_global, const char *comment, uint16_t compression_method, int level,
     int zip64)
 {
     return zipOpenNewFileInZip4_64(file, filename, zipfi, extrafield_local, size_extrafield_local,
@@ -835,14 +835,14 @@ int unzGetFilePos(unzFile file, unz_file_pos *file_pos)
 {
     mz_compat *compat = (mz_compat *)file;
     int32_t offset = 0;
-    
+
     if (compat == NULL || file_pos == NULL)
         return UNZ_PARAMERROR;
-    
+
     offset = unzGetOffset(file);
     if (offset < 0)
         return offset;
-    
+
     file_pos->pos_in_zip_directory = (uint32_t)offset;
     file_pos->num_of_file = (uint32_t)compat->entry_index;
     return MZ_OK;
@@ -866,14 +866,14 @@ int unzGetFilePos64(unzFile file, unz64_file_pos *file_pos)
 {
     mz_compat *compat = (mz_compat *)file;
     int64_t offset = 0;
-    
+
     if (compat == NULL || file_pos == NULL)
         return UNZ_PARAMERROR;
-    
+
     offset = unzGetOffset64(file);
     if (offset < 0)
         return (int)offset;
-    
+
     file_pos->pos_in_zip_directory = offset;
     file_pos->num_of_file = compat->entry_index;
     return UNZ_OK;
@@ -928,11 +928,11 @@ int unzGetLocalExtrafield(unzFile file, void *buf, unsigned int len)
 
     if (compat == NULL || buf == NULL || len >= INT32_MAX)
         return UNZ_PARAMERROR;
-    
+
     err = mz_zip_entry_get_local_info(compat->handle, &file_info);
     if (err != MZ_OK)
         return err;
-    
+
     bytes_to_copy = (int32_t)len;
     if (bytes_to_copy > file_info->extrafield_size)
         bytes_to_copy = file_info->extrafield_size;

diff --git a/mz_compat.h b/mz_compat.h
@@ -1,5 +1,5 @@
 /* mz_compat.h -- Backwards compatible interface for older versions
-   Version 2.8.8, May 22, 2019
+   Version 2.8.9, July 4, 2019
    part of the MiniZip project
 
    Copyright (C) 2010-2019 Nathan Moinvaziri
@@ -111,15 +111,15 @@ ZEXPORT int     zipOpenNewFileInZip(zipFile file, const char *filename, const zi
     uint16_t size_extrafield_global, const char *comment, uint16_t compression_method, int level);
 ZEXPORT int     zipOpenNewFileInZip_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, 
+    uint16_t size_extrafield_global, const char *comment, uint16_t compression_method, int level,
     int zip64);
 ZEXPORT int     zipOpenNewFileInZip2(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, 
+    uint16_t size_extrafield_global, const char *comment, uint16_t compression_method, int level,
     int raw);
 ZEXPORT int     zipOpenNewFileInZip2_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, 
+    uint16_t size_extrafield_global, const char *comment, uint16_t compression_method, int level,
     int raw, int zip64);
 ZEXPORT int     zipOpenNewFileInZip3(zipFile file, const char *filename, const zip_fileinfo *zipfi,
     const void *extrafield_local, uint16_t size_extrafield_local, const void *extrafield_global,
@@ -251,7 +251,7 @@ typedef struct unz_file_info_s
 typedef int (*unzFileNameComparer)(unzFile file, const char *filename1, const char *filename2);
 typedef int (*unzIteratorFunction)(unzFile file);
 typedef int (*unzIteratorFunction2)(unzFile file, unz_file_info64 *pfile_info, char *filename,
-    uint16_t filename_size, void *extrafield, uint16_t extrafield_size, char *comment, 
+    uint16_t filename_size, void *extrafield, uint16_t extrafield_size, char *comment,
     uint16_t comment_size);
 
 /***************************************************************************/
@@ -279,10 +279,10 @@ ZEXPORT int     unzCloseCurrentFile(unzFile file);
 
 
 ZEXPORT int     unzGetCurrentFileInfo(unzFile file, unz_file_info *pfile_info, char *filename,
-    uint16_t filename_size, void *extrafield, uint16_t extrafield_size, char *comment, 
+    uint16_t filename_size, void *extrafield, uint16_t extrafield_size, char *comment,
     uint16_t comment_size);
 ZEXPORT int     unzGetCurrentFileInfo64(unzFile file, unz_file_info64 * pfile_info, char *filename,
-    uint16_t filename_size, void *extrafield, uint16_t extrafield_size, char *comment, 
+    uint16_t filename_size, void *extrafield, uint16_t extrafield_size, char *comment,
     uint16_t comment_size);
 
 ZEXPORT int     unzGoToFirstFile(unzFile file);