Updated MiniZip to version 1.1 That added support for Unicode files and more compression options

git-svn-id: https://server.scottellis.com.au/svn/mim_plugs@505 4f64403b-2f21-0410-a795-97e2b3489a10

20 files changed, 7510 insertions, 5067 deletions

diff --git a/updater/options.cpp b/updater/options.cpp
index 12b7fc0..a8b2f10 100644
--- a/updater/options.cpp
+++ b/updater/options.cpp
@@ -625,7 +625,6 @@ void LoadOptions() {
 		}

 		DBFreeVariant(&dbv);

 	} else {

-

 		_tcscpy(options.zip_folder, mir_path);

 		_tcscat(options.zip_folder, _T("\\Updater"));

 		_tcscat(options.zip_folder, _T("\\Archives"));

diff --git a/updater/socket.cpp b/updater/socket.cpp
index 94a52da..0cbe2cd 100644
--- a/updater/socket.cpp
+++ b/updater/socket.cpp
@@ -1,9 +1,7 @@
 #include "common.h"

 #include "socket.h"

 

-

-void ShowAndLogError(TCHAR *message) {

-}

+void unzip_file(TCHAR* zipfile, TCHAR* dest);
 

 bool GetFile(char *url, TCHAR *temp_folder, char *plugin_name, char *version, bool dlls_only, int recurse_count /*=0*/) {

 	if(recurse_count > MAX_REDIRECT_RECURSE) {

@@ -34,12 +32,11 @@ bool GetFile(char *url, TCHAR *temp_folder, char *plugin_name, char *version, bo
 		return false;

 	}

 

-	_tcscpy(save_file, temp_folder);

-	_tcscat(save_file, _T("\\"));

 	TCHAR *temp_str = GetTString(plugin_name);

-	_tcscat(save_file, temp_str);

+	mir_sntprintf(save_file, SIZEOF(save_file), _T("%s\\%s"), temp_folder, temp_str);

 	mir_free(temp_str);

-	if(version) {

+	if (version) 

+	{

 		temp_str = GetTString(version);

 		_tcscat(save_file, _T("_"));

 		_tcscat(save_file, temp_str);

@@ -97,24 +94,19 @@ bool GetFile(char *url, TCHAR *temp_folder, char *plugin_name, char *version, bo
 					CallService(MS_NETLIB_FREEHTTPREQUESTSTRUCT, 0, (LPARAM)resp);

 					resp = 0;

 

-					if(ext && *ext && strcmp(ext, ".zip") == 0) {

-

-						if(!options.no_unzip) {

-							char *ans_save_file = mir_t2a(save_file), *ans_temp_folder = mir_t2a(temp_folder);

-							//MessageBoxA(0, ans_temp_folder, ans_save_file, MB_OK);

-							unzip_file(ans_save_file, ans_temp_folder); 

-							mir_free(ans_save_file);

-							mir_free(ans_temp_folder);

-						}

+					if(ext && *ext && strcmp(ext, ".zip") == 0) 

+					{

+						if(!options.no_unzip) 

+							unzip_file(save_file, temp_folder); 

 												

-						if(options.save_zips) {

+						if(options.save_zips) 

+						{

 							TCHAR save_archive[MAX_PATH];

-							_tcscpy(save_archive, options.zip_folder);

-							_tcscat(save_archive, _T("\\"));

-							_tcscat(save_archive, save_file + _tcslen(temp_folder) + 1);

+							mir_sntprintf(save_archive, SIZEOF(save_archive), _T("%s%s"), options.zip_folder, _tcsrchr(save_file, '\\'));

 

 							DeleteFile(save_archive);

-							if(!MoveFile(save_file, save_archive)) {

+							if (!MoveFile(save_file, save_archive)) 

+							{

 								char buff[128];

 								mir_snprintf(buff, SIZEOF(buff), "GetFile: could not move file, code: %u", GetLastError());

 								NLog(buff);

diff --git a/updater/socket.h b/updater/socket.h
index 5879476..c0fdea8 100644
--- a/updater/socket.h
+++ b/updater/socket.h
@@ -7,8 +7,6 @@
 #include "popups.h"

 

 

-#include "zbin/minizip/munzip.h"

-

 // gets a file from a url, puts in in the temp_folder and names it after the plugin_name (same extension as url)

 // it will automatically unzip a zip file, putting the contents in the temp_folder and using the names from the archive

 // if it unzips the file, the zip archive is removed afterward

diff --git a/updater/unzipfile.cpp b/updater/unzipfile.cpp
new file mode 100644
index 0000000..1128698
--- /dev/null
+++ b/updater/unzipfile.cpp
@@ -0,0 +1,76 @@
+#include "common.h"

+#include "utils.h"

+
+#include <unzip.h>
+#include <iowin32.h>
+
+bool extractCurrentFile(unzFile uf, TCHAR *path)
+{
+    int err = UNZ_OK;
+    unz_file_info64 file_info;
+    char filename_inzip[MAX_PATH];
+	char buf[8192];
+
+    err = unzGetCurrentFileInfo64(uf, &file_info, filename_inzip, sizeof(filename_inzip), NULL, 0, buf,sizeof(buf));
+    if (err != UNZ_OK) return false;
+
+	err = unzOpenCurrentFile(uf);
+	if (err != UNZ_OK) return false;
+
+	TCHAR save_file[MAX_PATH];
+	TCHAR* p = mir_utf8decodeT(filename_inzip);
+	mir_sntprintf(save_file, SIZEOF(save_file), _T("%s\\%s"), path, p);
+	mir_free(p);
+
+	for (p = save_file; *p; ++p) if (*p == '/') *p = '\\'; 
+
+	p = _tcsrchr(save_file, '\\'); if (p) *p = 0;
+	CreatePath(save_file);
+	if (p) *p = '\\';
+
+	HANDLE hFile = CreateFile(save_file, GENERIC_WRITE, FILE_SHARE_WRITE, 0, 

+		CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0);

+	
+	if (hFile != INVALID_HANDLE_VALUE)
+    {
+		for (;;)
+		{
+			err = unzReadCurrentFile(uf, buf, sizeof(buf));
+			if (err <= 0) break;
+
+			DWORD bytes;
+			if (!WriteFile(hFile, buf, err, &bytes, FALSE))
+			{
+				err = UNZ_ERRNO;
+				break;
+			}
+		}
+
+		FILETIME ftLocal, ftCreate, ftLastAcc, ftLastWrite;
+		GetFileTime(hFile, &ftCreate, &ftLastAcc, &ftLastWrite);
+		DosDateTimeToFileTime(HIWORD(file_info.dosDate), LOWORD(file_info.dosDate), &ftLocal);
+		LocalFileTimeToFileTime(&ftLocal, &ftLastWrite);
+		SetFileTime(hFile, &ftCreate, &ftLastAcc, &ftLastWrite);
+
+        CloseHandle(hFile);
+
+        unzCloseCurrentFile(uf); /* don't lose the error */
+    }
+	return true;
+}
+
+void unzip_file(TCHAR* zipfile, TCHAR* dest)
+{
+	zlib_filefunc64_def ffunc;
+	fill_win32_filefunc64(&ffunc);
+
+	unzFile uf = unzOpen2_64(zipfile, &ffunc);
+	if (uf)
+	{
+		do {
+			extractCurrentFile(uf, dest);
+		}
+		while (unzGoToNextFile(uf) == UNZ_OK);
+		unzClose(uf);
+	}
+}
diff --git a/updater/updater_9.vcproj b/updater/updater_9.vcproj
index 9e4c520..afd820d 100644
--- a/updater/updater_9.vcproj
+++ b/updater/updater_9.vcproj
@@ -51,7 +51,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories="zbin;../../include;..\..\..\include"

+				AdditionalIncludeDirectories="zbin;../../include;..\..\..\include;;bzip2-1.0.3;zbin\minizip"

 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;BZ_NO_STDIO;UPDATER_EXPORTS;UNICODE"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="3"

@@ -83,7 +83,9 @@
 				AdditionalLibraryDirectories="zbin/x32"

 				ModuleDefinitionFile="updater.def"

 				GenerateDebugInformation="true"

+				ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb"

 				GenerateMapFile="true"

+				MapFileName="$(IntDir)\$(TargetName).map"

 				MapExports="true"

 				BaseAddress="0x22000000"

 				RandomizedBaseAddress="1"

@@ -145,7 +147,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories="zbin;../../include;..\..\..\include"

+				AdditionalIncludeDirectories="zbin;../../include;..\..\..\include;;bzip2-1.0.3;zbin\minizip"

 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;BZ_NO_STDIO;UPDATER_EXPORTS;_CRT_SECURE_NO_WARNINGS"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="3"

@@ -177,8 +179,9 @@
 				AdditionalLibraryDirectories="zbin/x64"

 				ModuleDefinitionFile="updater.def"

 				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\updater___Win32_Debug_Unicode/updater.pdb"

+				ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb"

 				GenerateMapFile="true"

+				MapFileName="$(IntDir)\$(TargetName).map"

 				MapExports="true"

 				BaseAddress="0x22000000"

 				RandomizedBaseAddress="1"

@@ -240,7 +243,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories="zbin;../../include;..\..\..\include"

+				AdditionalIncludeDirectories="zbin;../../include;..\..\..\include;;bzip2-1.0.3;zbin\minizip"

 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;BZ_NO_STDIO;UPDATER_EXPORTS"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="3"

@@ -271,7 +274,9 @@
 				AdditionalLibraryDirectories="zbin/x32"

 				ModuleDefinitionFile="updater.def"

 				GenerateDebugInformation="true"

+				ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb"

 				GenerateMapFile="true"

+				MapFileName="$(IntDir)\$(TargetName).map"

 				MapExports="true"

 				SubSystem="0"

 				BaseAddress="0x22000000"

@@ -334,7 +339,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories="zbin;../../include;..\..\..\include"

+				AdditionalIncludeDirectories="zbin;../../include;..\..\..\include;;bzip2-1.0.3;zbin\minizip"

 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;BZ_NO_STDIO;UPDATER_EXPORTS"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="3"

@@ -366,8 +371,9 @@
 				AdditionalLibraryDirectories="zbin/x64"

 				ModuleDefinitionFile="updater.def"

 				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\Debug/updater.pdb"

+				ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb"

 				GenerateMapFile="true"

+				MapFileName="$(IntDir)\$(TargetName).map"

 				MapExports="true"

 				SubSystem="0"

 				BaseAddress="0x22000000"

@@ -433,7 +439,7 @@
 				InlineFunctionExpansion="1"

 				EnableIntrinsicFunctions="true"

 				FavorSizeOrSpeed="2"

-				AdditionalIncludeDirectories="zbin;../../include;..\..\..\include"

+				AdditionalIncludeDirectories="zbin;../../include;..\..\..\include;;bzip2-1.0.3;zbin\minizip"

 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;BZ_NO_STDIO;UPDATER_EXPORTS;UNICODE"

 				StringPooling="true"

 				RuntimeLibrary="2"

@@ -469,6 +475,9 @@
 				GenerateManifest="false"

 				ModuleDefinitionFile="updater.def"

 				GenerateDebugInformation="true"

+				ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb"

+				GenerateMapFile="true"

+				MapFileName="$(IntDir)\$(TargetName).map"

 				OptimizeReferences="2"

 				EnableCOMDATFolding="2"

 				BaseAddress="0x22000000"

@@ -536,8 +545,8 @@
 				EnableIntrinsicFunctions="true"

 				FavorSizeOrSpeed="2"

 				WholeProgramOptimization="true"

-				AdditionalIncludeDirectories="zbin;../../include;..\..\..\include"

-				PreprocessorDefinitions="BZ_NO_STDIO;WIN32;NDEBUG;_WINDOWS;_USRDLL;UPDATER_EXPORTS;_CRT_SECURE_NO_WARNINGS"

+				AdditionalIncludeDirectories="zbin;../../include;..\..\..\include;;bzip2-1.0.3;zbin\minizip"

+				PreprocessorDefinitions="BZ_NO_STDIO;HAVE_BZIP2;WIN32;NDEBUG;_WINDOWS;_USRDLL;UPDATER_EXPORTS;_CRT_SECURE_NO_WARNINGS"

 				StringPooling="true"

 				ExceptionHandling="0"

 				RuntimeLibrary="2"

@@ -566,6 +575,9 @@
 				AdditionalLibraryDirectories="zbin/x64"

 				ModuleDefinitionFile="updater.def"

 				GenerateDebugInformation="true"

+				ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb"

+				GenerateMapFile="true"

+				MapFileName="$(IntDir)\$(TargetName).map"

 				OptimizeReferences="2"

 				EnableCOMDATFolding="2"

 				BaseAddress="0x22000000"

@@ -631,7 +643,7 @@
 				InlineFunctionExpansion="1"

 				EnableIntrinsicFunctions="true"

 				FavorSizeOrSpeed="2"

-				AdditionalIncludeDirectories="zbin;../../include;..\..\..\include"

+				AdditionalIncludeDirectories="zbin;../../include;..\..\..\include;;bzip2-1.0.3;zbin\minizip"

 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;BZ_NO_STDIO;UPDATER_EXPORTS"

 				StringPooling="true"

 				RuntimeLibrary="2"

@@ -668,6 +680,9 @@
 				GenerateManifest="false"

 				ModuleDefinitionFile="updater.def"

 				GenerateDebugInformation="true"

+				ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb"

+				GenerateMapFile="true"

+				MapFileName="$(IntDir)\$(TargetName).map"

 				OptimizeReferences="2"

 				EnableCOMDATFolding="2"

 				BaseAddress="0x22000000"

@@ -733,7 +748,7 @@
 				InlineFunctionExpansion="1"

 				EnableIntrinsicFunctions="true"

 				FavorSizeOrSpeed="2"

-				AdditionalIncludeDirectories="zbin;../../include;..\..\..\include"

+				AdditionalIncludeDirectories="zbin;../../include;..\..\..\include;;bzip2-1.0.3;zbin\minizip"

 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;BZ_NO_STDIO;UPDATER_EXPORTS"

 				StringPooling="true"

 				RuntimeLibrary="2"

@@ -771,7 +786,9 @@
 				GenerateManifest="false"

 				ModuleDefinitionFile="updater.def"

 				GenerateDebugInformation="true"

-				ProgramDatabaseFile=".\Release/updater.pdb"

+				ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb"

+				GenerateMapFile="true"

+				MapFileName="$(IntDir)\$(TargetName).map"

 				OptimizeReferences="2"

 				EnableCOMDATFolding="2"

 				BaseAddress="0x22000000"

@@ -854,6 +871,10 @@
 				>

 			</File>

 			<File

+				RelativePath=".\unzipfile.cpp"

+				>

+			</File>

+			<File

 				RelativePath="updater.cpp"

 				>

 			</File>

@@ -1180,15 +1201,23 @@
 				>

 			</File>

 			<File

+				RelativePath=".\zbin\minizip\ioapi.h"

+				>

+			</File>

+			<File

 				RelativePath=".\zbin\minizip\iowin32.c"

 				>

 			</File>

 			<File

-				RelativePath=".\zbin\minizip\miniunz.c"

+				RelativePath=".\zbin\minizip\iowin32.h"

+				>

+			</File>

+			<File

+				RelativePath=".\zbin\minizip\unzip.c"

 				>

 			</File>

 			<File

-				RelativePath=".\zbin\minizip\munzip.c"

+				RelativePath=".\zbin\minizip\unzip.h"

 				>

 			</File>

 		</Filter>

diff --git a/updater/zbin/minizip/crypt.h b/updater/zbin/minizip/crypt.h
index f14a628..a01d08d 100644
--- a/updater/zbin/minizip/crypt.h
+++ b/updater/zbin/minizip/crypt.h
@@ -1,132 +1,131 @@
-/* crypt.h -- base code for crypt/uncrypt ZIPfile

-

-

-   Version 1.01e, February 12th, 2005

-

-   Copyright (C) 1998-2005 Gilles Vollant

-

-   This code is a modified version of crypting code in Infozip distribution

-

-   The encryption/decryption parts of this source code (as opposed to the

-   non-echoing password parts) were originally written in Europe.  The

-   whole source package can be freely distributed, including from the USA.

-   (Prior to January 2000, re-export from the US was a violation of US law.)

-

-   This encryption code is a direct transcription of the algorithm from

-   Roger Schlafly, described by Phil Katz in the file appnote.txt.  This

-   file (appnote.txt) is distributed with the PKZIP program (even in the

-   version without encryption capabilities).

-

-   If you don't need crypting in your application, just define symbols

-   NOCRYPT and NOUNCRYPT.

-

-   This code support the "Traditional PKWARE Encryption".

-

-   The new AES encryption added on Zip format by Winzip (see the page

-   http://www.winzip.com/aes_info.htm ) and PKWare PKZip 5.x Strong

-   Encryption is not supported.

-*/

-

-#define CRC32(c, b) ((*(pcrc_32_tab+(((int)(c) ^ (b)) & 0xff))) ^ ((c) >> 8))

-

-/***********************************************************************

- * Return the next byte in the pseudo-random sequence

- */

-static int decrypt_byte(unsigned long* pkeys, const unsigned long* pcrc_32_tab)

-{

-    unsigned temp;  /* POTENTIAL BUG:  temp*(temp^1) may overflow in an

-                     * unpredictable manner on 16-bit systems; not a problem

-                     * with any known compiler so far, though */

-

-    temp = ((unsigned)(*(pkeys+2)) & 0xffff) | 2;

-    return (int)(((temp * (temp ^ 1)) >> 8) & 0xff);

-}

-

-/***********************************************************************

- * Update the encryption keys with the next byte of plain text

- */

-static int update_keys(unsigned long* pkeys,const unsigned long* pcrc_32_tab,int c)

-{

-    (*(pkeys+0)) = CRC32((*(pkeys+0)), c);

-    (*(pkeys+1)) += (*(pkeys+0)) & 0xff;

-    (*(pkeys+1)) = (*(pkeys+1)) * 134775813L + 1;

-    {

-      register int keyshift = (int)((*(pkeys+1)) >> 24);

-      (*(pkeys+2)) = CRC32((*(pkeys+2)), keyshift);

-    }

-    return c;

-}

-

-

-/***********************************************************************

- * Initialize the encryption keys and the random header according to

- * the given password.

- */

-static void init_keys(const char* passwd,unsigned long* pkeys,const unsigned long* pcrc_32_tab)

-{

-    *(pkeys+0) = 305419896L;

-    *(pkeys+1) = 591751049L;

-    *(pkeys+2) = 878082192L;

-    while (*passwd != '\0') {

-        update_keys(pkeys,pcrc_32_tab,(int)*passwd);

-        passwd++;

-    }

-}

-

-#define zdecode(pkeys,pcrc_32_tab,c) \

-    (update_keys(pkeys,pcrc_32_tab,c ^= decrypt_byte(pkeys,pcrc_32_tab)))

-

-#define zencode(pkeys,pcrc_32_tab,c,t) \

-    (t=decrypt_byte(pkeys,pcrc_32_tab), update_keys(pkeys,pcrc_32_tab,c), t^(c))

-

-#ifdef INCLUDECRYPTINGCODE_IFCRYPTALLOWED

-

-#define RAND_HEAD_LEN  12

-   /* "last resort" source for second part of crypt seed pattern */

-#  ifndef ZCR_SEED2

-#    define ZCR_SEED2 3141592654UL     /* use PI as default pattern */

-#  endif

-

-static int crypthead(passwd, buf, bufSize, pkeys, pcrc_32_tab, crcForCrypting)

-    const char *passwd;         /* password string */

-    unsigned char *buf;         /* where to write header */

-    int bufSize;

-    unsigned long* pkeys;

-    const unsigned long* pcrc_32_tab;

-    unsigned long crcForCrypting;

-{

-    int n;                       /* index in random header */

-    int t;                       /* temporary */

-    int c;                       /* random byte */

-    unsigned char header[RAND_HEAD_LEN-2]; /* random header */

-    static unsigned calls = 0;   /* ensure different random header each time */

-

-    if (bufSize<RAND_HEAD_LEN)

-      return 0;

-

-    /* First generate RAND_HEAD_LEN-2 random bytes. We encrypt the

-     * output of rand() to get less predictability, since rand() is

-     * often poorly implemented.

-     */

-    if (++calls == 1)

-    {

-        srand((unsigned)(time(NULL) ^ ZCR_SEED2));

-    }

-    init_keys(passwd, pkeys, pcrc_32_tab);

-    for (n = 0; n < RAND_HEAD_LEN-2; n++)

-    {

-        c = (rand() >> 7) & 0xff;

-        header[n] = (unsigned char)zencode(pkeys, pcrc_32_tab, c, t);

-    }

-    /* Encrypt random header (last two bytes is high word of crc) */

-    init_keys(passwd, pkeys, pcrc_32_tab);

-    for (n = 0; n < RAND_HEAD_LEN-2; n++)

-    {

-        buf[n] = (unsigned char)zencode(pkeys, pcrc_32_tab, header[n], t);

-    }

-    buf[n++] = zencode(pkeys, pcrc_32_tab, (int)(crcForCrypting >> 16) & 0xff, t);

-    buf[n++] = zencode(pkeys, pcrc_32_tab, (int)(crcForCrypting >> 24) & 0xff, t);

-    return n;

-}

-

-#endif

+/* crypt.h -- base code for crypt/uncrypt ZIPfile
+
+
+   Version 1.01e, February 12th, 2005
+
+   Copyright (C) 1998-2005 Gilles Vollant
+
+   This code is a modified version of crypting code in Infozip distribution
+
+   The encryption/decryption parts of this source code (as opposed to the
+   non-echoing password parts) were originally written in Europe.  The
+   whole source package can be freely distributed, including from the USA.
+   (Prior to January 2000, re-export from the US was a violation of US law.)
+
+   This encryption code is a direct transcription of the algorithm from
+   Roger Schlafly, described by Phil Katz in the file appnote.txt.  This
+   file (appnote.txt) is distributed with the PKZIP program (even in the
+   version without encryption capabilities).
+
+   If you don't need crypting in your application, just define symbols
+   NOCRYPT and NOUNCRYPT.
+
+   This code support the "Traditional PKWARE Encryption".
+
+   The new AES encryption added on Zip format by Winzip (see the page
+   http://www.winzip.com/aes_info.htm ) and PKWare PKZip 5.x Strong
+   Encryption is not supported.
+*/
+
+#define CRC32(c, b) ((*(pcrc_32_tab+(((int)(c) ^ (b)) & 0xff))) ^ ((c) >> 8))
+
+/***********************************************************************
+ * Return the next byte in the pseudo-random sequence
+ */
+static int decrypt_byte(unsigned long* pkeys, const unsigned long* pcrc_32_tab)
+{
+    unsigned temp;  /* POTENTIAL BUG:  temp*(temp^1) may overflow in an
+                     * unpredictable manner on 16-bit systems; not a problem
+                     * with any known compiler so far, though */
+
+    temp = ((unsigned)(*(pkeys+2)) & 0xffff) | 2;
+    return (int)(((temp * (temp ^ 1)) >> 8) & 0xff);
+}
+
+/***********************************************************************
+ * Update the encryption keys with the next byte of plain text
+ */
+static int update_keys(unsigned long* pkeys,const unsigned long* pcrc_32_tab,int c)
+{
+    (*(pkeys+0)) = CRC32((*(pkeys+0)), c);
+    (*(pkeys+1)) += (*(pkeys+0)) & 0xff;
+    (*(pkeys+1)) = (*(pkeys+1)) * 134775813L + 1;
+    {
+      register int keyshift = (int)((*(pkeys+1)) >> 24);
+      (*(pkeys+2)) = CRC32((*(pkeys+2)), keyshift);
+    }
+    return c;
+}
+
+
+/***********************************************************************
+ * Initialize the encryption keys and the random header according to
+ * the given password.
+ */
+static void init_keys(const char* passwd,unsigned long* pkeys,const unsigned long* pcrc_32_tab)
+{
+    *(pkeys+0) = 305419896L;
+    *(pkeys+1) = 591751049L;
+    *(pkeys+2) = 878082192L;
+    while (*passwd != '\0') {
+        update_keys(pkeys,pcrc_32_tab,(int)*passwd);
+        passwd++;
+    }
+}
+
+#define zdecode(pkeys,pcrc_32_tab,c) \
+    (update_keys(pkeys,pcrc_32_tab,c ^= decrypt_byte(pkeys,pcrc_32_tab)))
+
+#define zencode(pkeys,pcrc_32_tab,c,t) \
+    (t=decrypt_byte(pkeys,pcrc_32_tab), update_keys(pkeys,pcrc_32_tab,c), t^(c))
+
+#ifdef INCLUDECRYPTINGCODE_IFCRYPTALLOWED
+
+#define RAND_HEAD_LEN  12
+   /* "last resort" source for second part of crypt seed pattern */
+#  ifndef ZCR_SEED2
+#    define ZCR_SEED2 3141592654UL     /* use PI as default pattern */
+#  endif
+
+static int crypthead(const char* passwd,      /* password string */
+                     unsigned char* buf,      /* where to write header */
+                     int bufSize,
+                     unsigned long* pkeys,
+                     const unsigned long* pcrc_32_tab,
+                     unsigned long crcForCrypting)
+{
+    int n;                       /* index in random header */
+    int t;                       /* temporary */
+    int c;                       /* random byte */
+    unsigned char header[RAND_HEAD_LEN-2]; /* random header */
+    static unsigned calls = 0;   /* ensure different random header each time */
+
+    if (bufSize<RAND_HEAD_LEN)
+      return 0;
+
+    /* First generate RAND_HEAD_LEN-2 random bytes. We encrypt the
+     * output of rand() to get less predictability, since rand() is
+     * often poorly implemented.
+     */
+    if (++calls == 1)
+    {
+        srand((unsigned)(time(NULL) ^ ZCR_SEED2));
+    }
+    init_keys(passwd, pkeys, pcrc_32_tab);
+    for (n = 0; n < RAND_HEAD_LEN-2; n++)
+    {
+        c = (rand() >> 7) & 0xff;
+        header[n] = (unsigned char)zencode(pkeys, pcrc_32_tab, c, t);
+    }
+    /* Encrypt random header (last two bytes is high word of crc) */
+    init_keys(passwd, pkeys, pcrc_32_tab);
+    for (n = 0; n < RAND_HEAD_LEN-2; n++)
+    {
+        buf[n] = (unsigned char)zencode(pkeys, pcrc_32_tab, header[n], t);
+    }
+    buf[n++] = (unsigned char)zencode(pkeys, pcrc_32_tab, (int)(crcForCrypting >> 16) & 0xff, t);
+    buf[n++] = (unsigned char)zencode(pkeys, pcrc_32_tab, (int)(crcForCrypting >> 24) & 0xff, t);
+    return n;
+}
+
+#endif
diff --git a/updater/zbin/minizip/ioapi.c b/updater/zbin/minizip/ioapi.c
index d055ed0..49958f6 100644
--- a/updater/zbin/minizip/ioapi.c
+++ b/updater/zbin/minizip/ioapi.c
@@ -1,177 +1,235 @@
-/* ioapi.c -- IO base function header for compress/uncompress .zip

-   files using zlib + zip or unzip API

-

-   Version 1.01e, February 12th, 2005

-

-   Copyright (C) 1998-2005 Gilles Vollant

-*/

-

-#include <stdio.h>

-#include <stdlib.h>

-#include <string.h>

-

-#include "zlib.h"

-#include "ioapi.h"

-

-

-

-/* I've found an old Unix (a SunOS 4.1.3_U1) without all SEEK_* defined.... */

-

-#ifndef SEEK_CUR

-#define SEEK_CUR    1

-#endif

-

-#ifndef SEEK_END

-#define SEEK_END    2

-#endif

-

-#ifndef SEEK_SET

-#define SEEK_SET    0

-#endif

-

-voidpf ZCALLBACK fopen_file_func OF((

-   voidpf opaque,

-   const char* filename,

-   int mode));

-

-uLong ZCALLBACK fread_file_func OF((

-   voidpf opaque,

-   voidpf stream,

-   void* buf,

-   uLong size));

-

-uLong ZCALLBACK fwrite_file_func OF((

-   voidpf opaque,

-   voidpf stream,

-   const void* buf,

-   uLong size));

-

-long ZCALLBACK ftell_file_func OF((

-   voidpf opaque,

-   voidpf stream));

-

-long ZCALLBACK fseek_file_func OF((

-   voidpf opaque,

-   voidpf stream,

-   uLong offset,

-   int origin));

-

-int ZCALLBACK fclose_file_func OF((

-   voidpf opaque,

-   voidpf stream));

-

-int ZCALLBACK ferror_file_func OF((

-   voidpf opaque,

-   voidpf stream));

-

-

-voidpf ZCALLBACK fopen_file_func (

-   voidpf opaque,

-   const char* filename,

-   int mode)

-{

-    FILE* file = NULL;

-    const char* mode_fopen = NULL;

-    if ((mode & ZLIB_FILEFUNC_MODE_READWRITEFILTER)==ZLIB_FILEFUNC_MODE_READ)

-        mode_fopen = "rb";

-    else

-    if (mode & ZLIB_FILEFUNC_MODE_EXISTING)

-        mode_fopen = "r+b";

-    else

-    if (mode & ZLIB_FILEFUNC_MODE_CREATE)

-        mode_fopen = "wb";

-

-    if ((filename!=NULL) && (mode_fopen != NULL))

-        file = fopen(filename, mode_fopen);

-    return file;

-}

-

-

-uLong ZCALLBACK fread_file_func (

-   voidpf opaque,

-   voidpf stream,

-   void* buf,

-   uLong size)

-{

-    uLong ret;

-    ret = (uLong)fread(buf, 1, (size_t)size, (FILE *)stream);

-    return ret;

-}

-

-

-uLong ZCALLBACK fwrite_file_func (

-   voidpf opaque,

-   voidpf stream,

-   const void* buf,

-   uLong size)

-{

-    uLong ret;

-    ret = (uLong)fwrite(buf, 1, (size_t)size, (FILE *)stream);

-    return ret;

-}

-

-long ZCALLBACK ftell_file_func (

-   voidpf opaque,

-   voidpf stream)

-{

-    long ret;

-    ret = ftell((FILE *)stream);

-    return ret;

-}

-

-long ZCALLBACK fseek_file_func (

-   voidpf opaque,

-   voidpf stream,

-   uLong offset,

-   int origin)

-{

-    int fseek_origin=0;

-    long ret;

-    switch (origin)

-    {

-    case ZLIB_FILEFUNC_SEEK_CUR :

-        fseek_origin = SEEK_CUR;

-        break;

-    case ZLIB_FILEFUNC_SEEK_END :

-        fseek_origin = SEEK_END;

-        break;

-    case ZLIB_FILEFUNC_SEEK_SET :

-        fseek_origin = SEEK_SET;

-        break;

-    default: return -1;

-    }

-    ret = 0;

-    fseek((FILE *)stream, offset, fseek_origin);

-    return ret;

-}

-

-int ZCALLBACK fclose_file_func (

-   voidpf opaque,

-   voidpf stream)

-{

-    int ret;

-    ret = fclose((FILE *)stream);

-    return ret;

-}

-

-int ZCALLBACK ferror_file_func (

-   voidpf opaque,

-   voidpf stream)

-{

-    int ret;

-    ret = ferror((FILE *)stream);

-    return ret;

-}

-

-void fill_fopen_filefunc (

-  zlib_filefunc_def* pzlib_filefunc_def)

-{

-    pzlib_filefunc_def->zopen_file = fopen_file_func;

-    pzlib_filefunc_def->zread_file = fread_file_func;

-    pzlib_filefunc_def->zwrite_file = fwrite_file_func;

-    pzlib_filefunc_def->ztell_file = ftell_file_func;

-    pzlib_filefunc_def->zseek_file = fseek_file_func;

-    pzlib_filefunc_def->zclose_file = fclose_file_func;

-    pzlib_filefunc_def->zerror_file = ferror_file_func;

-    pzlib_filefunc_def->opaque = NULL;

-}

+/* ioapi.h -- IO base function header for compress/uncompress .zip
+   part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
+
+         Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
+
+         Modifications for Zip64 support
+         Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
+
+         For more info read MiniZip_info.txt
+
+*/
+
+#if (defined(_WIN32))
+        #define _CRT_SECURE_NO_WARNINGS
+#endif
+
+#include "ioapi.h"
+
+voidpf call_zopen64 (const zlib_filefunc64_32_def* pfilefunc,const void*filename,int mode)
+{
+    if (pfilefunc->zfile_func64.zopen64_file != NULL)
+        return (*(pfilefunc->zfile_func64.zopen64_file)) (pfilefunc->zfile_func64.opaque,filename,mode);
+    else
+    {
+        return (*(pfilefunc->zopen32_file))(pfilefunc->zfile_func64.opaque,(const char*)filename,mode);
+    }
+}
+
+long call_zseek64 (const zlib_filefunc64_32_def* pfilefunc,voidpf filestream, ZPOS64_T offset, int origin)
+{
+    if (pfilefunc->zfile_func64.zseek64_file != NULL)
+        return (*(pfilefunc->zfile_func64.zseek64_file)) (pfilefunc->zfile_func64.opaque,filestream,offset,origin);
+    else
+    {
+        uLong offsetTruncated = (uLong)offset;
+        if (offsetTruncated != offset)
+            return -1;
+        else
+            return (*(pfilefunc->zseek32_file))(pfilefunc->zfile_func64.opaque,filestream,offsetTruncated,origin);
+    }
+}
+
+ZPOS64_T call_ztell64 (const zlib_filefunc64_32_def* pfilefunc,voidpf filestream)
+{
+    if (pfilefunc->zfile_func64.zseek64_file != NULL)
+        return (*(pfilefunc->zfile_func64.ztell64_file)) (pfilefunc->zfile_func64.opaque,filestream);
+    else
+    {
+        uLong tell_uLong = (*(pfilefunc->ztell32_file))(pfilefunc->zfile_func64.opaque,filestream);
+        if ((tell_uLong) == ((uLong)-1))
+            return (ZPOS64_T)-1;
+        else
+            return tell_uLong;
+    }
+}
+
+void fill_zlib_filefunc64_32_def_from_filefunc32(zlib_filefunc64_32_def* p_filefunc64_32,const zlib_filefunc_def* p_filefunc32)
+{
+    p_filefunc64_32->zfile_func64.zopen64_file = NULL;
+    p_filefunc64_32->zopen32_file = p_filefunc32->zopen_file;
+    p_filefunc64_32->zfile_func64.zerror_file = p_filefunc32->zerror_file;
+    p_filefunc64_32->zfile_func64.zread_file = p_filefunc32->zread_file;
+    p_filefunc64_32->zfile_func64.zwrite_file = p_filefunc32->zwrite_file;
+    p_filefunc64_32->zfile_func64.ztell64_file = NULL;
+    p_filefunc64_32->zfile_func64.zseek64_file = NULL;
+    p_filefunc64_32->zfile_func64.zclose_file = p_filefunc32->zclose_file;
+    p_filefunc64_32->zfile_func64.zerror_file = p_filefunc32->zerror_file;
+    p_filefunc64_32->zfile_func64.opaque = p_filefunc32->opaque;
+    p_filefunc64_32->zseek32_file = p_filefunc32->zseek_file;
+    p_filefunc64_32->ztell32_file = p_filefunc32->ztell_file;
+}
+
+
+
+static voidpf  ZCALLBACK fopen_file_func OF((voidpf opaque, const char* filename, int mode));
+static uLong   ZCALLBACK fread_file_func OF((voidpf opaque, voidpf stream, void* buf, uLong size));
+static uLong   ZCALLBACK fwrite_file_func OF((voidpf opaque, voidpf stream, const void* buf,uLong size));
+static ZPOS64_T ZCALLBACK ftell64_file_func OF((voidpf opaque, voidpf stream));
+static long    ZCALLBACK fseek64_file_func OF((voidpf opaque, voidpf stream, ZPOS64_T offset, int origin));
+static int     ZCALLBACK fclose_file_func OF((voidpf opaque, voidpf stream));
+static int     ZCALLBACK ferror_file_func OF((voidpf opaque, voidpf stream));
+
+static voidpf ZCALLBACK fopen_file_func (voidpf opaque, const char* filename, int mode)
+{
+    FILE* file = NULL;
+    const char* mode_fopen = NULL;
+    if ((mode & ZLIB_FILEFUNC_MODE_READWRITEFILTER)==ZLIB_FILEFUNC_MODE_READ)
+        mode_fopen = "rb";
+    else
+    if (mode & ZLIB_FILEFUNC_MODE_EXISTING)
+        mode_fopen = "r+b";
+    else
+    if (mode & ZLIB_FILEFUNC_MODE_CREATE)
+        mode_fopen = "wb";
+
+    if ((filename!=NULL) && (mode_fopen != NULL))
+        file = fopen(filename, mode_fopen);
+    return file;
+}
+
+static voidpf ZCALLBACK fopen64_file_func (voidpf opaque, const void* filename, int mode)
+{
+    FILE* file = NULL;
+    const char* mode_fopen = NULL;
+    if ((mode & ZLIB_FILEFUNC_MODE_READWRITEFILTER)==ZLIB_FILEFUNC_MODE_READ)
+        mode_fopen = "rb";
+    else
+    if (mode & ZLIB_FILEFUNC_MODE_EXISTING)
+        mode_fopen = "r+b";
+    else
+    if (mode & ZLIB_FILEFUNC_MODE_CREATE)
+        mode_fopen = "wb";
+
+    if ((filename!=NULL) && (mode_fopen != NULL))
+        file = fopen64((const char*)filename, mode_fopen);
+    return file;
+}
+
+
+static uLong ZCALLBACK fread_file_func (voidpf opaque, voidpf stream, void* buf, uLong size)
+{
+    uLong ret;
+    ret = (uLong)fread(buf, 1, (size_t)size, (FILE *)stream);
+    return ret;
+}
+
+static uLong ZCALLBACK fwrite_file_func (voidpf opaque, voidpf stream, const void* buf, uLong size)
+{
+    uLong ret;
+    ret = (uLong)fwrite(buf, 1, (size_t)size, (FILE *)stream);
+    return ret;
+}
+
+static long ZCALLBACK ftell_file_func (voidpf opaque, voidpf stream)
+{
+    long ret;
+    ret = ftell((FILE *)stream);
+    return ret;
+}
+
+
+static ZPOS64_T ZCALLBACK ftell64_file_func (voidpf opaque, voidpf stream)
+{
+    ZPOS64_T ret;
+    ret = ftello64((FILE *)stream);
+    return ret;
+}
+
+static long ZCALLBACK fseek_file_func (voidpf  opaque, voidpf stream, uLong offset, int origin)
+{
+    int fseek_origin=0;
+    long ret;
+    switch (origin)
+    {
+    case ZLIB_FILEFUNC_SEEK_CUR :
+        fseek_origin = SEEK_CUR;
+        break;
+    case ZLIB_FILEFUNC_SEEK_END :
+        fseek_origin = SEEK_END;
+        break;
+    case ZLIB_FILEFUNC_SEEK_SET :
+        fseek_origin = SEEK_SET;
+        break;
+    default: return -1;
+    }
+    ret = 0;
+    if (fseek((FILE *)stream, offset, fseek_origin) != 0)
+        ret = -1;
+    return ret;
+}
+
+static long ZCALLBACK fseek64_file_func (voidpf  opaque, voidpf stream, ZPOS64_T offset, int origin)
+{
+    int fseek_origin=0;
+    long ret;
+    switch (origin)
+    {
+    case ZLIB_FILEFUNC_SEEK_CUR :
+        fseek_origin = SEEK_CUR;
+        break;
+    case ZLIB_FILEFUNC_SEEK_END :
+        fseek_origin = SEEK_END;
+        break;
+    case ZLIB_FILEFUNC_SEEK_SET :
+        fseek_origin = SEEK_SET;
+        break;
+    default: return -1;
+    }
+    ret = 0;
+
+    if(fseeko64((FILE *)stream, offset, fseek_origin) != 0)
+                        ret = -1;
+
+    return ret;
+}
+
+
+static int ZCALLBACK fclose_file_func (voidpf opaque, voidpf stream)
+{
+    int ret;
+    ret = fclose((FILE *)stream);
+    return ret;
+}
+
+static int ZCALLBACK ferror_file_func (voidpf opaque, voidpf stream)
+{
+    int ret;
+    ret = ferror((FILE *)stream);
+    return ret;
+}
+
+void fill_fopen_filefunc (pzlib_filefunc_def)
+  zlib_filefunc_def* pzlib_filefunc_def;
+{
+    pzlib_filefunc_def->zopen_file = fopen_file_func;
+    pzlib_filefunc_def->zread_file = fread_file_func;
+    pzlib_filefunc_def->zwrite_file = fwrite_file_func;
+    pzlib_filefunc_def->ztell_file = ftell_file_func;
+    pzlib_filefunc_def->zseek_file = fseek_file_func;
+    pzlib_filefunc_def->zclose_file = fclose_file_func;
+    pzlib_filefunc_def->zerror_file = ferror_file_func;
+    pzlib_filefunc_def->opaque = NULL;
+}
+
+void fill_fopen64_filefunc (zlib_filefunc64_def*  pzlib_filefunc_def)
+{
+    pzlib_filefunc_def->zopen64_file = fopen64_file_func;
+    pzlib_filefunc_def->zread_file = fread_file_func;
+    pzlib_filefunc_def->zwrite_file = fwrite_file_func;
+    pzlib_filefunc_def->ztell64_file = ftell64_file_func;
+    pzlib_filefunc_def->zseek64_file = fseek64_file_func;
+    pzlib_filefunc_def->zclose_file = fclose_file_func;
+    pzlib_filefunc_def->zerror_file = ferror_file_func;
+    pzlib_filefunc_def->opaque = NULL;
+}
diff --git a/updater/zbin/minizip/ioapi.h b/updater/zbin/minizip/ioapi.h
index e73a3b2..8309c4c 100644
--- a/updater/zbin/minizip/ioapi.h
+++ b/updater/zbin/minizip/ioapi.h
@@ -1,75 +1,200 @@
-/* ioapi.h -- IO base function header for compress/uncompress .zip

-   files using zlib + zip or unzip API

-

-   Version 1.01e, February 12th, 2005

-

-   Copyright (C) 1998-2005 Gilles Vollant

-*/

-

-#ifndef _ZLIBIOAPI_H

-#define _ZLIBIOAPI_H

-

-

-#define ZLIB_FILEFUNC_SEEK_CUR (1)

-#define ZLIB_FILEFUNC_SEEK_END (2)

-#define ZLIB_FILEFUNC_SEEK_SET (0)

-

-#define ZLIB_FILEFUNC_MODE_READ      (1)

-#define ZLIB_FILEFUNC_MODE_WRITE     (2)

-#define ZLIB_FILEFUNC_MODE_READWRITEFILTER (3)

-

-#define ZLIB_FILEFUNC_MODE_EXISTING (4)

-#define ZLIB_FILEFUNC_MODE_CREATE   (8)

-

-

-#ifndef ZCALLBACK

-

-#if (defined(WIN32) || defined (WINDOWS) || defined (_WINDOWS)) && defined(CALLBACK) && defined (USEWINDOWS_CALLBACK)

-#define ZCALLBACK CALLBACK

-#else

-#define ZCALLBACK

-#endif

-#endif

-

-#ifdef __cplusplus

-extern "C" {

-#endif

-

-typedef voidpf (ZCALLBACK *open_file_func) OF((voidpf opaque, const char* filename, int mode));

-typedef uLong  (ZCALLBACK *read_file_func) OF((voidpf opaque, voidpf stream, void* buf, uLong size));

-typedef uLong  (ZCALLBACK *write_file_func) OF((voidpf opaque, voidpf stream, const void* buf, uLong size));

-typedef long   (ZCALLBACK *tell_file_func) OF((voidpf opaque, voidpf stream));

-typedef long   (ZCALLBACK *seek_file_func) OF((voidpf opaque, voidpf stream, uLong offset, int origin));

-typedef int    (ZCALLBACK *close_file_func) OF((voidpf opaque, voidpf stream));

-typedef int    (ZCALLBACK *testerror_file_func) OF((voidpf opaque, voidpf stream));

-

-typedef struct zlib_filefunc_def_s

-{

-    open_file_func      zopen_file;

-    read_file_func      zread_file;

-    write_file_func     zwrite_file;

-    tell_file_func      ztell_file;

-    seek_file_func      zseek_file;

-    close_file_func     zclose_file;

-    testerror_file_func zerror_file;

-    voidpf              opaque;

-} zlib_filefunc_def;

-

-

-

-void fill_fopen_filefunc OF((zlib_filefunc_def* pzlib_filefunc_def));

-

-#define ZREAD(filefunc,filestream,buf,size) ((*((filefunc).zread_file))((filefunc).opaque,filestream,buf,size))

-#define ZWRITE(filefunc,filestream,buf,size) ((*((filefunc).zwrite_file))((filefunc).opaque,filestream,buf,size))

-#define ZTELL(filefunc,filestream) ((*((filefunc).ztell_file))((filefunc).opaque,filestream))

-#define ZSEEK(filefunc,filestream,pos,mode) ((*((filefunc).zseek_file))((filefunc).opaque,filestream,pos,mode))

-#define ZCLOSE(filefunc,filestream) ((*((filefunc).zclose_file))((filefunc).opaque,filestream))

-#define ZERROR(filefunc,filestream) ((*((filefunc).zerror_file))((filefunc).opaque,filestream))

-

-

-#ifdef __cplusplus

-}

-#endif

-

-#endif

-

+/* ioapi.h -- IO base function header for compress/uncompress .zip
+   part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
+
+         Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
+
+         Modifications for Zip64 support
+         Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
+
+         For more info read MiniZip_info.txt
+
+         Changes
+
+    Oct-2009 - Defined ZPOS64_T to fpos_t on windows and u_int64_t on linux. (might need to find a better why for this)
+    Oct-2009 - Change to fseeko64, ftello64 and fopen64 so large files would work on linux.
+               More if/def section may be needed to support other platforms
+    Oct-2009 - Defined fxxxx64 calls to normal fopen/ftell/fseek so they would compile on windows.
+                          (but you should use iowin32.c for windows instead)
+
+*/
+
+#ifndef _ZLIBIOAPI64_H
+#define _ZLIBIOAPI64_H
+
+#if (!defined(_WIN32)) && (!defined(WIN32))
+
+  // Linux needs this to support file operation on files larger then 4+GB
+  // But might need better if/def to select just the platforms that needs them.
+
+        #ifndef __USE_FILE_OFFSET64
+                #define __USE_FILE_OFFSET64
+        #endif
+        #ifndef __USE_LARGEFILE64
+                #define __USE_LARGEFILE64
+        #endif
+        #ifndef _LARGEFILE64_SOURCE
+                #define _LARGEFILE64_SOURCE
+        #endif
+        #ifndef _FILE_OFFSET_BIT
+                #define _FILE_OFFSET_BIT 64
+        #endif
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include "zlib.h"
+
+#if defined(USE_FILE32API)
+#define fopen64 fopen
+#define ftello64 ftell
+#define fseeko64 fseek
+#else
+#ifdef _MSC_VER
+ #define fopen64 fopen
+ #if (_MSC_VER >= 1400) && (!(defined(NO_MSCVER_FILE64_FUNC)))
+  #define ftello64 _ftelli64
+  #define fseeko64 _fseeki64
+ #else // old MSC
+  #define ftello64 ftell
+  #define fseeko64 fseek
+ #endif
+#endif
+#endif
+
+/*
+#ifndef ZPOS64_T
+  #ifdef _WIN32
+                #define ZPOS64_T fpos_t
+  #else
+    #include <stdint.h>
+    #define ZPOS64_T uint64_t
+  #endif
+#endif
+*/
+
+#ifdef HAVE_MINIZIP64_CONF_H
+#include "mz64conf.h"
+#endif
+
+/* a type choosen by DEFINE */
+#ifdef HAVE_64BIT_INT_CUSTOM
+typedef  64BIT_INT_CUSTOM_TYPE ZPOS64_T;
+#else
+#ifdef HAS_STDINT_H
+#include "stdint.h"
+typedef uint64_t ZPOS64_T;
+#else
+
+
+#if defined(_MSC_VER) || defined(__BORLANDC__)
+typedef unsigned __int64 ZPOS64_T;
+#else
+typedef unsigned long long int ZPOS64_T;
+#endif
+#endif
+#endif
+
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+#define ZLIB_FILEFUNC_SEEK_CUR (1)
+#define ZLIB_FILEFUNC_SEEK_END (2)
+#define ZLIB_FILEFUNC_SEEK_SET (0)
+
+#define ZLIB_FILEFUNC_MODE_READ      (1)
+#define ZLIB_FILEFUNC_MODE_WRITE     (2)
+#define ZLIB_FILEFUNC_MODE_READWRITEFILTER (3)
+
+#define ZLIB_FILEFUNC_MODE_EXISTING (4)
+#define ZLIB_FILEFUNC_MODE_CREATE   (8)
+
+
+#ifndef ZCALLBACK
+ #if (defined(WIN32) || defined(_WIN32) || defined (WINDOWS) || defined (_WINDOWS)) && defined(CALLBACK) && defined (USEWINDOWS_CALLBACK)
+   #define ZCALLBACK CALLBACK
+ #else
+   #define ZCALLBACK
+ #endif
+#endif
+
+
+
+
+typedef voidpf   (ZCALLBACK *open_file_func)      OF((voidpf opaque, const char* filename, int mode));
+typedef uLong    (ZCALLBACK *read_file_func)      OF((voidpf opaque, voidpf stream, void* buf, uLong size));
+typedef uLong    (ZCALLBACK *write_file_func)     OF((voidpf opaque, voidpf stream, const void* buf, uLong size));
+typedef int      (ZCALLBACK *close_file_func)     OF((voidpf opaque, voidpf stream));
+typedef int      (ZCALLBACK *testerror_file_func) OF((voidpf opaque, voidpf stream));
+
+typedef long     (ZCALLBACK *tell_file_func)      OF((voidpf opaque, voidpf stream));
+typedef long     (ZCALLBACK *seek_file_func)      OF((voidpf opaque, voidpf stream, uLong offset, int origin));
+
+
+/* here is the "old" 32 bits structure structure */
+typedef struct zlib_filefunc_def_s
+{
+    open_file_func      zopen_file;
+    read_file_func      zread_file;
+    write_file_func     zwrite_file;
+    tell_file_func      ztell_file;
+    seek_file_func      zseek_file;
+    close_file_func     zclose_file;
+    testerror_file_func zerror_file;
+    voidpf              opaque;
+} zlib_filefunc_def;
+
+typedef ZPOS64_T (ZCALLBACK *tell64_file_func)    OF((voidpf opaque, voidpf stream));
+typedef long     (ZCALLBACK *seek64_file_func)    OF((voidpf opaque, voidpf stream, ZPOS64_T offset, int origin));
+typedef voidpf   (ZCALLBACK *open64_file_func)    OF((voidpf opaque, const void* filename, int mode));
+
+typedef struct zlib_filefunc64_def_s
+{
+    open64_file_func    zopen64_file;
+    read_file_func      zread_file;
+    write_file_func     zwrite_file;
+    tell64_file_func    ztell64_file;
+    seek64_file_func    zseek64_file;
+    close_file_func     zclose_file;
+    testerror_file_func zerror_file;
+    voidpf              opaque;
+} zlib_filefunc64_def;
+
+void fill_fopen64_filefunc OF((zlib_filefunc64_def* pzlib_filefunc_def));
+void fill_fopen_filefunc OF((zlib_filefunc_def* pzlib_filefunc_def));
+
+/* now internal definition, only for zip.c and unzip.h */
+typedef struct zlib_filefunc64_32_def_s
+{
+    zlib_filefunc64_def zfile_func64;
+    open_file_func      zopen32_file;
+    tell_file_func      ztell32_file;
+    seek_file_func      zseek32_file;
+} zlib_filefunc64_32_def;
+
+
+#define ZREAD64(filefunc,filestream,buf,size)     ((*((filefunc).zfile_func64.zread_file))   ((filefunc).zfile_func64.opaque,filestream,buf,size))
+#define ZWRITE64(filefunc,filestream,buf,size)    ((*((filefunc).zfile_func64.zwrite_file))  ((filefunc).zfile_func64.opaque,filestream,buf,size))
+//#define ZTELL64(filefunc,filestream)            ((*((filefunc).ztell64_file)) ((filefunc).opaque,filestream))
+//#define ZSEEK64(filefunc,filestream,pos,mode)   ((*((filefunc).zseek64_file)) ((filefunc).opaque,filestream,pos,mode))
+#define ZCLOSE64(filefunc,filestream)             ((*((filefunc).zfile_func64.zclose_file))  ((filefunc).zfile_func64.opaque,filestream))
+#define ZERROR64(filefunc,filestream)             ((*((filefunc).zfile_func64.zerror_file))  ((filefunc).zfile_func64.opaque,filestream))
+
+voidpf call_zopen64 OF((const zlib_filefunc64_32_def* pfilefunc,const void*filename,int mode));
+long    call_zseek64 OF((const zlib_filefunc64_32_def* pfilefunc,voidpf filestream, ZPOS64_T offset, int origin));
+ZPOS64_T call_ztell64 OF((const zlib_filefunc64_32_def* pfilefunc,voidpf filestream));
+
+void    fill_zlib_filefunc64_32_def_from_filefunc32(zlib_filefunc64_32_def* p_filefunc64_32,const zlib_filefunc_def* p_filefunc32);
+
+#define ZOPEN64(filefunc,filename,mode)         (call_zopen64((&(filefunc)),(filename),(mode)))
+#define ZTELL64(filefunc,filestream)            (call_ztell64((&(filefunc)),(filestream)))
+#define ZSEEK64(filefunc,filestream,pos,mode)   (call_zseek64((&(filefunc)),(filestream),(pos),(mode)))
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/updater/zbin/minizip/iowin32.c b/updater/zbin/minizip/iowin32.c
index 6a7483c..6a2a883 100644
--- a/updater/zbin/minizip/iowin32.c
+++ b/updater/zbin/minizip/iowin32.c
@@ -1,270 +1,389 @@
-/* iowin32.c -- IO base function header for compress/uncompress .zip

-   files using zlib + zip or unzip API

-   This IO API version uses the Win32 API (for Microsoft Windows)

-

-   Version 1.01e, February 12th, 2005

-

-   Copyright (C) 1998-2005 Gilles Vollant

-*/

-

-#include <stdlib.h>

-

-#include "zlib.h"

-#include "ioapi.h"

-#include "iowin32.h"

-

-#ifndef INVALID_HANDLE_VALUE

-#define INVALID_HANDLE_VALUE (0xFFFFFFFF)

-#endif

-

-#ifndef INVALID_SET_FILE_POINTER

-#define INVALID_SET_FILE_POINTER ((DWORD)-1)

-#endif

-

-voidpf ZCALLBACK win32_open_file_func OF((

-   voidpf opaque,

-   const char* filename,

-   int mode));

-

-uLong ZCALLBACK win32_read_file_func OF((

-   voidpf opaque,

-   voidpf stream,

-   void* buf,

-   uLong size));

-

-uLong ZCALLBACK win32_write_file_func OF((

-   voidpf opaque,

-   voidpf stream,

-   const void* buf,

-   uLong size));

-

-long ZCALLBACK win32_tell_file_func OF((

-   voidpf opaque,

-   voidpf stream));

-

-long ZCALLBACK win32_seek_file_func OF((

-   voidpf opaque,

-   voidpf stream,

-   uLong offset,

-   int origin));

-

-int ZCALLBACK win32_close_file_func OF((

-   voidpf opaque,

-   voidpf stream));

-

-int ZCALLBACK win32_error_file_func OF((

-   voidpf opaque,

-   voidpf stream));

-

-typedef struct

-{

-    HANDLE hf;

-    int error;

-} WIN32FILE_IOWIN;

-

-voidpf ZCALLBACK win32_open_file_func (

-   voidpf opaque,

-   const char* filename,

-   int mode)

-{

-    const char* mode_fopen = NULL;

-    DWORD dwDesiredAccess,dwCreationDisposition,dwShareMode,dwFlagsAndAttributes ;

-    HANDLE hFile = 0;

-    voidpf ret=NULL;

-

-    dwDesiredAccess = dwShareMode = dwFlagsAndAttributes = 0;

-

-    if ((mode & ZLIB_FILEFUNC_MODE_READWRITEFILTER)==ZLIB_FILEFUNC_MODE_READ)

-    {

-        dwDesiredAccess = GENERIC_READ;

-        dwCreationDisposition = OPEN_EXISTING;

-        dwShareMode = FILE_SHARE_READ;

-    }

-    else

-    if (mode & ZLIB_FILEFUNC_MODE_EXISTING)

-    {

-        dwDesiredAccess = GENERIC_WRITE | GENERIC_READ;

-        dwCreationDisposition = OPEN_EXISTING;

-    }

-    else

-    if (mode & ZLIB_FILEFUNC_MODE_CREATE)

-    {

-        dwDesiredAccess = GENERIC_WRITE | GENERIC_READ;

-        dwCreationDisposition = CREATE_ALWAYS;

-    }

-

-    if ((filename!=NULL) && (dwDesiredAccess != 0))

-        hFile = CreateFileA(filename, dwDesiredAccess, dwShareMode, NULL,

-                      dwCreationDisposition, dwFlagsAndAttributes, NULL);

-

-    if (hFile == INVALID_HANDLE_VALUE)

-        hFile = NULL;

-

-    if (hFile != NULL)

-    {

-        WIN32FILE_IOWIN w32fiow;

-        w32fiow.hf = hFile;

-        w32fiow.error = 0;

-        ret = malloc(sizeof(WIN32FILE_IOWIN));

-        if (ret==NULL)

-            CloseHandle(hFile);

-        else *((WIN32FILE_IOWIN*)ret) = w32fiow;

-    }

-    return ret;

-}

-

-

-uLong ZCALLBACK win32_read_file_func (

-   voidpf opaque,

-   voidpf stream,

-   void* buf,

-   uLong size)

-{

-    uLong ret=0;

-    HANDLE hFile = NULL;

-    if (stream!=NULL)

-        hFile = ((WIN32FILE_IOWIN*)stream) -> hf;

-    if (hFile != NULL)

-        if (!ReadFile(hFile, buf, size, &ret, NULL))

-        {

-            DWORD dwErr = GetLastError();

-            if (dwErr == ERROR_HANDLE_EOF)

-                dwErr = 0;

-            ((WIN32FILE_IOWIN*)stream) -> error=(int)dwErr;

-        }

-

-    return ret;

-}

-

-

-uLong ZCALLBACK win32_write_file_func (

-   voidpf opaque,

-   voidpf stream,

-   const void* buf,

-   uLong size)

-{

-    uLong ret=0;

-    HANDLE hFile = NULL;

-    if (stream!=NULL)

-        hFile = ((WIN32FILE_IOWIN*)stream) -> hf;

-

-    if (hFile !=NULL)

-        if (!WriteFile(hFile, buf, size, &ret, NULL))

-        {

-            DWORD dwErr = GetLastError();

-            if (dwErr == ERROR_HANDLE_EOF)

-                dwErr = 0;

-            ((WIN32FILE_IOWIN*)stream) -> error=(int)dwErr;

-        }

-

-    return ret;

-}

-

-long ZCALLBACK win32_tell_file_func (

-   voidpf opaque,

-   voidpf stream)

-{

-    long ret=-1;

-    HANDLE hFile = NULL;

-    if (stream!=NULL)

-        hFile = ((WIN32FILE_IOWIN*)stream) -> hf;

-    if (hFile != NULL)

-    {

-        DWORD dwSet = SetFilePointer(hFile, 0, NULL, FILE_CURRENT);

-        if (dwSet == INVALID_SET_FILE_POINTER)

-        {

-            DWORD dwErr = GetLastError();

-            ((WIN32FILE_IOWIN*)stream) -> error=(int)dwErr;

-            ret = -1;

-        }

-        else

-            ret=(long)dwSet;

-    }

-    return ret;

-}

-

-long ZCALLBACK win32_seek_file_func (

-   voidpf opaque,

-   voidpf stream,

-   uLong offset,

-   int origin)

-{

-    DWORD dwMoveMethod=0xFFFFFFFF;

-    HANDLE hFile = NULL;

-

-    long ret=-1;

-    if (stream!=NULL)

-        hFile = ((WIN32FILE_IOWIN*)stream) -> hf;

-    switch (origin)

-    {

-    case ZLIB_FILEFUNC_SEEK_CUR :

-        dwMoveMethod = FILE_CURRENT;

-        break;

-    case ZLIB_FILEFUNC_SEEK_END :

-        dwMoveMethod = FILE_END;

-        break;

-    case ZLIB_FILEFUNC_SEEK_SET :

-        dwMoveMethod = FILE_BEGIN;

-        break;

-    default: return -1;

-    }

-

-    if (hFile != NULL)

-    {

-        DWORD dwSet = SetFilePointer(hFile, offset, NULL, dwMoveMethod);

-        if (dwSet == INVALID_SET_FILE_POINTER)

-        {

-            DWORD dwErr = GetLastError();

-            ((WIN32FILE_IOWIN*)stream) -> error=(int)dwErr;

-            ret = -1;

-        }

-        else

-            ret=0;

-    }

-    return ret;

-}

-

-int ZCALLBACK win32_close_file_func (

-   voidpf opaque,

-   voidpf stream)

-{

-    int ret=-1;

-

-    if (stream!=NULL)

-    {

-        HANDLE hFile;

-        hFile = ((WIN32FILE_IOWIN*)stream) -> hf;

-        if (hFile != NULL)

-        {

-            CloseHandle(hFile);

-            ret=0;

-        }

-        free(stream);

-    }

-    return ret;

-}

-

-int ZCALLBACK win32_error_file_func (

-   voidpf opaque,

-   voidpf stream)

-{

-    int ret=-1;

-    if (stream!=NULL)

-    {

-        ret = ((WIN32FILE_IOWIN*)stream) -> error;

-    }

-    return ret;

-}

-

-void fill_win32_filefunc (

-  zlib_filefunc_def* pzlib_filefunc_def)

-{

-    pzlib_filefunc_def->zopen_file = win32_open_file_func;

-    pzlib_filefunc_def->zread_file = win32_read_file_func;

-    pzlib_filefunc_def->zwrite_file = win32_write_file_func;

-    pzlib_filefunc_def->ztell_file = win32_tell_file_func;

-    pzlib_filefunc_def->zseek_file = win32_seek_file_func;

-    pzlib_filefunc_def->zclose_file = win32_close_file_func;

-    pzlib_filefunc_def->zerror_file = win32_error_file_func;

-    pzlib_filefunc_def->opaque=NULL;

-}

+/* iowin32.c -- IO base function header for compress/uncompress .zip
+     Version 1.1, February 14h, 2010
+     part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
+
+         Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
+
+         Modifications for Zip64 support
+         Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
+
+     For more info read MiniZip_info.txt
+
+*/
+
+#include <stdlib.h>
+
+#include "zlib.h"
+#include "ioapi.h"
+#include "iowin32.h"
+
+#ifndef INVALID_HANDLE_VALUE
+#define INVALID_HANDLE_VALUE (0xFFFFFFFF)
+#endif
+
+#ifndef INVALID_SET_FILE_POINTER
+#define INVALID_SET_FILE_POINTER ((DWORD)-1)
+#endif
+
+voidpf  ZCALLBACK win32_open_file_func  OF((voidpf opaque, const char* filename, int mode));
+uLong   ZCALLBACK win32_read_file_func  OF((voidpf opaque, voidpf stream, void* buf, uLong size));
+uLong   ZCALLBACK win32_write_file_func OF((voidpf opaque, voidpf stream, const void* buf, uLong size));
+ZPOS64_T ZCALLBACK win32_tell64_file_func  OF((voidpf opaque, voidpf stream));
+long    ZCALLBACK win32_seek64_file_func  OF((voidpf opaque, voidpf stream, ZPOS64_T offset, int origin));
+int     ZCALLBACK win32_close_file_func OF((voidpf opaque, voidpf stream));
+int     ZCALLBACK win32_error_file_func OF((voidpf opaque, voidpf stream));
+
+typedef struct
+{
+    HANDLE hf;
+    int error;
+} WIN32FILE_IOWIN;
+
+
+static void win32_translate_open_mode(int mode,
+                                      DWORD* lpdwDesiredAccess,
+                                      DWORD* lpdwCreationDisposition,
+                                      DWORD* lpdwShareMode,
+                                      DWORD* lpdwFlagsAndAttributes)
+{
+    *lpdwDesiredAccess = *lpdwShareMode = *lpdwFlagsAndAttributes = *lpdwCreationDisposition = 0;
+
+    if ((mode & ZLIB_FILEFUNC_MODE_READWRITEFILTER)==ZLIB_FILEFUNC_MODE_READ)
+    {
+        *lpdwDesiredAccess = GENERIC_READ;
+        *lpdwCreationDisposition = OPEN_EXISTING;
+        *lpdwShareMode = FILE_SHARE_READ;
+    }
+    else if (mode & ZLIB_FILEFUNC_MODE_EXISTING)
+    {
+        *lpdwDesiredAccess = GENERIC_WRITE | GENERIC_READ;
+        *lpdwCreationDisposition = OPEN_EXISTING;
+    }
+    else if (mode & ZLIB_FILEFUNC_MODE_CREATE)
+    {
+        *lpdwDesiredAccess = GENERIC_WRITE | GENERIC_READ;
+        *lpdwCreationDisposition = CREATE_ALWAYS;
+    }
+}
+
+static voidpf win32_build_iowin(HANDLE hFile)
+{
+    voidpf ret=NULL;
+
+    if ((hFile != NULL) && (hFile != INVALID_HANDLE_VALUE))
+    {
+        WIN32FILE_IOWIN w32fiow;
+        w32fiow.hf = hFile;
+        w32fiow.error = 0;
+        ret = malloc(sizeof(WIN32FILE_IOWIN));
+
+        if (ret==NULL)
+            CloseHandle(hFile);
+        else
+            *((WIN32FILE_IOWIN*)ret) = w32fiow;
+    }
+    return ret;
+}
+
+voidpf ZCALLBACK win32_open64_file_func (voidpf opaque,const void* filename,int mode)
+{
+    const char* mode_fopen = NULL;
+    DWORD dwDesiredAccess,dwCreationDisposition,dwShareMode,dwFlagsAndAttributes ;
+    HANDLE hFile = NULL;
+
+    win32_translate_open_mode(mode,&dwDesiredAccess,&dwCreationDisposition,&dwShareMode,&dwFlagsAndAttributes);
+
+    if ((filename!=NULL) && (dwDesiredAccess != 0))
+        hFile = CreateFile((LPCTSTR)filename, dwDesiredAccess, dwShareMode, NULL, dwCreationDisposition, dwFlagsAndAttributes, NULL);
+
+    return win32_build_iowin(hFile);
+}
+
+
+voidpf ZCALLBACK win32_open64_file_funcA (voidpf opaque,const void* filename,int mode)
+{
+    const char* mode_fopen = NULL;
+    DWORD dwDesiredAccess,dwCreationDisposition,dwShareMode,dwFlagsAndAttributes ;
+    HANDLE hFile = NULL;
+
+    win32_translate_open_mode(mode,&dwDesiredAccess,&dwCreationDisposition,&dwShareMode,&dwFlagsAndAttributes);
+
+    if ((filename!=NULL) && (dwDesiredAccess != 0))
+        hFile = CreateFileA((LPCSTR)filename, dwDesiredAccess, dwShareMode, NULL, dwCreationDisposition, dwFlagsAndAttributes, NULL);
+
+    return win32_build_iowin(hFile);
+}
+
+
+voidpf ZCALLBACK win32_open64_file_funcW (voidpf opaque,const void* filename,int mode)
+{
+    const char* mode_fopen = NULL;
+    DWORD dwDesiredAccess,dwCreationDisposition,dwShareMode,dwFlagsAndAttributes ;
+    HANDLE hFile = NULL;
+
+    win32_translate_open_mode(mode,&dwDesiredAccess,&dwCreationDisposition,&dwShareMode,&dwFlagsAndAttributes);
+
+    if ((filename!=NULL) && (dwDesiredAccess != 0))
+        hFile = CreateFileW((LPCWSTR)filename, dwDesiredAccess, dwShareMode, NULL, dwCreationDisposition, dwFlagsAndAttributes, NULL);
+
+    return win32_build_iowin(hFile);
+}
+
+
+voidpf ZCALLBACK win32_open_file_func (voidpf opaque,const char* filename,int mode)
+{
+    const char* mode_fopen = NULL;
+    DWORD dwDesiredAccess,dwCreationDisposition,dwShareMode,dwFlagsAndAttributes ;
+    HANDLE hFile = NULL;
+
+    win32_translate_open_mode(mode,&dwDesiredAccess,&dwCreationDisposition,&dwShareMode,&dwFlagsAndAttributes);
+
+    if ((filename!=NULL) && (dwDesiredAccess != 0))
+        hFile = CreateFile((LPCTSTR)filename, dwDesiredAccess, dwShareMode, NULL, dwCreationDisposition, dwFlagsAndAttributes, NULL);
+
+    return win32_build_iowin(hFile);
+}
+
+
+uLong ZCALLBACK win32_read_file_func (voidpf opaque, voidpf stream, void* buf,uLong size)
+{
+    uLong ret=0;
+    HANDLE hFile = NULL;
+    if (stream!=NULL)
+        hFile = ((WIN32FILE_IOWIN*)stream) -> hf;
+
+    if (hFile != NULL)
+    {
+        if (!ReadFile(hFile, buf, size, &ret, NULL))
+        {
+            DWORD dwErr = GetLastError();
+            if (dwErr == ERROR_HANDLE_EOF)
+                dwErr = 0;
+            ((WIN32FILE_IOWIN*)stream) -> error=(int)dwErr;
+        }
+    }
+
+    return ret;
+}
+
+
+uLong ZCALLBACK win32_write_file_func (voidpf opaque,voidpf stream,const void* buf,uLong size)
+{
+    uLong ret=0;
+    HANDLE hFile = NULL;
+    if (stream!=NULL)
+        hFile = ((WIN32FILE_IOWIN*)stream) -> hf;
+
+    if (hFile != NULL)
+    {
+        if (!WriteFile(hFile, buf, size, &ret, NULL))
+        {
+            DWORD dwErr = GetLastError();
+            if (dwErr == ERROR_HANDLE_EOF)
+                dwErr = 0;
+            ((WIN32FILE_IOWIN*)stream) -> error=(int)dwErr;
+        }
+    }
+
+    return ret;
+}
+
+long ZCALLBACK win32_tell_file_func (voidpf opaque,voidpf stream)
+{
+    long ret=-1;
+    HANDLE hFile = NULL;
+    if (stream!=NULL)
+        hFile = ((WIN32FILE_IOWIN*)stream) -> hf;
+    if (hFile != NULL)
+    {
+        DWORD dwSet = SetFilePointer(hFile, 0, NULL, FILE_CURRENT);
+        if (dwSet == INVALID_SET_FILE_POINTER)
+        {
+            DWORD dwErr = GetLastError();
+            ((WIN32FILE_IOWIN*)stream) -> error=(int)dwErr;
+            ret = -1;
+        }
+        else
+            ret=(long)dwSet;
+    }
+    return ret;
+}
+
+ZPOS64_T ZCALLBACK win32_tell64_file_func (voidpf opaque, voidpf stream)
+{
+    ZPOS64_T ret= (ZPOS64_T)-1;
+    HANDLE hFile = NULL;
+    if (stream!=NULL)
+        hFile = ((WIN32FILE_IOWIN*)stream)->hf;
+
+    if (hFile)
+    {
+        LARGE_INTEGER li;
+        li.QuadPart = 0;
+        li.u.LowPart = SetFilePointer(hFile, li.u.LowPart, &li.u.HighPart, FILE_CURRENT);
+        if ( (li.LowPart == 0xFFFFFFFF) && (GetLastError() != NO_ERROR))
+        {
+            DWORD dwErr = GetLastError();
+            ((WIN32FILE_IOWIN*)stream) -> error=(int)dwErr;
+            ret = (ZPOS64_T)-1;
+        }
+        else
+            ret=li.QuadPart;
+    }
+    return ret;
+}
+
+
+long ZCALLBACK win32_seek_file_func (voidpf opaque,voidpf stream,uLong offset,int origin)
+{
+    DWORD dwMoveMethod=0xFFFFFFFF;
+    HANDLE hFile = NULL;
+
+    long ret=-1;
+    if (stream!=NULL)
+        hFile = ((WIN32FILE_IOWIN*)stream) -> hf;
+    switch (origin)
+    {
+    case ZLIB_FILEFUNC_SEEK_CUR :
+        dwMoveMethod = FILE_CURRENT;
+        break;
+    case ZLIB_FILEFUNC_SEEK_END :
+        dwMoveMethod = FILE_END;
+        break;
+    case ZLIB_FILEFUNC_SEEK_SET :
+        dwMoveMethod = FILE_BEGIN;
+        break;
+    default: return -1;
+    }
+
+    if (hFile != NULL)
+    {
+        DWORD dwSet = SetFilePointer(hFile, offset, NULL, dwMoveMethod);
+        if (dwSet == INVALID_SET_FILE_POINTER)
+        {
+            DWORD dwErr = GetLastError();
+            ((WIN32FILE_IOWIN*)stream) -> error=(int)dwErr;
+            ret = -1;
+        }
+        else
+            ret=0;
+    }
+    return ret;
+}
+
+long ZCALLBACK win32_seek64_file_func (voidpf opaque, voidpf stream,ZPOS64_T offset,int origin)
+{
+    DWORD dwMoveMethod=0xFFFFFFFF;
+    HANDLE hFile = NULL;
+    long ret=-1;
+
+    if (stream!=NULL)
+        hFile = ((WIN32FILE_IOWIN*)stream)->hf;
+
+    switch (origin)
+    {
+        case ZLIB_FILEFUNC_SEEK_CUR :
+            dwMoveMethod = FILE_CURRENT;
+            break;
+        case ZLIB_FILEFUNC_SEEK_END :
+            dwMoveMethod = FILE_END;
+            break;
+        case ZLIB_FILEFUNC_SEEK_SET :
+            dwMoveMethod = FILE_BEGIN;
+            break;
+        default: return -1;
+    }
+
+    if (hFile)
+    {
+        LARGE_INTEGER* li = (LARGE_INTEGER*)&offset;
+        DWORD dwSet = SetFilePointer(hFile, li->u.LowPart, &li->u.HighPart, dwMoveMethod);
+        if (dwSet == INVALID_SET_FILE_POINTER)
+        {
+            DWORD dwErr = GetLastError();
+            ((WIN32FILE_IOWIN*)stream) -> error=(int)dwErr;
+            ret = -1;
+        }
+        else
+            ret=0;
+    }
+    return ret;
+}
+
+int ZCALLBACK win32_close_file_func (voidpf opaque, voidpf stream)
+{
+    int ret=-1;
+
+    if (stream!=NULL)
+    {
+        HANDLE hFile;
+        hFile = ((WIN32FILE_IOWIN*)stream) -> hf;
+        if (hFile != NULL)
+        {
+            CloseHandle(hFile);
+            ret=0;
+        }
+        free(stream);
+    }
+    return ret;
+}
+
+int ZCALLBACK win32_error_file_func (voidpf opaque,voidpf stream)
+{
+    int ret=-1;
+    if (stream!=NULL)
+    {
+        ret = ((WIN32FILE_IOWIN*)stream) -> error;
+    }
+    return ret;
+}
+
+void fill_win32_filefunc (zlib_filefunc_def* pzlib_filefunc_def)
+{
+    pzlib_filefunc_def->zopen_file = win32_open_file_func;
+    pzlib_filefunc_def->zread_file = win32_read_file_func;
+    pzlib_filefunc_def->zwrite_file = win32_write_file_func;
+    pzlib_filefunc_def->ztell_file = win32_tell_file_func;
+    pzlib_filefunc_def->zseek_file = win32_seek_file_func;
+    pzlib_filefunc_def->zclose_file = win32_close_file_func;
+    pzlib_filefunc_def->zerror_file = win32_error_file_func;
+    pzlib_filefunc_def->opaque = NULL;
+}
+
+void fill_win32_filefunc64(zlib_filefunc64_def* pzlib_filefunc_def)
+{
+    pzlib_filefunc_def->zopen64_file = win32_open64_file_func;
+    pzlib_filefunc_def->zread_file = win32_read_file_func;
+    pzlib_filefunc_def->zwrite_file = win32_write_file_func;
+    pzlib_filefunc_def->ztell64_file = win32_tell64_file_func;
+    pzlib_filefunc_def->zseek64_file = win32_seek64_file_func;
+    pzlib_filefunc_def->zclose_file = win32_close_file_func;
+    pzlib_filefunc_def->zerror_file = win32_error_file_func;
+    pzlib_filefunc_def->opaque = NULL;
+}
+
+
+void fill_win32_filefunc64A(zlib_filefunc64_def* pzlib_filefunc_def)
+{
+    pzlib_filefunc_def->zopen64_file = win32_open64_file_funcA;
+    pzlib_filefunc_def->zread_file = win32_read_file_func;
+    pzlib_filefunc_def->zwrite_file = win32_write_file_func;
+    pzlib_filefunc_def->ztell64_file = win32_tell64_file_func;
+    pzlib_filefunc_def->zseek64_file = win32_seek64_file_func;
+    pzlib_filefunc_def->zclose_file = win32_close_file_func;
+    pzlib_filefunc_def->zerror_file = win32_error_file_func;
+    pzlib_filefunc_def->opaque = NULL;
+}
+
+
+void fill_win32_filefunc64W(zlib_filefunc64_def* pzlib_filefunc_def)
+{
+    pzlib_filefunc_def->zopen64_file = win32_open64_file_funcW;
+    pzlib_filefunc_def->zread_file = win32_read_file_func;
+    pzlib_filefunc_def->zwrite_file = win32_write_file_func;
+    pzlib_filefunc_def->ztell64_file = win32_tell64_file_func;
+    pzlib_filefunc_def->zseek64_file = win32_seek64_file_func;
+    pzlib_filefunc_def->zclose_file = win32_close_file_func;
+    pzlib_filefunc_def->zerror_file = win32_error_file_func;
+    pzlib_filefunc_def->opaque = NULL;
+}
diff --git a/updater/zbin/minizip/iowin32.h b/updater/zbin/minizip/iowin32.h
index e9c5f8b..0ca0969 100644
--- a/updater/zbin/minizip/iowin32.h
+++ b/updater/zbin/minizip/iowin32.h
@@ -1,21 +1,28 @@
-/* iowin32.h -- IO base function header for compress/uncompress .zip

-   files using zlib + zip or unzip API

-   This IO API version uses the Win32 API (for Microsoft Windows)

-

-   Version 1.01e, February 12th, 2005

-

-   Copyright (C) 1998-2005 Gilles Vollant

-*/

-

-#include <windows.h>

-

-

-#ifdef __cplusplus

-extern "C" {

-#endif

-

-void fill_win32_filefunc OF((zlib_filefunc_def* pzlib_filefunc_def));

-

-#ifdef __cplusplus

-}

-#endif

+/* iowin32.h -- IO base function header for compress/uncompress .zip
+     Version 1.1, February 14h, 2010
+     part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
+
+         Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
+
+         Modifications for Zip64 support
+         Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
+
+         For more info read MiniZip_info.txt
+
+*/
+
+#include <windows.h>
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void fill_win32_filefunc OF((zlib_filefunc_def* pzlib_filefunc_def));
+void fill_win32_filefunc64 OF((zlib_filefunc64_def* pzlib_filefunc_def));
+void fill_win32_filefunc64A OF((zlib_filefunc64_def* pzlib_filefunc_def));
+void fill_win32_filefunc64W OF((zlib_filefunc64_def* pzlib_filefunc_def));
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/updater/zbin/minizip/miniunz.c b/updater/zbin/minizip/miniunz.c
index 463f3e8..9ed009f 100644
--- a/updater/zbin/minizip/miniunz.c
+++ b/updater/zbin/minizip/miniunz.c
@@ -1,648 +1,648 @@
-/*

-   miniunz.c

-   Version 1.01e, February 12th, 2005

-

-   Copyright (C) 1998-2005 Gilles Vollant

-*/

-

-

-#include <stdio.h>

-#include <stdlib.h>

-#include <string.h>

-#include <time.h>

-#include <errno.h>

-#include <fcntl.h>

-

-#ifdef unix

-# include <unistd.h>

-# include <utime.h>

-#else

-# include <direct.h>

-# include <io.h>

-#endif

-

-#include "munzip.h"

-

-#define CASESENSITIVITY (0)

-#define WRITEBUFFERSIZE (8192)

-#define MAXFILENAME (256)

-

-#ifdef WIN32

-#define USEWIN32IOAPI

-#include "iowin32.h"

-#endif

-/*

-  mini unzip, demo of unzip package

-

-  usage :

-  Usage : miniunz [-exvlo] file.zip [file_to_extract] [-d extractdir]

-

-  list the file in the zipfile, and print the content of FILE_ID.ZIP or README.TXT

-    if it exists

-*/

-

-

-/* change_file_date : change the date/time of a file

-    filename : the filename of the file where date/time must be modified

-    dosdate : the new date at the MSDos format (4 bytes)

-    tmu_date : the SAME new date at the tm_unz format */

-void change_file_date(

-    const char *filename,

-    uLong dosdate,

-    tm_unz tmu_date)

-{

-#ifdef WIN32

-  HANDLE hFile;

-  FILETIME ftm,ftLocal,ftCreate,ftLastAcc,ftLastWrite;

-

-  hFile = CreateFileA(filename,GENERIC_READ | GENERIC_WRITE,

-                      0,NULL,OPEN_EXISTING,0,NULL);

-  GetFileTime(hFile,&ftCreate,&ftLastAcc,&ftLastWrite);

-  DosDateTimeToFileTime((WORD)(dosdate>>16),(WORD)dosdate,&ftLocal);

-  LocalFileTimeToFileTime(&ftLocal,&ftm);

-  SetFileTime(hFile,&ftm,&ftLastAcc,&ftm);

-  CloseHandle(hFile);

-#else

-#ifdef unix

-  struct utimbuf ut;

-  struct tm newdate;

-  newdate.tm_sec = tmu_date.tm_sec;

-  newdate.tm_min=tmu_date.tm_min;

-  newdate.tm_hour=tmu_date.tm_hour;

-  newdate.tm_mday=tmu_date.tm_mday;

-  newdate.tm_mon=tmu_date.tm_mon;

-  if (tmu_date.tm_year > 1900)

-      newdate.tm_year=tmu_date.tm_year - 1900;

-  else

-      newdate.tm_year=tmu_date.tm_year ;

-  newdate.tm_isdst=-1;

-

-  ut.actime=ut.modtime=mktime(&newdate);

-  utime(filename,&ut);

-#endif

-#endif

-}

-

-

-/* mymkdir and change_file_date are not 100 % portable

-   As I don't know well Unix, I wait feedback for the unix portion */

-

-int mymkdir(

-    const char* dirname)

-{

-    int ret=0;

-#ifdef WIN32

-    ret = _mkdir(dirname);

-#else

-#ifdef unix

-    ret = mkdir (dirname,0775);

-#endif

-#endif

-    return ret;

-}

-

-int makedir (

-    char *newdir)

-{

-  char *buffer ;

-  char *p;

-  int  len = (int)strlen(newdir);

-

-  if (len <= 0)

-    return 0;

-

-  buffer = (char*)malloc(len+1);

- // strcpy_s(buffer,len + 1, newdir);

-  strncpy(buffer,newdir, len + 1);

-

-  if (buffer[len-1] == '/') {

-    buffer[len-1] = '\0';

-  }

-  if (mymkdir(buffer) == 0)

-    {

-      free(buffer);

-      return 1;

-    }

-

-  p = buffer+1;

-  while (1)

-    {

-      char hold;

-

-      while(*p && *p != '\\' && *p != '/')

-        p++;

-      hold = *p;

-      *p = 0;

-      if ((mymkdir(buffer) == -1) && (errno == ENOENT))

-        {

-          printf("couldn't create directory %s\n",buffer);

-          free(buffer);

-          return 0;

-        }

-      if (hold == 0)

-        break;

-      *p++ = hold;

-    }

-  free(buffer);

-  return 1;

-}

-

-void do_banner()

-{

-    printf("MiniUnz 1.01b, demo of zLib + Unz package written by Gilles Vollant\n");

-    printf("more info at http://www.winimage.com/zLibDll/unzip.html\n\n");

-}

-

-void do_help()

-{

-    printf("Usage : miniunz [-e] [-x] [-v] [-l] [-o] [-p password] file.zip [file_to_extr.] [-d extractdir]\n\n" \

-           "  -e  Extract without pathname (junk paths)\n" \

-           "  -x  Extract with pathname\n" \

-           "  -v  list files\n" \

-           "  -l  list files\n" \

-           "  -d  directory to extract into\n" \

-           "  -o  overwrite files without prompting\n" \

-           "  -p  extract crypted file using password\n\n");

-}

-

-

-int do_list(

-    unzFile uf)

-{

-    uLong i;

-    unz_global_info gi;

-    int err;

-

-    err = unzGetGlobalInfo (uf,&gi);

-    if (err!=UNZ_OK)

-        printf("error %d with zipfile in unzGetGlobalInfo \n",err);

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

-    printf(" ------  ------   ----  -----   ----    ----   ------     ----\n");

-    for (i=0;i<gi.number_entry;i++)

-    {

-        char filename_inzip[256];

-        unz_file_info file_info;

-        uLong ratio=0;

-        const char *string_method;

-        char charCrypt=' ';

-        err = unzGetCurrentFileInfo(uf,&file_info,filename_inzip,sizeof(filename_inzip),NULL,0,NULL,0);

-        if (err!=UNZ_OK)

-        {

-            printf("error %d with zipfile in unzGetCurrentFileInfo\n",err);

-            break;

-        }

-        if (file_info.uncompressed_size>0)

-            ratio = (file_info.compressed_size*100)/file_info.uncompressed_size;

-

-        /* display a '*' if the file is crypted */

-        if ((file_info.flag & 1) != 0)

-            charCrypt='*';

-

-        if (file_info.compression_method==0)

-            string_method="Stored";

-        else

-        if (file_info.compression_method==Z_DEFLATED)

-        {

-            uInt iLevel=(uInt)((file_info.flag & 0x6)/2);

-            if (iLevel==0)

-              string_method="Defl:N";

-            else if (iLevel==1)

-              string_method="Defl:X";

-            else if ((iLevel==2) || (iLevel==3))

-              string_method="Defl:F"; /* 2:fast , 3 : extra fast*/

-        }

-        else

-            string_method="Unkn. ";

-

-        printf("%7lu  %6s%c%7lu %3lu%%  %2.2lu-%2.2lu-%2.2lu  %2.2lu:%2.2lu  %8.8lx   %s\n",

-                file_info.uncompressed_size,string_method,

-                charCrypt,

-                file_info.compressed_size,

-                ratio,

-                (uLong)file_info.tmu_date.tm_mon + 1,

-                (uLong)file_info.tmu_date.tm_mday,

-                (uLong)file_info.tmu_date.tm_year % 100,

-                (uLong)file_info.tmu_date.tm_hour,(uLong)file_info.tmu_date.tm_min,

-                (uLong)file_info.crc,filename_inzip);

-        if ((i+1)<gi.number_entry)

-        {

-            err = unzGoToNextFile(uf);

-            if (err!=UNZ_OK)

-            {

-                printf("error %d with zipfile in unzGoToNextFile\n",err);

-                break;

-            }

-        }

-    }

-

-    return 0;

-}

-

-

-int do_extract_currentfile(

-    unzFile uf,

-    const int* popt_extract_without_path,

-    int* popt_overwrite,

-    const char* password)

-{

-    char filename_inzip[256];

-    char* filename_withoutpath;

-    char* p;

-    int err=UNZ_OK;

-    FILE *fout=NULL;

-    void* buf;

-    uInt size_buf;

-

-    unz_file_info file_info;

-    uLong ratio=0;

-    err = unzGetCurrentFileInfo(uf,&file_info,filename_inzip,sizeof(filename_inzip),NULL,0,NULL,0);

-

-    if (err!=UNZ_OK)

-    {

-        printf("error %d with zipfile in unzGetCurrentFileInfo\n",err);

-        return err;

-    }

-

-    size_buf = WRITEBUFFERSIZE;

-    buf = (void*)malloc(size_buf);

-    if (buf==NULL)

-    {

-        printf("Error allocating memory\n");

-        return UNZ_INTERNALERROR;

-    }

-

-    p = filename_withoutpath = filename_inzip;

-    while ((*p) != '\0')

-    {

-        if (((*p)=='/') || ((*p)=='\\'))

-            filename_withoutpath = p+1;

-        p++;

-    }

-

-    if ((*filename_withoutpath)=='\0')

-    {

-        if ((*popt_extract_without_path)==0)

-        {

-            printf("creating directory: %s\n",filename_inzip);

-            mymkdir(filename_inzip);

-        }

-    }

-    else

-    {

-        const char* write_filename;

-        int skip=0;

-

-        if ((*popt_extract_without_path)==0)

-            write_filename = filename_inzip;

-        else

-            write_filename = filename_withoutpath;

-

-        err = unzOpenCurrentFilePassword(uf,password);

-        if (err!=UNZ_OK)

-        {

-            printf("error %d with zipfile in unzOpenCurrentFilePassword\n",err);

-        }

-

-        if (((*popt_overwrite)==0) && (err==UNZ_OK))

-        {

-            char rep=0;

-            FILE* ftestexist;

-            ftestexist = fopen(write_filename,"rb");

-            if (ftestexist!=NULL)

-            {

-                fclose(ftestexist);

-                do

-                {

-                    char answer[128];

-                    int ret;

-

-                    printf("The file %s exists. Overwrite ? [y]es, [n]o, [A]ll: ",write_filename);

-                    ret = scanf("%1s",answer);

-                    if (ret != 1) 

-                    {

-                       exit(EXIT_FAILURE);

-                    }

-                    rep = answer[0] ;

-                    if ((rep>='a') && (rep<='z'))

-                        rep -= 0x20;

-                }

-                while ((rep!='Y') && (rep!='N') && (rep!='A'));

-            }

-

-            if (rep == 'N')

-                skip = 1;

-

-            if (rep == 'A')

-                *popt_overwrite=1;

-        }

-

-        if ((skip==0) && (err==UNZ_OK))

-        {

-            fout=fopen(write_filename,"wb");

-

-            /* some zipfile don't contain directory alone before file */

-            if ((fout==NULL) && ((*popt_extract_without_path)==0) &&

-                                (filename_withoutpath!=(char*)filename_inzip))

-            {

-                char c=*(filename_withoutpath-1);

-                *(filename_withoutpath-1)='\0';

-                makedir((char *)write_filename);

-                *(filename_withoutpath-1)=c;

-                fout=fopen(write_filename,"wb");

-            }

-

-            if (fout==NULL)

-            {

-                printf("error opening %s\n",write_filename);

-            }

-        }

-

-        if (fout!=NULL)

-        {

-            printf(" extracting: %s\n",write_filename);

-

-            do

-            {

-                err = unzReadCurrentFile(uf,buf,size_buf);

-                if (err<0)

-                {

-                    printf("error %d with zipfile in unzReadCurrentFile\n",err);

-                    break;

-                }

-                if (err>0)

-                    if (fwrite(buf,err,1,fout)!=1)

-                    {

-                        printf("error in writing extracted file\n");

-                        err=UNZ_ERRNO;

-                        break;

-                    }

-            }

-            while (err>0);

-            if (fout)

-                    fclose(fout);

-

-            if (err==0)

-                change_file_date(write_filename,file_info.dosDate,

-                                 file_info.tmu_date);

-        }

-

-        if (err==UNZ_OK)

-        {

-            err = unzCloseCurrentFile (uf);

-            if (err!=UNZ_OK)

-            {

-                printf("error %d with zipfile in unzCloseCurrentFile\n",err);

-            }

-        }

-        else

-            unzCloseCurrentFile(uf); /* don't lose the error */

-    }

-

-    free(buf);

-    return err;

-}

-

-

-int do_extract(

-    unzFile uf,

-    int opt_extract_without_path,

-    int opt_overwrite,

-    const char* password)

-{

-    uLong i;

-    unz_global_info gi;

-    int err;

-    FILE* fout=NULL;

-

-    err = unzGetGlobalInfo (uf,&gi);

-    if (err!=UNZ_OK)

-        printf("error %d with zipfile in unzGetGlobalInfo \n",err);

-

-    for (i=0;i<gi.number_entry;i++)

-    {

-        if (do_extract_currentfile(uf,&opt_extract_without_path,

-                                      &opt_overwrite,

-                                      password) != UNZ_OK)

-            break;

-

-        if ((i+1)<gi.number_entry)

-        {

-            err = unzGoToNextFile(uf);

-            if (err!=UNZ_OK)

-            {

-                printf("error %d with zipfile in unzGoToNextFile\n",err);

-                break;

-            }

-        }

-    }

-

-    return 0;

-}

-

-int do_extract_onefile(

-    unzFile uf,

-    const char* filename,

-    int opt_extract_without_path,

-    int opt_overwrite,

-    const char* password)

-{

-    int err = UNZ_OK;

-    if (unzLocateFile(uf,filename,CASESENSITIVITY)!=UNZ_OK)

-    {

-        printf("file %s not found in the zipfile\n",filename);

-        return 2;

-    }

-

-    if (do_extract_currentfile(uf,&opt_extract_without_path,

-                                      &opt_overwrite,

-                                      password) == UNZ_OK)

-        return 0;

-    else

-        return 1;

-}

-

-int unzip_file(const char *zipfilename, const char *out_dir) 

-{

-

-    char filename_try[MAXFILENAME+16] = "";

-	char current_dir[MAX_PATH];

-    unzFile uf=NULL;

-

-	int ret;

-

-    if (zipfilename!=NULL)

-    {

-

-#        ifdef USEWIN32IOAPI

-        zlib_filefunc_def ffunc;

-#        endif

-

-        strncpy(filename_try, zipfilename,MAXFILENAME-1);

-        /* strncpy doesnt append the trailing NULL, of the string is too long. */

-        filename_try[ MAXFILENAME ] = '\0';

-

-#        ifdef USEWIN32IOAPI

-        fill_win32_filefunc(&ffunc);

-        uf = unzOpen2(zipfilename,&ffunc);

-#        else

-        uf = unzOpen(zipfilename);

-#        endif

-        if (uf==NULL)

-        {

-            strcat(filename_try,".zip");

-#            ifdef USEWIN32IOAPI

-            uf = unzOpen2(filename_try,&ffunc);

-#            else

-            uf = unzOpen(filename_try);

-#            endif

-        }

-    }

-

-	_getcwd(current_dir, MAX_PATH);

-    if (_chdir(out_dir)) 

-    {

-		printf("Error changing into %s, aborting\n", out_dir);

-		return 1;

-    }

-

-    if (uf==NULL)

-    {

-        printf("Cannot open %s or %s.zip\n",zipfilename,zipfilename);

-        return 1;

-    }

-    printf("%s opened\n",filename_try);

-

-    ret = do_extract(uf,0,1,0);

-

-    unzClose(uf);

-

-	_chdir(current_dir);

-

-	return ret;

-}

-

-#ifdef _MINIUNIPMIAN

-int main(argc,argv)

-    int argc;

-    char *argv[];

-{

-    const char *zipfilename=NULL;

-    const char *filename_to_extract=NULL;

-    const char *password=NULL;

-    char filename_try[MAXFILENAME+16] = "";

-    int i;

-    int opt_do_list=0;

-    int opt_do_extract=1;

-    int opt_do_extract_withoutpath=0;

-    int opt_overwrite=0;

-    int opt_extractdir=0;

-    const char *dirname=NULL;

-    unzFile uf=NULL;

-

-    do_banner();

-    if (argc==1)

-    {

-        do_help();

-        return 0;

-    }

-    else

-    {

-        for (i=1;i<argc;i++)

-        {

-            if ((*argv[i])=='-')

-            {

-                const char *p=argv[i]+1;

-

-                while ((*p)!='\0')

-                {

-                    char c=*(p++);;

-                    if ((c=='l') || (c=='L'))

-                        opt_do_list = 1;

-                    if ((c=='v') || (c=='V'))

-                        opt_do_list = 1;

-                    if ((c=='x') || (c=='X'))

-                        opt_do_extract = 1;

-                    if ((c=='e') || (c=='E'))

-                        opt_do_extract = opt_do_extract_withoutpath = 1;

-                    if ((c=='o') || (c=='O'))

-                        opt_overwrite=1;

-                    if ((c=='d') || (c=='D'))

-                    {

-                        opt_extractdir=1;

-                        dirname=argv[i+1];

-                    }

-

-                    if (((c=='p') || (c=='P')) && (i+1<argc))

-                    {

-                        password=argv[i+1];

-                        i++;

-                    }

-                }

-            }

-            else

-            {

-                if (zipfilename == NULL)

-                    zipfilename = argv[i];

-                else if ((filename_to_extract==NULL) && (!opt_extractdir))

-                        filename_to_extract = argv[i] ;

-            }

-        }

-    }

-

-    if (zipfilename!=NULL)

-    {

-

-#        ifdef USEWIN32IOAPI

-        zlib_filefunc_def ffunc;

-#        endif

-

-        strncpy(filename_try, zipfilename,MAXFILENAME-1);

-        /* strncpy doesnt append the trailing NULL, of the string is too long. */

-        filename_try[ MAXFILENAME ] = '\0';

-

-#        ifdef USEWIN32IOAPI

-        fill_win32_filefunc(&ffunc);

-        uf = unzOpen2(zipfilename,&ffunc);

-#        else

-        uf = unzOpen(zipfilename);

-#        endif

-        if (uf==NULL)

-        {

-            strcat(filename_try,".zip");

-#            ifdef USEWIN32IOAPI

-            uf = unzOpen2(filename_try,&ffunc);

-#            else

-            uf = unzOpen(filename_try);

-#            endif

-        }

-    }

-

-    if (uf==NULL)

-    {

-        printf("Cannot open %s or %s.zip\n",zipfilename,zipfilename);

-        return 1;

-    }

-    printf("%s opened\n",filename_try);

-

-    if (opt_do_list==1)

-        return do_list(uf);

-    else if (opt_do_extract==1)

-    {

-        if (opt_extractdir && chdir(dirname)) 

-        {

-          printf("Error changing into %s, aborting\n", dirname);

-          exit(-1);

-        }

-

-        if (filename_to_extract == NULL)

-            return do_extract(uf,opt_do_extract_withoutpath,opt_overwrite,password);

-        else

-            return do_extract_onefile(uf,filename_to_extract,

-                                      opt_do_extract_withoutpath,opt_overwrite,password);

-    }

-    unzCloseCurrentFile(uf);

-

-    return 0;

-}

-

-#endif
\ No newline at end of file
+/*
+   miniunz.c
+   Version 1.1, February 14h, 2010
+   sample part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
+
+         Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
+
+         Modifications of Unzip for Zip64
+         Copyright (C) 2007-2008 Even Rouault
+
+         Modifications for Zip64 support on both zip and unzip
+         Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
+*/
+
+#ifndef _WIN32
+        #ifndef __USE_FILE_OFFSET64
+                #define __USE_FILE_OFFSET64
+        #endif
+        #ifndef __USE_LARGEFILE64
+                #define __USE_LARGEFILE64
+        #endif
+        #ifndef _LARGEFILE64_SOURCE
+                #define _LARGEFILE64_SOURCE
+        #endif
+        #ifndef _FILE_OFFSET_BIT
+                #define _FILE_OFFSET_BIT 64
+        #endif
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <errno.h>
+#include <fcntl.h>
+
+#ifdef unix
+# include <unistd.h>
+# include <utime.h>
+#else
+# include <direct.h>
+# include <io.h>
+#endif
+
+#include "unzip.h"
+
+#define CASESENSITIVITY (0)
+#define WRITEBUFFERSIZE (8192)
+#define MAXFILENAME (256)
+
+#ifdef _WIN32
+#define USEWIN32IOAPI
+#include "iowin32.h"
+#endif
+/*
+  mini unzip, demo of unzip package
+
+  usage :
+  Usage : miniunz [-exvlo] file.zip [file_to_extract] [-d extractdir]
+
+  list the file in the zipfile, and print the content of FILE_ID.ZIP or README.TXT
+    if it exists
+*/
+
+
+/* change_file_date : change the date/time of a file
+    filename : the filename of the file where date/time must be modified
+    dosdate : the new date at the MSDos format (4 bytes)
+    tmu_date : the SAME new date at the tm_unz format */
+void change_file_date(filename,dosdate,tmu_date)
+    const char *filename;
+    uLong dosdate;
+    tm_unz tmu_date;
+{
+#ifdef _WIN32
+  HANDLE hFile;
+  FILETIME ftm,ftLocal,ftCreate,ftLastAcc,ftLastWrite;
+
+  hFile = CreateFileA(filename,GENERIC_READ | GENERIC_WRITE,
+                      0,NULL,OPEN_EXISTING,0,NULL);
+  GetFileTime(hFile,&ftCreate,&ftLastAcc,&ftLastWrite);
+  DosDateTimeToFileTime((WORD)(dosdate>>16),(WORD)dosdate,&ftLocal);
+  LocalFileTimeToFileTime(&ftLocal,&ftm);
+  SetFileTime(hFile,&ftm,&ftLastAcc,&ftm);
+  CloseHandle(hFile);
+#else
+#ifdef unix
+  struct utimbuf ut;
+  struct tm newdate;
+  newdate.tm_sec = tmu_date.tm_sec;
+  newdate.tm_min=tmu_date.tm_min;
+  newdate.tm_hour=tmu_date.tm_hour;
+  newdate.tm_mday=tmu_date.tm_mday;
+  newdate.tm_mon=tmu_date.tm_mon;
+  if (tmu_date.tm_year > 1900)
+      newdate.tm_year=tmu_date.tm_year - 1900;
+  else
+      newdate.tm_year=tmu_date.tm_year ;
+  newdate.tm_isdst=-1;
+
+  ut.actime=ut.modtime=mktime(&newdate);
+  utime(filename,&ut);
+#endif
+#endif
+}
+
+
+/* mymkdir and change_file_date are not 100 % portable
+   As I don't know well Unix, I wait feedback for the unix portion */
+
+int mymkdir(dirname)
+    const char* dirname;
+{
+    int ret=0;
+#ifdef _WIN32
+    ret = _mkdir(dirname);
+#else
+#ifdef unix
+    ret = mkdir (dirname,0775);
+#endif
+#endif
+    return ret;
+}
+
+int makedir (newdir)
+    char *newdir;
+{
+  char *buffer ;
+  char *p;
+  int  len = (int)strlen(newdir);
+
+  if (len <= 0)
+    return 0;
+
+  buffer = (char*)malloc(len+1);
+        if (buffer==NULL)
+        {
+                printf("Error allocating memory\n");
+                return UNZ_INTERNALERROR;
+        }
+  strcpy(buffer,newdir);
+
+  if (buffer[len-1] == '/') {
+    buffer[len-1] = '\0';
+  }
+  if (mymkdir(buffer) == 0)
+    {
+      free(buffer);
+      return 1;
+    }
+
+  p = buffer+1;
+  while (1)
+    {
+      char hold;
+
+      while(*p && *p != '\\' && *p != '/')
+        p++;
+      hold = *p;
+      *p = 0;
+      if ((mymkdir(buffer) == -1) && (errno == ENOENT))
+        {
+          printf("couldn't create directory %s\n",buffer);
+          free(buffer);
+          return 0;
+        }
+      if (hold == 0)
+        break;
+      *p++ = hold;
+    }
+  free(buffer);
+  return 1;
+}
+
+void do_banner()
+{
+    printf("MiniUnz 1.01b, demo of zLib + Unz package written by Gilles Vollant\n");
+    printf("more info at http://www.winimage.com/zLibDll/unzip.html\n\n");
+}
+
+void do_help()
+{
+    printf("Usage : miniunz [-e] [-x] [-v] [-l] [-o] [-p password] file.zip [file_to_extr.] [-d extractdir]\n\n" \
+           "  -e  Extract without pathname (junk paths)\n" \
+           "  -x  Extract with pathname\n" \
+           "  -v  list files\n" \
+           "  -l  list files\n" \
+           "  -d  directory to extract into\n" \
+           "  -o  overwrite files without prompting\n" \
+           "  -p  extract crypted file using password\n\n");
+}
+
+void Display64BitsSize(ZPOS64_T n, int size_char)
+{
+  /* to avoid compatibility problem , we do here the conversion */
+  char number[21];
+  int offset=19;
+  int pos_string = 19;
+  number[20]=0;
+  for (;;) {
+      number[offset]=(char)((n%10)+'0');
+      if (number[offset] != '0')
+          pos_string=offset;
+      n/=10;
+      if (offset==0)
+          break;
+      offset--;
+  }
+  {
+      int size_display_string = 19-pos_string;
+      while (size_char > size_display_string)
+      {
+          size_char--;
+          printf(" ");
+      }
+  }
+
+  printf("%s",&number[pos_string]);
+}
+
+int do_list(uf)
+    unzFile uf;
+{
+    uLong i;
+    unz_global_info64 gi;
+    int err;
+
+    err = unzGetGlobalInfo64(uf,&gi);
+    if (err!=UNZ_OK)
+        printf("error %d with zipfile in unzGetGlobalInfo \n",err);
+    printf("  Length  Method     Size Ratio   Date    Time   CRC-32     Name\n");
+    printf("  ------  ------     ---- -----   ----    ----   ------     ----\n");
+    for (i=0;i<gi.number_entry;i++)
+    {
+        char filename_inzip[256];
+        unz_file_info64 file_info;
+        uLong ratio=0;
+        const char *string_method;
+        char charCrypt=' ';
+        err = unzGetCurrentFileInfo64(uf,&file_info,filename_inzip,sizeof(filename_inzip),NULL,0,NULL,0);
+        if (err!=UNZ_OK)
+        {
+            printf("error %d with zipfile in unzGetCurrentFileInfo\n",err);
+            break;
+        }
+        if (file_info.uncompressed_size>0)
+            ratio = (uLong)((file_info.compressed_size*100)/file_info.uncompressed_size);
+
+        /* display a '*' if the file is crypted */
+        if ((file_info.flag & 1) != 0)
+            charCrypt='*';
+
+        if (file_info.compression_method==0)
+            string_method="Stored";
+        else
+        if (file_info.compression_method==Z_DEFLATED)
+        {
+            uInt iLevel=(uInt)((file_info.flag & 0x6)/2);
+            if (iLevel==0)
+              string_method="Defl:N";
+            else if (iLevel==1)
+              string_method="Defl:X";
+            else if ((iLevel==2) || (iLevel==3))
+              string_method="Defl:F"; /* 2:fast , 3 : extra fast*/
+        }
+        else
+        if (file_info.compression_method==Z_BZIP2ED)
+        {
+              string_method="BZip2 ";
+        }
+        else
+            string_method="Unkn. ";
+
+        Display64BitsSize(file_info.uncompressed_size,7);
+        printf("  %6s%c",string_method,charCrypt);
+        Display64BitsSize(file_info.compressed_size,7);
+        printf(" %3lu%%  %2.2lu-%2.2lu-%2.2lu  %2.2lu:%2.2lu  %8.8lx   %s\n",
+                ratio,
+                (uLong)file_info.tmu_date.tm_mon + 1,
+                (uLong)file_info.tmu_date.tm_mday,
+                (uLong)file_info.tmu_date.tm_year % 100,
+                (uLong)file_info.tmu_date.tm_hour,(uLong)file_info.tmu_date.tm_min,
+                (uLong)file_info.crc,filename_inzip);
+        if ((i+1)<gi.number_entry)
+        {
+            err = unzGoToNextFile(uf);
+            if (err!=UNZ_OK)
+            {
+                printf("error %d with zipfile in unzGoToNextFile\n",err);
+                break;
+            }
+        }
+    }
+
+    return 0;
+}
+
+
+int do_extract_currentfile(uf,popt_extract_without_path,popt_overwrite,password)
+    unzFile uf;
+    const int* popt_extract_without_path;
+    int* popt_overwrite;
+    const char* password;
+{
+    char filename_inzip[256];
+    char* filename_withoutpath;
+    char* p;
+    int err=UNZ_OK;
+    FILE *fout=NULL;
+    void* buf;
+    uInt size_buf;
+
+    unz_file_info64 file_info;
+    uLong ratio=0;
+    err = unzGetCurrentFileInfo64(uf,&file_info,filename_inzip,sizeof(filename_inzip),NULL,0,NULL,0);
+
+    if (err!=UNZ_OK)
+    {
+        printf("error %d with zipfile in unzGetCurrentFileInfo\n",err);
+        return err;
+    }
+
+    size_buf = WRITEBUFFERSIZE;
+    buf = (void*)malloc(size_buf);
+    if (buf==NULL)
+    {
+        printf("Error allocating memory\n");
+        return UNZ_INTERNALERROR;
+    }
+
+    p = filename_withoutpath = filename_inzip;
+    while ((*p) != '\0')
+    {
+        if (((*p)=='/') || ((*p)=='\\'))
+            filename_withoutpath = p+1;
+        p++;
+    }
+
+    if ((*filename_withoutpath)=='\0')
+    {
+        if ((*popt_extract_without_path)==0)
+        {
+            printf("creating directory: %s\n",filename_inzip);
+            mymkdir(filename_inzip);
+        }
+    }
+    else
+    {
+        const char* write_filename;
+        int skip=0;
+
+        if ((*popt_extract_without_path)==0)
+            write_filename = filename_inzip;
+        else
+            write_filename = filename_withoutpath;
+
+        err = unzOpenCurrentFilePassword(uf,password);
+        if (err!=UNZ_OK)
+        {
+            printf("error %d with zipfile in unzOpenCurrentFilePassword\n",err);
+        }
+
+        if (((*popt_overwrite)==0) && (err==UNZ_OK))
+        {
+            char rep=0;
+            FILE* ftestexist;
+            ftestexist = fopen64(write_filename,"rb");
+            if (ftestexist!=NULL)
+            {
+                fclose(ftestexist);
+                do
+                {
+                    char answer[128];
+                    int ret;
+
+                    printf("The file %s exists. Overwrite ? [y]es, [n]o, [A]ll: ",write_filename);
+                    ret = scanf("%1s",answer);
+                    if (ret != 1)
+                    {
+                       exit(EXIT_FAILURE);
+                    }
+                    rep = answer[0] ;
+                    if ((rep>='a') && (rep<='z'))
+                        rep -= 0x20;
+                }
+                while ((rep!='Y') && (rep!='N') && (rep!='A'));
+            }
+
+            if (rep == 'N')
+                skip = 1;
+
+            if (rep == 'A')
+                *popt_overwrite=1;
+        }
+
+        if ((skip==0) && (err==UNZ_OK))
+        {
+            fout=fopen64(write_filename,"wb");
+
+            /* some zipfile don't contain directory alone before file */
+            if ((fout==NULL) && ((*popt_extract_without_path)==0) &&
+                                (filename_withoutpath!=(char*)filename_inzip))
+            {
+                char c=*(filename_withoutpath-1);
+                *(filename_withoutpath-1)='\0';
+                makedir(write_filename);
+                *(filename_withoutpath-1)=c;
+                fout=fopen64(write_filename,"wb");
+            }
+
+            if (fout==NULL)
+            {
+                printf("error opening %s\n",write_filename);
+            }
+        }
+
+        if (fout!=NULL)
+        {
+            printf(" extracting: %s\n",write_filename);
+
+            do
+            {
+                err = unzReadCurrentFile(uf,buf,size_buf);
+                if (err<0)
+                {
+                    printf("error %d with zipfile in unzReadCurrentFile\n",err);
+                    break;
+                }
+                if (err>0)
+                    if (fwrite(buf,err,1,fout)!=1)
+                    {
+                        printf("error in writing extracted file\n");
+                        err=UNZ_ERRNO;
+                        break;
+                    }
+            }
+            while (err>0);
+            if (fout)
+                    fclose(fout);
+
+            if (err==0)
+                change_file_date(write_filename,file_info.dosDate,
+                                 file_info.tmu_date);
+        }
+
+        if (err==UNZ_OK)
+        {
+            err = unzCloseCurrentFile (uf);
+            if (err!=UNZ_OK)
+            {
+                printf("error %d with zipfile in unzCloseCurrentFile\n",err);
+            }
+        }
+        else
+            unzCloseCurrentFile(uf); /* don't lose the error */
+    }
+
+    free(buf);
+    return err;
+}
+
+
+int do_extract(uf,opt_extract_without_path,opt_overwrite,password)
+    unzFile uf;
+    int opt_extract_without_path;
+    int opt_overwrite;
+    const char* password;
+{
+    uLong i;
+    unz_global_info64 gi;
+    int err;
+    FILE* fout=NULL;
+
+    err = unzGetGlobalInfo64(uf,&gi);
+    if (err!=UNZ_OK)
+        printf("error %d with zipfile in unzGetGlobalInfo \n",err);
+
+    for (i=0;i<gi.number_entry;i++)
+    {
+        if (do_extract_currentfile(uf,&opt_extract_without_path,
+                                      &opt_overwrite,
+                                      password) != UNZ_OK)
+            break;
+
+        if ((i+1)<gi.number_entry)
+        {
+            err = unzGoToNextFile(uf);
+            if (err!=UNZ_OK)
+            {
+                printf("error %d with zipfile in unzGoToNextFile\n",err);
+                break;
+            }
+        }
+    }
+
+    return 0;
+}
+
+int do_extract_onefile(uf,filename,opt_extract_without_path,opt_overwrite,password)
+    unzFile uf;
+    const char* filename;
+    int opt_extract_without_path;
+    int opt_overwrite;
+    const char* password;
+{
+    int err = UNZ_OK;
+    if (unzLocateFile(uf,filename,CASESENSITIVITY)!=UNZ_OK)
+    {
+        printf("file %s not found in the zipfile\n",filename);
+        return 2;
+    }
+
+    if (do_extract_currentfile(uf,&opt_extract_without_path,
+                                      &opt_overwrite,
+                                      password) == UNZ_OK)
+        return 0;
+    else
+        return 1;
+}
+
+
+int main(argc,argv)
+    int argc;
+    char *argv[];
+{
+    const char *zipfilename=NULL;
+    const char *filename_to_extract=NULL;
+    const char *password=NULL;
+    char filename_try[MAXFILENAME+16] = "";
+    int i;
+    int ret_value=0;
+    int opt_do_list=0;
+    int opt_do_extract=1;
+    int opt_do_extract_withoutpath=0;
+    int opt_overwrite=0;
+    int opt_extractdir=0;
+    const char *dirname=NULL;
+    unzFile uf=NULL;
+
+    do_banner();
+    if (argc==1)
+    {
+        do_help();
+        return 0;
+    }
+    else
+    {
+        for (i=1;i<argc;i++)
+        {
+            if ((*argv[i])=='-')
+            {
+                const char *p=argv[i]+1;
+
+                while ((*p)!='\0')
+                {
+                    char c=*(p++);;
+                    if ((c=='l') || (c=='L'))
+                        opt_do_list = 1;
+                    if ((c=='v') || (c=='V'))
+                        opt_do_list = 1;
+                    if ((c=='x') || (c=='X'))
+                        opt_do_extract = 1;
+                    if ((c=='e') || (c=='E'))
+                        opt_do_extract = opt_do_extract_withoutpath = 1;
+                    if ((c=='o') || (c=='O'))
+                        opt_overwrite=1;
+                    if ((c=='d') || (c=='D'))
+                    {
+                        opt_extractdir=1;
+                        dirname=argv[i+1];
+                    }
+
+                    if (((c=='p') || (c=='P')) && (i+1<argc))
+                    {
+                        password=argv[i+1];
+                        i++;
+                    }
+                }
+            }
+            else
+            {
+                if (zipfilename == NULL)
+                    zipfilename = argv[i];
+                else if ((filename_to_extract==NULL) && (!opt_extractdir))
+                        filename_to_extract = argv[i] ;
+            }
+        }
+    }
+
+    if (zipfilename!=NULL)
+    {
+
+#        ifdef USEWIN32IOAPI
+        zlib_filefunc64_def ffunc;
+#        endif
+
+        strncpy(filename_try, zipfilename,MAXFILENAME-1);
+        /* strncpy doesnt append the trailing NULL, of the string is too long. */
+        filename_try[ MAXFILENAME ] = '\0';
+
+#        ifdef USEWIN32IOAPI
+        fill_win32_filefunc64A(&ffunc);
+        uf = unzOpen2_64(zipfilename,&ffunc);
+#        else
+        uf = unzOpen64(zipfilename);
+#        endif
+        if (uf==NULL)
+        {
+            strcat(filename_try,".zip");
+#            ifdef USEWIN32IOAPI
+            uf = unzOpen2_64(filename_try,&ffunc);
+#            else
+            uf = unzOpen64(filename_try);
+#            endif
+        }
+    }
+
+    if (uf==NULL)
+    {
+        printf("Cannot open %s or %s.zip\n",zipfilename,zipfilename);
+        return 1;
+    }
+    printf("%s opened\n",filename_try);
+
+    if (opt_do_list==1)
+        ret_value = do_list(uf);
+    else if (opt_do_extract==1)
+    {
+#ifdef _WIN32
+        if (opt_extractdir && _chdir(dirname))
+#else
+        if (opt_extractdir && chdir(dirname))
+#endif
+        {
+          printf("Error changing into %s, aborting\n", dirname);
+          exit(-1);
+        }
+
+        if (filename_to_extract == NULL)
+            ret_value = do_extract(uf, opt_do_extract_withoutpath, opt_overwrite, password);
+        else
+            ret_value = do_extract_onefile(uf, filename_to_extract, opt_do_extract_withoutpath, opt_overwrite, password);
+    }
+
+    unzClose(uf);
+
+    return ret_value;
+}
diff --git a/updater/zbin/minizip/minizip.c b/updater/zbin/minizip/minizip.c
new file mode 100644
index 0000000..7a4fa5a
--- /dev/null
+++ b/updater/zbin/minizip/minizip.c
@@ -0,0 +1,507 @@
+/*
+   minizip.c
+   Version 1.1, February 14h, 2010
+   sample part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
+
+         Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
+
+         Modifications of Unzip for Zip64
+         Copyright (C) 2007-2008 Even Rouault
+
+         Modifications for Zip64 support on both zip and unzip
+         Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
+*/
+
+
+#ifndef _WIN32
+        #ifndef __USE_FILE_OFFSET64
+                #define __USE_FILE_OFFSET64
+        #endif
+        #ifndef __USE_LARGEFILE64
+                #define __USE_LARGEFILE64
+        #endif
+        #ifndef _LARGEFILE64_SOURCE
+                #define _LARGEFILE64_SOURCE
+        #endif
+        #ifndef _FILE_OFFSET_BIT
+                #define _FILE_OFFSET_BIT 64
+        #endif
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <errno.h>
+#include <fcntl.h>
+
+#ifdef unix
+# include <unistd.h>
+# include <utime.h>
+# include <sys/types.h>
+# include <sys/stat.h>
+#else
+# include <direct.h>
+# include <io.h>
+#endif
+
+#include "zip.h"
+
+#ifdef _WIN32
+        #define USEWIN32IOAPI
+        #include "iowin32.h"
+#endif
+
+
+
+#define WRITEBUFFERSIZE (16384)
+#define MAXFILENAME (256)
+
+#ifdef _WIN32
+uLong filetime(f, tmzip, dt)
+    char *f;                /* name of file to get info on */
+    tm_zip *tmzip;             /* return value: access, modific. and creation times */
+    uLong *dt;             /* dostime */
+{
+  int ret = 0;
+  {
+      FILETIME ftLocal;
+      HANDLE hFind;
+      WIN32_FIND_DATAA ff32;
+
+      hFind = FindFirstFileA(f,&ff32);
+      if (hFind != INVALID_HANDLE_VALUE)
+      {
+        FileTimeToLocalFileTime(&(ff32.ftLastWriteTime),&ftLocal);
+        FileTimeToDosDateTime(&ftLocal,((LPWORD)dt)+1,((LPWORD)dt)+0);
+        FindClose(hFind);
+        ret = 1;
+      }
+  }
+  return ret;
+}
+#else
+#ifdef unix
+uLong filetime(f, tmzip, dt)
+    char *f;               /* name of file to get info on */
+    tm_zip *tmzip;         /* return value: access, modific. and creation times */
+    uLong *dt;             /* dostime */
+{
+  int ret=0;
+  struct stat s;        /* results of stat() */
+  struct tm* filedate;
+  time_t tm_t=0;
+
+  if (strcmp(f,"-")!=0)
+  {
+    char name[MAXFILENAME+1];
+    int len = strlen(f);
+    if (len > MAXFILENAME)
+      len = MAXFILENAME;
+
+    strncpy(name, f,MAXFILENAME-1);
+    /* strncpy doesnt append the trailing NULL, of the string is too long. */
+    name[ MAXFILENAME ] = '\0';
+
+    if (name[len - 1] == '/')
+      name[len - 1] = '\0';
+    /* not all systems allow stat'ing a file with / appended */
+    if (stat(name,&s)==0)
+    {
+      tm_t = s.st_mtime;
+      ret = 1;
+    }
+  }
+  filedate = localtime(&tm_t);
+
+  tmzip->tm_sec  = filedate->tm_sec;
+  tmzip->tm_min  = filedate->tm_min;
+  tmzip->tm_hour = filedate->tm_hour;
+  tmzip->tm_mday = filedate->tm_mday;
+  tmzip->tm_mon  = filedate->tm_mon ;
+  tmzip->tm_year = filedate->tm_year;
+
+  return ret;
+}
+#else
+uLong filetime(f, tmzip, dt)
+    char *f;                /* name of file to get info on */
+    tm_zip *tmzip;             /* return value: access, modific. and creation times */
+    uLong *dt;             /* dostime */
+{
+    return 0;
+}
+#endif
+#endif
+
+
+
+
+int check_exist_file(filename)
+    const char* filename;
+{
+    FILE* ftestexist;
+    int ret = 1;
+    ftestexist = fopen64(filename,"rb");
+    if (ftestexist==NULL)
+        ret = 0;
+    else
+        fclose(ftestexist);
+    return ret;
+}
+
+void do_banner()
+{
+    printf("MiniZip 1.1, demo of zLib + MiniZip64 package, written by Gilles Vollant\n");
+    printf("more info on MiniZip at http://www.winimage.com/zLibDll/minizip.html\n\n");
+}
+
+void do_help()
+{
+    printf("Usage : minizip [-o] [-a] [-0 to -9] [-p password] [-j] file.zip [files_to_add]\n\n" \
+           "  -o  Overwrite existing file.zip\n" \
+           "  -a  Append to existing file.zip\n" \
+           "  -0  Store only\n" \
+           "  -1  Compress faster\n" \
+           "  -9  Compress better\n\n" \
+           "  -j  exclude path. store only the file name.\n\n");
+}
+
+/* calculate the CRC32 of a file,
+   because to encrypt a file, we need known the CRC32 of the file before */
+int getFileCrc(const char* filenameinzip,void*buf,unsigned long size_buf,unsigned long* result_crc)
+{
+   unsigned long calculate_crc=0;
+   int err=ZIP_OK;
+   FILE * fin = fopen64(filenameinzip,"rb");
+   unsigned long size_read = 0;
+   unsigned long total_read = 0;
+   if (fin==NULL)
+   {
+       err = ZIP_ERRNO;
+   }
+
+    if (err == ZIP_OK)
+        do
+        {
+            err = ZIP_OK;
+            size_read = (int)fread(buf,1,size_buf,fin);
+            if (size_read < size_buf)
+                if (feof(fin)==0)
+            {
+                printf("error in reading %s\n",filenameinzip);
+                err = ZIP_ERRNO;
+            }
+
+            if (size_read>0)
+                calculate_crc = crc32(calculate_crc,buf,size_read);
+            total_read += size_read;
+
+        } while ((err == ZIP_OK) && (size_read>0));
+
+    if (fin)
+        fclose(fin);
+
+    *result_crc=calculate_crc;
+    printf("file %s crc %lx\n", filenameinzip, calculate_crc);
+    return err;
+}
+
+int isLargeFile(const char* filename)
+{
+  int largeFile = 0;
+  ZPOS64_T pos = 0;
+  FILE* pFile = fopen64(filename, "rb");
+
+  if(pFile != NULL)
+  {
+    int n = fseeko64(pFile, 0, SEEK_END);
+
+    pos = ftello64(pFile);
+
+                printf("File : %s is %lld bytes\n", filename, pos);
+
+    if(pos >= 0xffffffff)
+     largeFile = 1;
+
+                fclose(pFile);
+  }
+
+ return largeFile;
+}
+
+int main(argc,argv)
+    int argc;
+    char *argv[];
+{
+    int i;
+    int opt_overwrite=0;
+    int opt_compress_level=Z_DEFAULT_COMPRESSION;
+    int opt_exclude_path=0;
+    int zipfilenamearg = 0;
+    char filename_try[MAXFILENAME+16];
+    int zipok;
+    int err=0;
+    int size_buf=0;
+    void* buf=NULL;
+    const char* password=NULL;
+
+
+    do_banner();
+    if (argc==1)
+    {
+        do_help();
+        return 0;
+    }
+    else
+    {
+        for (i=1;i<argc;i++)
+        {
+            if ((*argv[i])=='-')
+            {
+                const char *p=argv[i]+1;
+
+                while ((*p)!='\0')
+                {
+                    char c=*(p++);;
+                    if ((c=='o') || (c=='O'))
+                        opt_overwrite = 1;
+                    if ((c=='a') || (c=='A'))
+                        opt_overwrite = 2;
+                    if ((c>='0') && (c<='9'))
+                        opt_compress_level = c-'0';
+                    if ((c=='j') || (c=='J'))
+                        opt_exclude_path = 1;
+
+                    if (((c=='p') || (c=='P')) && (i+1<argc))
+                    {
+                        password=argv[i+1];
+                        i++;
+                    }
+                }
+            }
+            else
+            {
+                if (zipfilenamearg == 0)
+                {
+                    zipfilenamearg = i ;
+                }
+            }
+        }
+    }
+
+    size_buf = WRITEBUFFERSIZE;
+    buf = (void*)malloc(size_buf);
+    if (buf==NULL)
+    {
+        printf("Error allocating memory\n");
+        return ZIP_INTERNALERROR;
+    }
+
+    if (zipfilenamearg==0)
+    {
+        zipok=0;
+    }
+    else
+    {
+        int i,len;
+        int dot_found=0;
+
+        zipok = 1 ;
+        strncpy(filename_try, argv[zipfilenamearg],MAXFILENAME-1);
+        /* strncpy doesnt append the trailing NULL, of the string is too long. */
+        filename_try[ MAXFILENAME ] = '\0';
+
+        len=(int)strlen(filename_try);
+        for (i=0;i<len;i++)
+            if (filename_try[i]=='.')
+                dot_found=1;
+
+        if (dot_found==0)
+            strcat(filename_try,".zip");
+
+        if (opt_overwrite==2)
+        {
+            /* if the file don't exist, we not append file */
+            if (check_exist_file(filename_try)==0)
+                opt_overwrite=1;
+        }
+        else
+        if (opt_overwrite==0)
+            if (check_exist_file(filename_try)!=0)
+            {
+                char rep=0;
+                do
+                {
+                    char answer[128];
+                    int ret;
+                    printf("The file %s exists. Overwrite ? [y]es, [n]o, [a]ppend : ",filename_try);
+                    ret = scanf("%1s",answer);
+                    if (ret != 1)
+                    {
+                       exit(EXIT_FAILURE);
+                    }
+                    rep = answer[0] ;
+                    if ((rep>='a') && (rep<='z'))
+                        rep -= 0x20;
+                }
+                while ((rep!='Y') && (rep!='N') && (rep!='A'));
+                if (rep=='N')
+                    zipok = 0;
+                if (rep=='A')
+                    opt_overwrite = 2;
+            }
+    }
+
+    if (zipok==1)
+    {
+        zipFile zf;
+        int errclose;
+#        ifdef USEWIN32IOAPI
+        zlib_filefunc64_def ffunc;
+        fill_win32_filefunc64A(&ffunc);
+        zf = zipOpen2_64(filename_try,(opt_overwrite==2) ? 2 : 0,NULL,&ffunc);
+#        else
+        zf = zipOpen64(filename_try,(opt_overwrite==2) ? 2 : 0);
+#        endif
+
+        if (zf == NULL)
+        {
+            printf("error opening %s\n",filename_try);
+            err= ZIP_ERRNO;
+        }
+        else
+            printf("creating %s\n",filename_try);
+
+        for (i=zipfilenamearg+1;(i<argc) && (err==ZIP_OK);i++)
+        {
+            if (!((((*(argv[i]))=='-') || ((*(argv[i]))=='/')) &&
+                  ((argv[i][1]=='o') || (argv[i][1]=='O') ||
+                   (argv[i][1]=='a') || (argv[i][1]=='A') ||
+                   (argv[i][1]=='p') || (argv[i][1]=='P') ||
+                   ((argv[i][1]>='0') || (argv[i][1]<='9'))) &&
+                  (strlen(argv[i]) == 2)))
+            {
+                FILE * fin;
+                int size_read;
+                const char* filenameinzip = argv[i];
+                const char *savefilenameinzip;
+                zip_fileinfo zi;
+                unsigned long crcFile=0;
+                int zip64 = 0;
+
+                zi.tmz_date.tm_sec = zi.tmz_date.tm_min = zi.tmz_date.tm_hour =
+                zi.tmz_date.tm_mday = zi.tmz_date.tm_mon = zi.tmz_date.tm_year = 0;
+                zi.dosDate = 0;
+                zi.internal_fa = 0;
+                zi.external_fa = 0;
+                filetime(filenameinzip,&zi.tmz_date,&zi.dosDate);
+
+/*
+                err = zipOpenNewFileInZip(zf,filenameinzip,&zi,
+                                 NULL,0,NULL,0,NULL / * comment * /,
+                                 (opt_compress_level != 0) ? Z_DEFLATED : 0,
+                                 opt_compress_level);
+*/
+                if ((password != NULL) && (err==ZIP_OK))
+                    err = getFileCrc(filenameinzip,buf,size_buf,&crcFile);
+
+                zip64 = isLargeFile(filenameinzip);
+
+                                                         /* The path name saved, should not include a leading slash. */
+               /*if it did, windows/xp and dynazip couldn't read the zip file. */
+                 savefilenameinzip = filenameinzip;
+                 while( savefilenameinzip[0] == '\\' || savefilenameinzip[0] == '/' )
+                 {
+                     savefilenameinzip++;
+                 }
+
+                 /*should the zip file contain any path at all?*/
+                 if( opt_exclude_path )
+                 {
+                     const char *tmpptr;
+                     const char *lastslash = 0;
+                     for( tmpptr = savefilenameinzip; *tmpptr; tmpptr++)
+                     {
+                         if( *tmpptr == '\\' || *tmpptr == '/')
+                         {
+                             lastslash = tmpptr;
+                         }
+                     }
+                     if( lastslash != NULL )
+                     {
+                         savefilenameinzip = lastslash+1; // base filename follows last slash.
+                     }
+                 }
+
+                 /**/
+                err = zipOpenNewFileInZip3_64(zf,savefilenameinzip,&zi,
+                                 NULL,0,NULL,0,NULL /* comment*/,
+                                 (opt_compress_level != 0) ? Z_DEFLATED : 0,
+                                 opt_compress_level,0,
+                                 /* -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY, */
+                                 -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY,
+                                 password,crcFile, zip64);
+
+                if (err != ZIP_OK)
+                    printf("error in opening %s in zipfile\n",filenameinzip);
+                else
+                {
+                    fin = fopen64(filenameinzip,"rb");
+                    if (fin==NULL)
+                    {
+                        err=ZIP_ERRNO;
+                        printf("error in opening %s for reading\n",filenameinzip);
+                    }
+                }
+
+                if (err == ZIP_OK)
+                    do
+                    {
+                        err = ZIP_OK;
+                        size_read = (int)fread(buf,1,size_buf,fin);
+                        if (size_read < size_buf)
+                            if (feof(fin)==0)
+                        {
+                            printf("error in reading %s\n",filenameinzip);
+                            err = ZIP_ERRNO;
+                        }
+
+                        if (size_read>0)
+                        {
+                            err = zipWriteInFileInZip (zf,buf,size_read);
+                            if (err<0)
+                            {
+                                printf("error in writing %s in the zipfile\n",
+                                                 filenameinzip);
+                            }
+
+                        }
+                    } while ((err == ZIP_OK) && (size_read>0));
+
+                if (fin)
+                    fclose(fin);
+
+                if (err<0)
+                    err=ZIP_ERRNO;
+                else
+                {
+                    err = zipCloseFileInZip(zf);
+                    if (err!=ZIP_OK)
+                        printf("error in closing %s in the zipfile\n",
+                                    filenameinzip);
+                }
+            }
+        }
+        errclose = zipClose(zf,NULL);
+        if (errclose != ZIP_OK)
+            printf("error in closing %s\n",filename_try);
+    }
+    else
+    {
+       do_help();
+    }
+
+    free(buf);
+    return 0;
+}
diff --git a/updater/zbin/minizip/munzip.c b/updater/zbin/minizip/munzip.c
deleted file mode 100644
index 1cacd92..0000000
--- a/updater/zbin/minizip/munzip.c
+++ /dev/null
@@ -1,1585 +0,0 @@
-/* unzip.c -- IO for uncompress .zip files using zlib

-   Version 1.01e, February 12th, 2005

-

-   Copyright (C) 1998-2005 Gilles Vollant

-

-   Read unzip.h for more info

-*/

-

-/* Decryption code comes from crypt.c by Info-ZIP but has been greatly reduced in terms of

-compatibility with older software. The following is from the original crypt.c. Code

-woven in by Terry Thorsen 1/2003.

-*/

-/*

-  Copyright (c) 1990-2000 Info-ZIP.  All rights reserved.

-

-  See the accompanying file LICENSE, version 2000-Apr-09 or later

-  (the contents of which are also included in zip.h) for terms of use.

-  If, for some reason, all these files are missing, the Info-ZIP license

-  also may be found at:  ftp://ftp.info-zip.org/pub/infozip/license.html

-*/

-/*

-  crypt.c (full version) by Info-ZIP.      Last revised:  [see crypt.h]

-

-  The encryption/decryption parts of this source code (as opposed to the

-  non-echoing password parts) were originally written in Europe.  The

-  whole source package can be freely distributed, including from the USA.

-  (Prior to January 2000, re-export from the US was a violation of US law.)

- */

-

-/*

-  This encryption code is a direct transcription of the algorithm from

-  Roger Schlafly, described by Phil Katz in the file appnote.txt.  This

-  file (appnote.txt) is distributed with the PKZIP program (even in the

-  version without encryption capabilities).

- */

-

-

-#include <stdio.h>

-#include <stdlib.h>

-#include <string.h>

-#include "zlib.h"

-#include "munzip.h"

-

-#ifdef STDC

-#  include <stddef.h>

-#  include <string.h>

-#  include <stdlib.h>

-#endif

-#ifdef NO_ERRNO_H

-    extern int errno;

-#else

-#   include <errno.h>

-#endif

-

-

-#ifndef local

-#  define local static

-#endif

-/* compile with -Dlocal if your debugger can't find static symbols */

-

-

-#ifndef CASESENSITIVITYDEFAULT_NO

-#  if !defined(unix) && !defined(CASESENSITIVITYDEFAULT_YES)

-#    define CASESENSITIVITYDEFAULT_NO

-#  endif

-#endif

-

-

-#ifndef UNZ_BUFSIZE

-#define UNZ_BUFSIZE (16384)

-#endif

-

-#ifndef UNZ_MAXFILENAMEINZIP

-#define UNZ_MAXFILENAMEINZIP (256)

-#endif

-

-#ifndef ALLOC

-# define ALLOC(size) (malloc(size))

-#endif

-#ifndef TRYFREE

-# define TRYFREE(p) {if (p) free(p);}

-#endif

-

-#define SIZECENTRALDIRITEM (0x2e)

-#define SIZEZIPLOCALHEADER (0x1e)

-

-

-

-

-const char unz_copyright[] =

-   " unzip 1.01 Copyright 1998-2004 Gilles Vollant - http://www.winimage.com/zLibDll";

-

-/* unz_file_info_interntal contain internal info about a file in zipfile*/

-typedef struct unz_file_info_internal_s

-{

-    uLong offset_curfile;/* relative offset of local header 4 bytes */

-} unz_file_info_internal;

-

-

-/* file_in_zip_read_info_s contain internal information about a file in zipfile,

-    when reading and decompress it */

-typedef struct

-{

-    char  *read_buffer;         /* internal buffer for compressed data */

-    z_stream stream;            /* zLib stream structure for inflate */

-

-    uLong pos_in_zipfile;       /* position in byte on the zipfile, for fseek*/

-    uLong stream_initialised;   /* flag set if stream structure is initialised*/

-

-    uLong offset_local_extrafield;/* offset of the local extra field */

-    uInt  size_local_extrafield;/* size of the local extra field */

-    uLong pos_local_extrafield;   /* position in the local extra field in read*/

-

-    uLong crc32;                /* crc32 of all data uncompressed */

-    uLong crc32_wait;           /* crc32 we must obtain after decompress all */

-    uLong rest_read_compressed; /* number of byte to be decompressed */

-    uLong rest_read_uncompressed;/*number of byte to be obtained after decomp*/

-    zlib_filefunc_def z_filefunc;

-    voidpf filestream;        /* io structore of the zipfile */

-    uLong compression_method;   /* compression method (0==store) */

-    uLong byte_before_the_zipfile;/* byte before the zipfile, (>0 for sfx)*/

-    int   raw;

-} file_in_zip_read_info_s;

-

-

-/* unz_s contain internal information about the zipfile

-*/

-typedef struct

-{

-    zlib_filefunc_def z_filefunc;

-    voidpf filestream;        /* io structore of the zipfile */

-    unz_global_info gi;       /* public global information */

-    uLong byte_before_the_zipfile;/* byte before the zipfile, (>0 for sfx)*/

-    uLong num_file;             /* number of the current file in the zipfile*/

-    uLong pos_in_central_dir;   /* pos of the current file in the central dir*/

-    uLong current_file_ok;      /* flag about the usability of the current file*/

-    uLong central_pos;          /* position of the beginning of the central dir*/

-

-    uLong size_central_dir;     /* size of the central directory  */

-    uLong offset_central_dir;   /* offset of start of central directory with

-                                   respect to the starting disk number */

-

-    unz_file_info cur_file_info; /* public info about the current file in zip*/

-    unz_file_info_internal cur_file_info_internal; /* private info about it*/

-    file_in_zip_read_info_s* pfile_in_zip_read; /* structure about the current

-                                        file if we are decompressing it */

-    int encrypted;

-#    ifndef NOUNCRYPT

-    unsigned long keys[3];     /* keys defining the pseudo-random sequence */

-    const unsigned long* pcrc_32_tab;

-#    endif

-} unz_s;

-

-

-#ifndef NOUNCRYPT

-#include "crypt.h"

-#endif

-

-/* ===========================================================================

-     Read a byte from a gz_stream; update next_in and avail_in. Return EOF

-   for end of file.

-   IN assertion: the stream s has been sucessfully opened for reading.

-*/

-

-

-local int unzlocal_getByte OF((

-    const zlib_filefunc_def* pzlib_filefunc_def,

-    voidpf filestream,

-    int *pi));

-

-local int unzlocal_getByte(

-    const zlib_filefunc_def* pzlib_filefunc_def,

-    voidpf filestream,

-    int *pi)

-{

-    unsigned char c;

-    int err = (int)ZREAD(*pzlib_filefunc_def,filestream,&c,1);

-    if (err==1)

-    {

-        *pi = (int)c;

-        return UNZ_OK;

-    }

-    else

-    {

-        if (ZERROR(*pzlib_filefunc_def,filestream))

-            return UNZ_ERRNO;

-        else

-            return UNZ_EOF;

-    }

-}

-

-

-/* ===========================================================================

-   Reads a long in LSB order from the given gz_stream. Sets

-*/

-local int unzlocal_getShort OF((

-    const zlib_filefunc_def* pzlib_filefunc_def,

-    voidpf filestream,

-    uLong *pX));

-

-local int unzlocal_getShort (

-    const zlib_filefunc_def* pzlib_filefunc_def,

-    voidpf filestream,

-    uLong *pX)

-{

-    uLong x ;

-    int i;

-    int err;

-

-    err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);

-    x = (uLong)i;

-

-    if (err==UNZ_OK)

-        err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);

-    x += ((uLong)i)<<8;

-

-    if (err==UNZ_OK)

-        *pX = x;

-    else

-        *pX = 0;

-    return err;

-}

-

-local int unzlocal_getLong OF((

-    const zlib_filefunc_def* pzlib_filefunc_def,

-    voidpf filestream,

-    uLong *pX));

-

-local int unzlocal_getLong (

-    const zlib_filefunc_def* pzlib_filefunc_def,

-    voidpf filestream,

-    uLong *pX)

-{

-    uLong x ;

-    int i;

-    int err;

-

-    err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);

-    x = (uLong)i;

-

-    if (err==UNZ_OK)

-        err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);

-    x += ((uLong)i)<<8;

-

-    if (err==UNZ_OK)

-        err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);

-    x += ((uLong)i)<<16;

-

-    if (err==UNZ_OK)

-        err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);

-    x += ((uLong)i)<<24;

-

-    if (err==UNZ_OK)

-        *pX = x;

-    else

-        *pX = 0;

-    return err;

-}

-

-

-/* My own strcmpi / strcasecmp */

-local int strcmpcasenosensitive_internal (

-    const char* fileName1,

-    const char* fileName2)

-{

-    for (;;)

-    {

-        char c1=*(fileName1++);

-        char c2=*(fileName2++);

-        if ((c1>='a') && (c1<='z'))

-            c1 -= 0x20;

-        if ((c2>='a') && (c2<='z'))

-            c2 -= 0x20;

-        if (c1=='\0')

-            return ((c2=='\0') ? 0 : -1);

-        if (c2=='\0')

-            return 1;

-        if (c1<c2)

-            return -1;

-        if (c1>c2)

-            return 1;

-    }

-}

-

-

-#ifdef  CASESENSITIVITYDEFAULT_NO

-#define CASESENSITIVITYDEFAULTVALUE 2

-#else

-#define CASESENSITIVITYDEFAULTVALUE 1

-#endif

-

-#ifndef STRCMPCASENOSENTIVEFUNCTION

-#define STRCMPCASENOSENTIVEFUNCTION strcmpcasenosensitive_internal

-#endif

-

-/*

-   Compare two filename (fileName1,fileName2).

-   If iCaseSenisivity = 1, comparision is case sensitivity (like strcmp)

-   If iCaseSenisivity = 2, comparision is not case sensitivity (like strcmpi

-                                                                or strcasecmp)

-   If iCaseSenisivity = 0, case sensitivity is defaut of your operating system

-        (like 1 on Unix, 2 on Windows)

-

-*/

-extern int ZEXPORT unzStringFileNameCompare (

-    const char* fileName1,

-    const char* fileName2,

-    int iCaseSensitivity)

-{

-    if (iCaseSensitivity==0)

-        iCaseSensitivity=CASESENSITIVITYDEFAULTVALUE;

-

-    if (iCaseSensitivity==1)

-        return strcmp(fileName1,fileName2);

-

-    return STRCMPCASENOSENTIVEFUNCTION(fileName1,fileName2);

-}

-

-#ifndef BUFREADCOMMENT

-#define BUFREADCOMMENT (0x400)

-#endif

-

-/*

-  Locate the Central directory of a zipfile (at the end, just before

-    the global comment)

-*/

-local uLong unzlocal_SearchCentralDir OF((

-    const zlib_filefunc_def* pzlib_filefunc_def,

-    voidpf filestream));

-

-local uLong unzlocal_SearchCentralDir(

-    const zlib_filefunc_def* pzlib_filefunc_def,

-    voidpf filestream)

-{

-    unsigned char* buf;

-    uLong uSizeFile;

-    uLong uBackRead;

-    uLong uMaxBack=0xffff; /* maximum size of global comment */

-    uLong uPosFound=0;

-

-    if (ZSEEK(*pzlib_filefunc_def,filestream,0,ZLIB_FILEFUNC_SEEK_END) != 0)

-        return 0;

-

-

-    uSizeFile = ZTELL(*pzlib_filefunc_def,filestream);

-

-    if (uMaxBack>uSizeFile)

-        uMaxBack = uSizeFile;

-

-    buf = (unsigned char*)ALLOC(BUFREADCOMMENT+4);

-    if (buf==NULL)

-        return 0;

-

-    uBackRead = 4;

-    while (uBackRead<uMaxBack)

-    {

-        uLong uReadSize,uReadPos ;

-        int i;

-        if (uBackRead+BUFREADCOMMENT>uMaxBack)

-            uBackRead = uMaxBack;

-        else

-            uBackRead+=BUFREADCOMMENT;

-        uReadPos = uSizeFile-uBackRead ;

-

-        uReadSize = ((BUFREADCOMMENT+4) < (uSizeFile-uReadPos)) ?

-                     (BUFREADCOMMENT+4) : (uSizeFile-uReadPos);

-        if (ZSEEK(*pzlib_filefunc_def,filestream,uReadPos,ZLIB_FILEFUNC_SEEK_SET)!=0)

-            break;

-

-        if (ZREAD(*pzlib_filefunc_def,filestream,buf,uReadSize)!=uReadSize)

-            break;

-

-        for (i=(int)uReadSize-3; (i--)>0;)

-            if (((*(buf+i))==0x50) && ((*(buf+i+1))==0x4b) &&

-                ((*(buf+i+2))==0x05) && ((*(buf+i+3))==0x06))

-            {

-                uPosFound = uReadPos+i;

-                break;

-            }

-

-        if (uPosFound!=0)

-            break;

-    }

-    TRYFREE(buf);

-    return uPosFound;

-}

-

-/*

-  Open a Zip file. path contain the full pathname (by example,

-     on a Windows NT computer "c:\\test\\zlib114.zip" or on an Unix computer

-     "zlib/zlib114.zip".

-     If the zipfile cannot be opened (file doesn't exist or in not valid), the

-       return value is NULL.

-     Else, the return value is a unzFile Handle, usable with other function

-       of this unzip package.

-*/

-extern unzFile ZEXPORT unzOpen2 (

-    const char *path,

-    zlib_filefunc_def* pzlib_filefunc_def)

-{

-    unz_s us;

-    unz_s *s;

-    uLong central_pos,uL;

-

-    uLong number_disk;          /* number of the current dist, used for

-                                   spaning ZIP, unsupported, always 0*/

-    uLong number_disk_with_CD;  /* number the the disk with central dir, used

-                                   for spaning ZIP, unsupported, always 0*/

-    uLong number_entry_CD;      /* total number of entries in

-                                   the central dir

-                                   (same than number_entry on nospan) */

-

-    int err=UNZ_OK;

-

-    if (unz_copyright[0]!=' ')

-        return NULL;

-

-    if (pzlib_filefunc_def==NULL)

-        fill_fopen_filefunc(&us.z_filefunc);

-    else

-        us.z_filefunc = *pzlib_filefunc_def;

-

-    us.filestream= (*(us.z_filefunc.zopen_file))(us.z_filefunc.opaque,

-                                                 path,

-                                                 ZLIB_FILEFUNC_MODE_READ |

-                                                 ZLIB_FILEFUNC_MODE_EXISTING);

-    if (us.filestream==NULL)

-        return NULL;

-

-    central_pos = unzlocal_SearchCentralDir(&us.z_filefunc,us.filestream);

-    if (central_pos==0)

-        err=UNZ_ERRNO;

-

-    if (ZSEEK(us.z_filefunc, us.filestream,

-                                      central_pos,ZLIB_FILEFUNC_SEEK_SET)!=0)

-        err=UNZ_ERRNO;

-

-    /* the signature, already checked */

-    if (unzlocal_getLong(&us.z_filefunc, us.filestream,&uL)!=UNZ_OK)

-        err=UNZ_ERRNO;

-

-    /* number of this disk */

-    if (unzlocal_getShort(&us.z_filefunc, us.filestream,&number_disk)!=UNZ_OK)

-        err=UNZ_ERRNO;

-

-    /* number of the disk with the start of the central directory */

-    if (unzlocal_getShort(&us.z_filefunc, us.filestream,&number_disk_with_CD)!=UNZ_OK)

-        err=UNZ_ERRNO;

-

-    /* total number of entries in the central dir on this disk */

-    if (unzlocal_getShort(&us.z_filefunc, us.filestream,&us.gi.number_entry)!=UNZ_OK)

-        err=UNZ_ERRNO;

-

-    /* total number of entries in the central dir */

-    if (unzlocal_getShort(&us.z_filefunc, us.filestream,&number_entry_CD)!=UNZ_OK)

-        err=UNZ_ERRNO;

-

-    if ((number_entry_CD!=us.gi.number_entry) ||

-        (number_disk_with_CD!=0) ||

-        (number_disk!=0))

-        err=UNZ_BADZIPFILE;

-

-    /* size of the central directory */

-    if (unzlocal_getLong(&us.z_filefunc, us.filestream,&us.size_central_dir)!=UNZ_OK)

-        err=UNZ_ERRNO;

-

-    /* offset of start of central directory with respect to the

-          starting disk number */

-    if (unzlocal_getLong(&us.z_filefunc, us.filestream,&us.offset_central_dir)!=UNZ_OK)

-        err=UNZ_ERRNO;

-

-    /* zipfile comment length */

-    if (unzlocal_getShort(&us.z_filefunc, us.filestream,&us.gi.size_comment)!=UNZ_OK)

-        err=UNZ_ERRNO;

-

-    if ((central_pos<us.offset_central_dir+us.size_central_dir) &&

-        (err==UNZ_OK))

-        err=UNZ_BADZIPFILE;

-

-    if (err!=UNZ_OK)

-    {

-        ZCLOSE(us.z_filefunc, us.filestream);

-        return NULL;

-    }

-

-    us.byte_before_the_zipfile = central_pos -

-                            (us.offset_central_dir+us.size_central_dir);

-    us.central_pos = central_pos;

-    us.pfile_in_zip_read = NULL;

-    us.encrypted = 0;

-

-

-    s=(unz_s*)ALLOC(sizeof(unz_s));

-    *s=us;

-    unzGoToFirstFile((unzFile)s);

-    return (unzFile)s;

-}

-

-

-extern unzFile ZEXPORT unzOpen (

-    const char *path)

-{

-    return unzOpen2(path, NULL);

-}

-

-/*

-  Close a ZipFile opened with unzipOpen.

-  If there is files inside the .Zip opened with unzipOpenCurrentFile (see later),

-    these files MUST be closed with unzipCloseCurrentFile before call unzipClose.

-  return UNZ_OK if there is no problem. */

-extern int ZEXPORT unzClose (

-    unzFile file)

-{

-    unz_s* s;

-    if (file==NULL)

-        return UNZ_PARAMERROR;

-    s=(unz_s*)file;

-

-    if (s->pfile_in_zip_read!=NULL)

-        unzCloseCurrentFile(file);

-

-    ZCLOSE(s->z_filefunc, s->filestream);

-    TRYFREE(s);

-    return UNZ_OK;

-}

-

-

-/*

-  Write info about the ZipFile in the *pglobal_info structure.

-  No preparation of the structure is needed

-  return UNZ_OK if there is no problem. */

-extern int ZEXPORT unzGetGlobalInfo (

-    unzFile file,

-    unz_global_info *pglobal_info)

-{

-    unz_s* s;

-    if (file==NULL)

-        return UNZ_PARAMERROR;

-    s=(unz_s*)file;

-    *pglobal_info=s->gi;

-    return UNZ_OK;

-}

-

-

-/*

-   Translate date/time from Dos format to tm_unz (readable more easilty)

-*/

-local void unzlocal_DosDateToTmuDate (

-    uLong ulDosDate,

-    tm_unz* ptm)

-{

-    uLong uDate;

-    uDate = (uLong)(ulDosDate>>16);

-    ptm->tm_mday = (uInt)(uDate&0x1f) ;

-    ptm->tm_mon =  (uInt)((((uDate)&0x1E0)/0x20)-1) ;

-    ptm->tm_year = (uInt)(((uDate&0x0FE00)/0x0200)+1980) ;

-

-    ptm->tm_hour = (uInt) ((ulDosDate &0xF800)/0x800);

-    ptm->tm_min =  (uInt) ((ulDosDate&0x7E0)/0x20) ;

-    ptm->tm_sec =  (uInt) (2*(ulDosDate&0x1f)) ;

-}

-

-/*

-  Get Info about the current file in the zipfile, with internal only info

-*/

-local int unzlocal_GetCurrentFileInfoInternal OF((unzFile file,

-                                                  unz_file_info *pfile_info,

-                                                  unz_file_info_internal

-                                                  *pfile_info_internal,

-                                                  char *szFileName,

-                                                  uLong fileNameBufferSize,

-                                                  void *extraField,

-                                                  uLong extraFieldBufferSize,

-                                                  char *szComment,

-                                                  uLong commentBufferSize));

-

-local int unzlocal_GetCurrentFileInfoInternal (

-    unzFile file,

-    unz_file_info *pfile_info,

-    unz_file_info_internal *pfile_info_internal,

-    char *szFileName,

-    uLong fileNameBufferSize,

-    void *extraField,

-    uLong extraFieldBufferSize,

-    char *szComment,

-    uLong commentBufferSize)

-{

-    unz_s* s;

-    unz_file_info file_info;

-    unz_file_info_internal file_info_internal;

-    int err=UNZ_OK;

-    uLong uMagic;

-    long lSeek=0;

-

-    if (file==NULL)

-        return UNZ_PARAMERROR;

-    s=(unz_s*)file;

-    if (ZSEEK(s->z_filefunc, s->filestream,

-              s->pos_in_central_dir+s->byte_before_the_zipfile,

-              ZLIB_FILEFUNC_SEEK_SET)!=0)

-        err=UNZ_ERRNO;

-

-

-    /* we check the magic */

-    if (err==UNZ_OK)

-        if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uMagic) != UNZ_OK)

-            err=UNZ_ERRNO;

-        else if (uMagic!=0x02014b50)

-            err=UNZ_BADZIPFILE;

-

-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.version) != UNZ_OK)

-        err=UNZ_ERRNO;

-

-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.version_needed) != UNZ_OK)

-        err=UNZ_ERRNO;

-

-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.flag) != UNZ_OK)

-        err=UNZ_ERRNO;

-

-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.compression_method) != UNZ_OK)

-        err=UNZ_ERRNO;

-

-    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.dosDate) != UNZ_OK)

-        err=UNZ_ERRNO;

-

-    unzlocal_DosDateToTmuDate(file_info.dosDate,&file_info.tmu_date);

-

-    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.crc) != UNZ_OK)

-        err=UNZ_ERRNO;

-

-    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.compressed_size) != UNZ_OK)

-        err=UNZ_ERRNO;

-

-    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.uncompressed_size) != UNZ_OK)

-        err=UNZ_ERRNO;

-

-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.size_filename) != UNZ_OK)

-        err=UNZ_ERRNO;

-

-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.size_file_extra) != UNZ_OK)

-        err=UNZ_ERRNO;

-

-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.size_file_comment) != UNZ_OK)

-        err=UNZ_ERRNO;

-

-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.disk_num_start) != UNZ_OK)

-        err=UNZ_ERRNO;

-

-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.internal_fa) != UNZ_OK)

-        err=UNZ_ERRNO;

-

-    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.external_fa) != UNZ_OK)

-        err=UNZ_ERRNO;

-

-    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info_internal.offset_curfile) != UNZ_OK)

-        err=UNZ_ERRNO;

-

-    lSeek+=file_info.size_filename;

-    if ((err==UNZ_OK) && (szFileName!=NULL))

-    {

-        uLong uSizeRead ;

-        if (file_info.size_filename<fileNameBufferSize)

-        {

-            *(szFileName+file_info.size_filename)='\0';

-            uSizeRead = file_info.size_filename;

-        }

-        else

-            uSizeRead = fileNameBufferSize;

-

-        if ((file_info.size_filename>0) && (fileNameBufferSize>0))

-            if (ZREAD(s->z_filefunc, s->filestream,szFileName,uSizeRead)!=uSizeRead)

-                err=UNZ_ERRNO;

-        lSeek -= uSizeRead;

-    }

-

-

-    if ((err==UNZ_OK) && (extraField!=NULL))

-    {

-        uLong uSizeRead ;

-        if (file_info.size_file_extra<extraFieldBufferSize)

-            uSizeRead = file_info.size_file_extra;

-        else

-            uSizeRead = extraFieldBufferSize;

-

-        if (lSeek!=0)

-            if (ZSEEK(s->z_filefunc, s->filestream,lSeek,ZLIB_FILEFUNC_SEEK_CUR)==0)

-                lSeek=0;

-            else

-                err=UNZ_ERRNO;

-        if ((file_info.size_file_extra>0) && (extraFieldBufferSize>0))

-            if (ZREAD(s->z_filefunc, s->filestream,extraField,uSizeRead)!=uSizeRead)

-                err=UNZ_ERRNO;

-        lSeek += file_info.size_file_extra - uSizeRead;

-    }

-    else

-        lSeek+=file_info.size_file_extra;

-

-

-    if ((err==UNZ_OK) && (szComment!=NULL))

-    {

-        uLong uSizeRead ;

-        if (file_info.size_file_comment<commentBufferSize)

-        {

-            *(szComment+file_info.size_file_comment)='\0';

-            uSizeRead = file_info.size_file_comment;

-        }

-        else

-            uSizeRead = commentBufferSize;

-

-        if (lSeek!=0)

-            if (ZSEEK(s->z_filefunc, s->filestream,lSeek,ZLIB_FILEFUNC_SEEK_CUR)==0)

-                lSeek=0;

-            else

-                err=UNZ_ERRNO;

-        if ((file_info.size_file_comment>0) && (commentBufferSize>0))

-            if (ZREAD(s->z_filefunc, s->filestream,szComment,uSizeRead)!=uSizeRead)

-                err=UNZ_ERRNO;

-        lSeek+=file_info.size_file_comment - uSizeRead;

-    }

-    else

-        lSeek+=file_info.size_file_comment;

-

-    if ((err==UNZ_OK) && (pfile_info!=NULL))

-        *pfile_info=file_info;

-

-    if ((err==UNZ_OK) && (pfile_info_internal!=NULL))

-        *pfile_info_internal=file_info_internal;

-

-    return err;

-}

-

-

-

-/*

-  Write info about the ZipFile in the *pglobal_info structure.

-  No preparation of the structure is needed

-  return UNZ_OK if there is no problem.

-*/

-extern int ZEXPORT unzGetCurrentFileInfo (

-    unzFile file,

-    unz_file_info *pfile_info,

-    char *szFileName,

-    uLong fileNameBufferSize,

-    void *extraField,

-    uLong extraFieldBufferSize,

-    char *szComment,

-    uLong commentBufferSize)

-{

-    return unzlocal_GetCurrentFileInfoInternal(file,pfile_info,NULL,

-                                                szFileName,fileNameBufferSize,

-                                                extraField,extraFieldBufferSize,

-                                                szComment,commentBufferSize);

-}

-

-/*

-  Set the current file of the zipfile to the first file.

-  return UNZ_OK if there is no problem

-*/

-extern int ZEXPORT unzGoToFirstFile (

-    unzFile file)

-{

-    int err=UNZ_OK;

-    unz_s* s;

-    if (file==NULL)

-        return UNZ_PARAMERROR;

-    s=(unz_s*)file;

-    s->pos_in_central_dir=s->offset_central_dir;

-    s->num_file=0;

-    err=unzlocal_GetCurrentFileInfoInternal(file,&s->cur_file_info,

-                                             &s->cur_file_info_internal,

-                                             NULL,0,NULL,0,NULL,0);

-    s->current_file_ok = (err == UNZ_OK);

-    return err;

-}

-

-/*

-  Set the current file of the zipfile to the next file.

-  return UNZ_OK if there is no problem

-  return UNZ_END_OF_LIST_OF_FILE if the actual file was the latest.

-*/

-extern int ZEXPORT unzGoToNextFile (unzFile file)

-{

-    unz_s* s;

-    int err;

-

-    if (file==NULL)

-        return UNZ_PARAMERROR;

-    s=(unz_s*)file;

-    if (!s->current_file_ok)

-        return UNZ_END_OF_LIST_OF_FILE;

-    if (s->gi.number_entry != 0xffff)    /* 2^16 files overflow hack */

-      if (s->num_file+1==s->gi.number_entry)

-        return UNZ_END_OF_LIST_OF_FILE;

-

-    s->pos_in_central_dir += SIZECENTRALDIRITEM + s->cur_file_info.size_filename +

-            s->cur_file_info.size_file_extra + s->cur_file_info.size_file_comment ;

-    s->num_file++;

-    err = unzlocal_GetCurrentFileInfoInternal(file,&s->cur_file_info,

-                                               &s->cur_file_info_internal,

-                                               NULL,0,NULL,0,NULL,0);

-    s->current_file_ok = (err == UNZ_OK);

-    return err;

-}

-

-

-/*

-  Try locate the file szFileName in the zipfile.

-  For the iCaseSensitivity signification, see unzipStringFileNameCompare

-

-  return value :

-  UNZ_OK if the file is found. It becomes the current file.

-  UNZ_END_OF_LIST_OF_FILE if the file is not found

-*/

-extern int ZEXPORT unzLocateFile (

-    unzFile file,

-    const char *szFileName,

-    int iCaseSensitivity)

-{

-    unz_s* s;

-    int err;

-

-    /* We remember the 'current' position in the file so that we can jump

-     * back there if we fail.

-     */

-    unz_file_info cur_file_infoSaved;

-    unz_file_info_internal cur_file_info_internalSaved;

-    uLong num_fileSaved;

-    uLong pos_in_central_dirSaved;

-

-

-    if (file==NULL)

-        return UNZ_PARAMERROR;

-

-    if (strlen(szFileName)>=UNZ_MAXFILENAMEINZIP)

-        return UNZ_PARAMERROR;

-

-    s=(unz_s*)file;

-    if (!s->current_file_ok)

-        return UNZ_END_OF_LIST_OF_FILE;

-

-    /* Save the current state */

-    num_fileSaved = s->num_file;

-    pos_in_central_dirSaved = s->pos_in_central_dir;

-    cur_file_infoSaved = s->cur_file_info;

-    cur_file_info_internalSaved = s->cur_file_info_internal;

-

-    err = unzGoToFirstFile(file);

-

-    while (err == UNZ_OK)

-    {

-        char szCurrentFileName[UNZ_MAXFILENAMEINZIP+1];

-        err = unzGetCurrentFileInfo(file,NULL,

-                                    szCurrentFileName,sizeof(szCurrentFileName)-1,

-                                    NULL,0,NULL,0);

-        if (err == UNZ_OK)

-        {

-            if (unzStringFileNameCompare(szCurrentFileName,

-                                            szFileName,iCaseSensitivity)==0)

-                return UNZ_OK;

-            err = unzGoToNextFile(file);

-        }

-    }

-

-    /* We failed, so restore the state of the 'current file' to where we

-     * were.

-     */

-    s->num_file = num_fileSaved ;

-    s->pos_in_central_dir = pos_in_central_dirSaved ;

-    s->cur_file_info = cur_file_infoSaved;

-    s->cur_file_info_internal = cur_file_info_internalSaved;

-    return err;

-}

-

-

-/*

-///////////////////////////////////////////

-// Contributed by Ryan Haksi (mailto://cryogen@infoserve.net)

-// I need random access

-//

-// Further optimization could be realized by adding an ability

-// to cache the directory in memory. The goal being a single

-// comprehensive file read to put the file I need in a memory.

-*/

-

-/*

-typedef struct unz_file_pos_s

-{

-    uLong pos_in_zip_directory;   // offset in file

-    uLong num_of_file;            // # of file

-} unz_file_pos;

-*/

-

-extern int ZEXPORT unzGetFilePos(unzFile file,

-    unz_file_pos* file_pos)

-{

-    unz_s* s;

-

-    if (file==NULL || file_pos==NULL)

-        return UNZ_PARAMERROR;

-    s=(unz_s*)file;

-    if (!s->current_file_ok)

-        return UNZ_END_OF_LIST_OF_FILE;

-

-    file_pos->pos_in_zip_directory  = s->pos_in_central_dir;

-    file_pos->num_of_file           = s->num_file;

-

-    return UNZ_OK;

-}

-

-extern int ZEXPORT unzGoToFilePos(

-    unzFile file,

-    unz_file_pos* file_pos)

-{

-    unz_s* s;

-    int err;

-

-    if (file==NULL || file_pos==NULL)

-        return UNZ_PARAMERROR;

-    s=(unz_s*)file;

-

-    /* jump to the right spot */

-    s->pos_in_central_dir = file_pos->pos_in_zip_directory;

-    s->num_file           = file_pos->num_of_file;

-

-    /* set the current file */

-    err = unzlocal_GetCurrentFileInfoInternal(file,&s->cur_file_info,

-                                               &s->cur_file_info_internal,

-                                               NULL,0,NULL,0,NULL,0);

-    /* return results */

-    s->current_file_ok = (err == UNZ_OK);

-    return err;

-}

-

-/*

-// Unzip Helper Functions - should be here?

-///////////////////////////////////////////

-*/

-

-/*

-  Read the local header of the current zipfile

-  Check the coherency of the local header and info in the end of central

-        directory about this file

-  store in *piSizeVar the size of extra info in local header

-        (filename and size of extra field data)

-*/

-local int unzlocal_CheckCurrentFileCoherencyHeader (

-    unz_s* s,

-    uInt* piSizeVar,

-    uLong *poffset_local_extrafield,

-    uInt  *psize_local_extrafield)

-{

-    uLong uMagic,uData,uFlags;

-    uLong size_filename;

-    uLong size_extra_field;

-    int err=UNZ_OK;

-

-    *piSizeVar = 0;

-    *poffset_local_extrafield = 0;

-    *psize_local_extrafield = 0;

-

-    if (ZSEEK(s->z_filefunc, s->filestream,s->cur_file_info_internal.offset_curfile +

-                                s->byte_before_the_zipfile,ZLIB_FILEFUNC_SEEK_SET)!=0)

-        return UNZ_ERRNO;

-

-

-    if (err==UNZ_OK)

-        if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uMagic) != UNZ_OK)

-            err=UNZ_ERRNO;

-        else if (uMagic!=0x04034b50)

-            err=UNZ_BADZIPFILE;

-

-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&uData) != UNZ_OK)

-        err=UNZ_ERRNO;

-/*

-    else if ((err==UNZ_OK) && (uData!=s->cur_file_info.wVersion))

-        err=UNZ_BADZIPFILE;

-*/

-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&uFlags) != UNZ_OK)

-        err=UNZ_ERRNO;

-

-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&uData) != UNZ_OK)

-        err=UNZ_ERRNO;

-    else if ((err==UNZ_OK) && (uData!=s->cur_file_info.compression_method))

-        err=UNZ_BADZIPFILE;

-

-    if ((err==UNZ_OK) && (s->cur_file_info.compression_method!=0) &&

-                         (s->cur_file_info.compression_method!=Z_DEFLATED))

-        err=UNZ_BADZIPFILE;

-

-    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* date/time */

-        err=UNZ_ERRNO;

-

-    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* crc */

-        err=UNZ_ERRNO;

-    else if ((err==UNZ_OK) && (uData!=s->cur_file_info.crc) &&

-                              ((uFlags & 8)==0))

-        err=UNZ_BADZIPFILE;

-

-    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* size compr */

-        err=UNZ_ERRNO;

-    else if ((err==UNZ_OK) && (uData!=s->cur_file_info.compressed_size) &&

-                              ((uFlags & 8)==0))

-        err=UNZ_BADZIPFILE;

-

-    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* size uncompr */

-        err=UNZ_ERRNO;

-    else if ((err==UNZ_OK) && (uData!=s->cur_file_info.uncompressed_size) &&

-                              ((uFlags & 8)==0))

-        err=UNZ_BADZIPFILE;

-

-

-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&size_filename) != UNZ_OK)

-        err=UNZ_ERRNO;

-    else if ((err==UNZ_OK) && (size_filename!=s->cur_file_info.size_filename))

-        err=UNZ_BADZIPFILE;

-

-    *piSizeVar += (uInt)size_filename;

-

-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&size_extra_field) != UNZ_OK)

-        err=UNZ_ERRNO;

-    *poffset_local_extrafield= s->cur_file_info_internal.offset_curfile +

-                                    SIZEZIPLOCALHEADER + size_filename;

-    *psize_local_extrafield = (uInt)size_extra_field;

-

-    *piSizeVar += (uInt)size_extra_field;

-

-    return err;

-}

-

-/*

-  Open for reading data the current file in the zipfile.

-  If there is no error and the file is opened, the return value is UNZ_OK.

-*/

-extern int ZEXPORT unzOpenCurrentFile3 (

-    unzFile file,

-    int* method,

-    int* level,

-    int raw,

-    const char* password)

-{

-    int err=UNZ_OK;

-    uInt iSizeVar;

-    unz_s* s;

-    file_in_zip_read_info_s* pfile_in_zip_read_info;

-    uLong offset_local_extrafield;  /* offset of the local extra field */

-    uInt  size_local_extrafield;    /* size of the local extra field */

-#    ifndef NOUNCRYPT

-    char source[12];

-#    else

-    if (password != NULL)

-        return UNZ_PARAMERROR;

-#    endif

-

-    if (file==NULL)

-        return UNZ_PARAMERROR;

-    s=(unz_s*)file;

-    if (!s->current_file_ok)

-        return UNZ_PARAMERROR;

-

-    if (s->pfile_in_zip_read != NULL)

-        unzCloseCurrentFile(file);

-

-    if (unzlocal_CheckCurrentFileCoherencyHeader(s,&iSizeVar,

-                &offset_local_extrafield,&size_local_extrafield)!=UNZ_OK)

-        return UNZ_BADZIPFILE;

-

-    pfile_in_zip_read_info = (file_in_zip_read_info_s*)

-                                        ALLOC(sizeof(file_in_zip_read_info_s));

-    if (pfile_in_zip_read_info==NULL)

-        return UNZ_INTERNALERROR;

-

-    pfile_in_zip_read_info->read_buffer=(char*)ALLOC(UNZ_BUFSIZE);

-    pfile_in_zip_read_info->offset_local_extrafield = offset_local_extrafield;

-    pfile_in_zip_read_info->size_local_extrafield = size_local_extrafield;

-    pfile_in_zip_read_info->pos_local_extrafield=0;

-    pfile_in_zip_read_info->raw=raw;

-

-    if (pfile_in_zip_read_info->read_buffer==NULL)

-    {

-        TRYFREE(pfile_in_zip_read_info);

-        return UNZ_INTERNALERROR;

-    }

-

-    pfile_in_zip_read_info->stream_initialised=0;

-

-    if (method!=NULL)

-        *method = (int)s->cur_file_info.compression_method;

-

-    if (level!=NULL)

-    {

-        *level = 6;

-        switch (s->cur_file_info.flag & 0x06)

-        {

-          case 6 : *level = 1; break;

-          case 4 : *level = 2; break;

-          case 2 : *level = 9; break;

-        }

-    }

-

-    if ((s->cur_file_info.compression_method!=0) &&

-        (s->cur_file_info.compression_method!=Z_DEFLATED))

-        err=UNZ_BADZIPFILE;

-

-    pfile_in_zip_read_info->crc32_wait=s->cur_file_info.crc;

-    pfile_in_zip_read_info->crc32=0;

-    pfile_in_zip_read_info->compression_method =

-            s->cur_file_info.compression_method;

-    pfile_in_zip_read_info->filestream=s->filestream;

-    pfile_in_zip_read_info->z_filefunc=s->z_filefunc;

-    pfile_in_zip_read_info->byte_before_the_zipfile=s->byte_before_the_zipfile;

-

-    pfile_in_zip_read_info->stream.total_out = 0;

-

-    if ((s->cur_file_info.compression_method==Z_DEFLATED) &&

-        (!raw))

-    {

-      pfile_in_zip_read_info->stream.zalloc = (alloc_func)0;

-      pfile_in_zip_read_info->stream.zfree = (free_func)0;

-      pfile_in_zip_read_info->stream.opaque = (voidpf)0;

-      pfile_in_zip_read_info->stream.next_in = (Bytef*)0;

-      pfile_in_zip_read_info->stream.avail_in = 0;

-

-      err=inflateInit2(&pfile_in_zip_read_info->stream, -MAX_WBITS);

-      if (err == Z_OK)

-        pfile_in_zip_read_info->stream_initialised=1;

-      else

-      {

-        TRYFREE(pfile_in_zip_read_info);

-        return err;

-      }

-        /* windowBits is passed < 0 to tell that there is no zlib header.

-         * Note that in this case inflate *requires* an extra "dummy" byte

-         * after the compressed stream in order to complete decompression and

-         * return Z_STREAM_END.

-         * In unzip, i don't wait absolutely Z_STREAM_END because I known the

-         * size of both compressed and uncompressed data

-         */

-    }

-    pfile_in_zip_read_info->rest_read_compressed =

-            s->cur_file_info.compressed_size ;

-    pfile_in_zip_read_info->rest_read_uncompressed =

-            s->cur_file_info.uncompressed_size ;

-

-

-    pfile_in_zip_read_info->pos_in_zipfile =

-            s->cur_file_info_internal.offset_curfile + SIZEZIPLOCALHEADER +

-              iSizeVar;

-

-    pfile_in_zip_read_info->stream.avail_in = (uInt)0;

-

-    s->pfile_in_zip_read = pfile_in_zip_read_info;

-

-#    ifndef NOUNCRYPT

-    if (password != NULL)

-    {

-        int i;

-        s->pcrc_32_tab = get_crc_table();

-        init_keys(password,s->keys,s->pcrc_32_tab);

-        if (ZSEEK(s->z_filefunc, s->filestream,

-                  s->pfile_in_zip_read->pos_in_zipfile +

-                     s->pfile_in_zip_read->byte_before_the_zipfile,

-                  SEEK_SET)!=0)

-            return UNZ_INTERNALERROR;

-        if(ZREAD(s->z_filefunc, s->filestream,source, 12)<12)

-            return UNZ_INTERNALERROR;

-

-        for (i = 0; i<12; i++)

-            zdecode(s->keys,s->pcrc_32_tab,source[i]);

-

-        s->pfile_in_zip_read->pos_in_zipfile+=12;

-        s->encrypted=1;

-    }

-#    endif

-

-

-    return UNZ_OK;

-}

-

-extern int ZEXPORT unzOpenCurrentFile (

-    unzFile file)

-{

-    return unzOpenCurrentFile3(file, NULL, NULL, 0, NULL);

-}

-

-extern int ZEXPORT unzOpenCurrentFilePassword (

-    unzFile file,

-    const char* password)

-{

-    return unzOpenCurrentFile3(file, NULL, NULL, 0, password);

-}

-

-extern int ZEXPORT unzOpenCurrentFile2 (

-    unzFile file,

-    int* method,

-    int* level,

-    int raw)

-{

-    return unzOpenCurrentFile3(file, method, level, raw, NULL);

-}

-

-/*

-  Read bytes from the current file.

-  buf contain buffer where data must be copied

-  len the size of buf.

-

-  return the number of byte copied if somes bytes are copied

-  return 0 if the end of file was reached

-  return <0 with error code if there is an error

-    (UNZ_ERRNO for IO error, or zLib error for uncompress error)

-*/

-extern int ZEXPORT unzReadCurrentFile  (

-    unzFile file,

-    voidp buf,

-    unsigned len)

-{

-    int err=UNZ_OK;

-    uInt iRead = 0;

-    unz_s* s;

-    file_in_zip_read_info_s* pfile_in_zip_read_info;

-    if (file==NULL)

-        return UNZ_PARAMERROR;

-    s=(unz_s*)file;

-    pfile_in_zip_read_info=s->pfile_in_zip_read;

-

-    if (pfile_in_zip_read_info==NULL)

-        return UNZ_PARAMERROR;

-

-

-    if ((pfile_in_zip_read_info->read_buffer == NULL))

-        return UNZ_END_OF_LIST_OF_FILE;

-    if (len==0)

-        return 0;

-

-    pfile_in_zip_read_info->stream.next_out = (Bytef*)buf;

-

-    pfile_in_zip_read_info->stream.avail_out = (uInt)len;

-

-    if ((len>pfile_in_zip_read_info->rest_read_uncompressed) &&

-        (!(pfile_in_zip_read_info->raw)))

-        pfile_in_zip_read_info->stream.avail_out =

-            (uInt)pfile_in_zip_read_info->rest_read_uncompressed;

-

-    if ((len>pfile_in_zip_read_info->rest_read_compressed+

-           pfile_in_zip_read_info->stream.avail_in) &&

-         (pfile_in_zip_read_info->raw))

-        pfile_in_zip_read_info->stream.avail_out =

-            (uInt)pfile_in_zip_read_info->rest_read_compressed+

-            pfile_in_zip_read_info->stream.avail_in;

-

-    while (pfile_in_zip_read_info->stream.avail_out>0)

-    {

-        if ((pfile_in_zip_read_info->stream.avail_in==0) &&

-            (pfile_in_zip_read_info->rest_read_compressed>0))

-        {

-            uInt uReadThis = UNZ_BUFSIZE;

-            if (pfile_in_zip_read_info->rest_read_compressed<uReadThis)

-                uReadThis = (uInt)pfile_in_zip_read_info->rest_read_compressed;

-            if (uReadThis == 0)

-                return UNZ_EOF;

-            if (ZSEEK(pfile_in_zip_read_info->z_filefunc,

-                      pfile_in_zip_read_info->filestream,

-                      pfile_in_zip_read_info->pos_in_zipfile +

-                         pfile_in_zip_read_info->byte_before_the_zipfile,

-                         ZLIB_FILEFUNC_SEEK_SET)!=0)

-                return UNZ_ERRNO;

-            if (ZREAD(pfile_in_zip_read_info->z_filefunc,

-                      pfile_in_zip_read_info->filestream,

-                      pfile_in_zip_read_info->read_buffer,

-                      uReadThis)!=uReadThis)

-                return UNZ_ERRNO;

-

-

-#            ifndef NOUNCRYPT

-            if(s->encrypted)

-            {

-                uInt i;

-                for(i=0;i<uReadThis;i++)

-                  pfile_in_zip_read_info->read_buffer[i] =

-                      zdecode(s->keys,s->pcrc_32_tab,

-                              pfile_in_zip_read_info->read_buffer[i]);

-            }

-#            endif

-

-

-            pfile_in_zip_read_info->pos_in_zipfile += uReadThis;

-

-            pfile_in_zip_read_info->rest_read_compressed-=uReadThis;

-

-            pfile_in_zip_read_info->stream.next_in =

-                (Bytef*)pfile_in_zip_read_info->read_buffer;

-            pfile_in_zip_read_info->stream.avail_in = (uInt)uReadThis;

-        }

-

-        if ((pfile_in_zip_read_info->compression_method==0) || (pfile_in_zip_read_info->raw))

-        {

-            uInt uDoCopy,i ;

-

-            if ((pfile_in_zip_read_info->stream.avail_in == 0) &&

-                (pfile_in_zip_read_info->rest_read_compressed == 0))

-                return (iRead==0) ? UNZ_EOF : iRead;

-

-            if (pfile_in_zip_read_info->stream.avail_out <

-                            pfile_in_zip_read_info->stream.avail_in)

-                uDoCopy = pfile_in_zip_read_info->stream.avail_out ;

-            else

-                uDoCopy = pfile_in_zip_read_info->stream.avail_in ;

-

-            for (i=0;i<uDoCopy;i++)

-                *(pfile_in_zip_read_info->stream.next_out+i) =

-                        *(pfile_in_zip_read_info->stream.next_in+i);

-

-            pfile_in_zip_read_info->crc32 = crc32(pfile_in_zip_read_info->crc32,

-                                pfile_in_zip_read_info->stream.next_out,

-                                uDoCopy);

-            pfile_in_zip_read_info->rest_read_uncompressed-=uDoCopy;

-            pfile_in_zip_read_info->stream.avail_in -= uDoCopy;

-            pfile_in_zip_read_info->stream.avail_out -= uDoCopy;

-            pfile_in_zip_read_info->stream.next_out += uDoCopy;

-            pfile_in_zip_read_info->stream.next_in += uDoCopy;

-            pfile_in_zip_read_info->stream.total_out += uDoCopy;

-            iRead += uDoCopy;

-        }

-        else

-        {

-            uLong uTotalOutBefore,uTotalOutAfter;

-            const Bytef *bufBefore;

-            uLong uOutThis;

-            int flush=Z_SYNC_FLUSH;

-

-            uTotalOutBefore = pfile_in_zip_read_info->stream.total_out;

-            bufBefore = pfile_in_zip_read_info->stream.next_out;

-

-            /*

-            if ((pfile_in_zip_read_info->rest_read_uncompressed ==

-                     pfile_in_zip_read_info->stream.avail_out) &&

-                (pfile_in_zip_read_info->rest_read_compressed == 0))

-                flush = Z_FINISH;

-            */

-            err=inflate(&pfile_in_zip_read_info->stream,flush);

-

-            if ((err>=0) && (pfile_in_zip_read_info->stream.msg!=NULL))

-              err = Z_DATA_ERROR;

-

-            uTotalOutAfter = pfile_in_zip_read_info->stream.total_out;

-            uOutThis = uTotalOutAfter-uTotalOutBefore;

-

-            pfile_in_zip_read_info->crc32 =

-                crc32(pfile_in_zip_read_info->crc32,bufBefore,

-                        (uInt)(uOutThis));

-

-            pfile_in_zip_read_info->rest_read_uncompressed -=

-                uOutThis;

-

-            iRead += (uInt)(uTotalOutAfter - uTotalOutBefore);

-

-            if (err==Z_STREAM_END)

-                return (iRead==0) ? UNZ_EOF : iRead;

-            if (err!=Z_OK)

-                break;

-        }

-    }

-

-    if (err==Z_OK)

-        return iRead;

-    return err;

-}

-

-

-/*

-  Give the current position in uncompressed data

-*/

-extern z_off_t ZEXPORT unztell (

-    unzFile file)

-{

-    unz_s* s;

-    file_in_zip_read_info_s* pfile_in_zip_read_info;

-    if (file==NULL)

-        return UNZ_PARAMERROR;

-    s=(unz_s*)file;

-    pfile_in_zip_read_info=s->pfile_in_zip_read;

-

-    if (pfile_in_zip_read_info==NULL)

-        return UNZ_PARAMERROR;

-

-    return (z_off_t)pfile_in_zip_read_info->stream.total_out;

-}

-

-

-/*

-  return 1 if the end of file was reached, 0 elsewhere

-*/

-extern int ZEXPORT unzeof (

-    unzFile file)

-{

-    unz_s* s;

-    file_in_zip_read_info_s* pfile_in_zip_read_info;

-    if (file==NULL)

-        return UNZ_PARAMERROR;

-    s=(unz_s*)file;

-    pfile_in_zip_read_info=s->pfile_in_zip_read;

-

-    if (pfile_in_zip_read_info==NULL)

-        return UNZ_PARAMERROR;

-

-    if (pfile_in_zip_read_info->rest_read_uncompressed == 0)

-        return 1;

-    else

-        return 0;

-}

-

-

-

-/*

-  Read extra field from the current file (opened by unzOpenCurrentFile)

-  This is the local-header version of the extra field (sometimes, there is

-    more info in the local-header version than in the central-header)

-

-  if buf==NULL, it return the size of the local extra field that can be read

-

-  if buf!=NULL, len is the size of the buffer, the extra header is copied in

-    buf.

-  the return value is the number of bytes copied in buf, or (if <0)

-    the error code

-*/

-extern int ZEXPORT unzGetLocalExtrafield (

-    unzFile file,

-    voidp buf,

-    unsigned len)

-{

-    unz_s* s;

-    file_in_zip_read_info_s* pfile_in_zip_read_info;

-    uInt read_now;

-    uLong size_to_read;

-

-    if (file==NULL)

-        return UNZ_PARAMERROR;

-    s=(unz_s*)file;

-    pfile_in_zip_read_info=s->pfile_in_zip_read;

-

-    if (pfile_in_zip_read_info==NULL)

-        return UNZ_PARAMERROR;

-

-    size_to_read = (pfile_in_zip_read_info->size_local_extrafield -

-                pfile_in_zip_read_info->pos_local_extrafield);

-

-    if (buf==NULL)

-        return (int)size_to_read;

-

-    if (len>size_to_read)

-        read_now = (uInt)size_to_read;

-    else

-        read_now = (uInt)len ;

-

-    if (read_now==0)

-        return 0;

-

-    if (ZSEEK(pfile_in_zip_read_info->z_filefunc,

-              pfile_in_zip_read_info->filestream,

-              pfile_in_zip_read_info->offset_local_extrafield +

-              pfile_in_zip_read_info->pos_local_extrafield,

-              ZLIB_FILEFUNC_SEEK_SET)!=0)

-        return UNZ_ERRNO;

-

-    if (ZREAD(pfile_in_zip_read_info->z_filefunc,

-              pfile_in_zip_read_info->filestream,

-              buf,read_now)!=read_now)

-        return UNZ_ERRNO;

-

-    return (int)read_now;

-}

-

-/*

-  Close the file in zip opened with unzipOpenCurrentFile

-  Return UNZ_CRCERROR if all the file was read but the CRC is not good

-*/

-extern int ZEXPORT unzCloseCurrentFile (

-    unzFile file)

-{

-    int err=UNZ_OK;

-

-    unz_s* s;

-    file_in_zip_read_info_s* pfile_in_zip_read_info;

-    if (file==NULL)

-        return UNZ_PARAMERROR;

-    s=(unz_s*)file;

-    pfile_in_zip_read_info=s->pfile_in_zip_read;

-

-    if (pfile_in_zip_read_info==NULL)

-        return UNZ_PARAMERROR;

-

-

-    if ((pfile_in_zip_read_info->rest_read_uncompressed == 0) &&

-        (!pfile_in_zip_read_info->raw))

-    {

-        if (pfile_in_zip_read_info->crc32 != pfile_in_zip_read_info->crc32_wait)

-            err=UNZ_CRCERROR;

-    }

-

-

-    TRYFREE(pfile_in_zip_read_info->read_buffer);

-    pfile_in_zip_read_info->read_buffer = NULL;

-    if (pfile_in_zip_read_info->stream_initialised)

-        inflateEnd(&pfile_in_zip_read_info->stream);

-

-    pfile_in_zip_read_info->stream_initialised = 0;

-    TRYFREE(pfile_in_zip_read_info);

-

-    s->pfile_in_zip_read=NULL;

-

-    return err;

-}

-

-

-/*

-  Get the global comment string of the ZipFile, in the szComment buffer.

-  uSizeBuf is the size of the szComment buffer.

-  return the number of byte copied or an error code <0

-*/

-extern int ZEXPORT unzGetGlobalComment (

-    unzFile file,

-    char *szComment,

-    uLong uSizeBuf)

-{

-    int err=UNZ_OK;

-    unz_s* s;

-    uLong uReadThis ;

-    if (file==NULL)

-        return UNZ_PARAMERROR;

-    s=(unz_s*)file;

-

-    uReadThis = uSizeBuf;

-    if (uReadThis>s->gi.size_comment)

-        uReadThis = s->gi.size_comment;

-

-    if (ZSEEK(s->z_filefunc,s->filestream,s->central_pos+22,ZLIB_FILEFUNC_SEEK_SET)!=0)

-        return UNZ_ERRNO;

-

-    if (uReadThis>0)

-    {

-      *szComment='\0';

-      if (ZREAD(s->z_filefunc,s->filestream,szComment,uReadThis)!=uReadThis)

-        return UNZ_ERRNO;

-    }

-

-    if ((szComment != NULL) && (uSizeBuf > s->gi.size_comment))

-        *(szComment+s->gi.size_comment)='\0';

-    return (int)uReadThis;

-}

-

-/* Additions by RX '2004 */

-extern uLong ZEXPORT unzGetOffset (

-    unzFile file)

-{

-    unz_s* s;

-

-    if (file==NULL)

-          return UNZ_PARAMERROR;

-    s=(unz_s*)file;

-    if (!s->current_file_ok)

-      return 0;

-    if (s->gi.number_entry != 0 && s->gi.number_entry != 0xffff)

-      if (s->num_file==s->gi.number_entry)

-         return 0;

-    return s->pos_in_central_dir;

-}

-

-extern int ZEXPORT unzSetOffset (

-        unzFile file,

-        uLong pos)

-{

-    unz_s* s;

-    int err;

-

-    if (file==NULL)

-        return UNZ_PARAMERROR;

-    s=(unz_s*)file;

-

-    s->pos_in_central_dir = pos;

-    s->num_file = s->gi.number_entry;      /* hack */

-    err = unzlocal_GetCurrentFileInfoInternal(file,&s->cur_file_info,

-                                              &s->cur_file_info_internal,

-                                              NULL,0,NULL,0,NULL,0);

-    s->current_file_ok = (err == UNZ_OK);

-    return err;

-}

diff --git a/updater/zbin/minizip/mzip.c b/updater/zbin/minizip/mzip.c
deleted file mode 100644
index 400e2ba..0000000
--- a/updater/zbin/minizip/mzip.c
+++ /dev/null
@@ -1,1219 +0,0 @@
-/* zip.c -- IO on .zip files using zlib

-   Version 1.01e, February 12th, 2005

-

-   27 Dec 2004 Rolf Kalbermatter

-   Modification to zipOpen2 to support globalComment retrieval.

-

-   Copyright (C) 1998-2005 Gilles Vollant

-

-   Read zip.h for more info

-*/

-

-

-#include <stdio.h>

-#include <stdlib.h>

-#include <string.h>

-#include <time.h>

-#include "zlib.h"

-#include "zip.h"

-

-#ifdef STDC

-#  include <stddef.h>

-#  include <string.h>

-#  include <stdlib.h>

-#endif

-#ifdef NO_ERRNO_H

-    extern int errno;

-#else

-#   include <errno.h>

-#endif

-

-

-#ifndef local

-#  define local static

-#endif

-/* compile with -Dlocal if your debugger can't find static symbols */

-

-#ifndef VERSIONMADEBY

-# define VERSIONMADEBY   (0x0) /* platform depedent */

-#endif

-

-#ifndef Z_BUFSIZE

-#define Z_BUFSIZE (16384)

-#endif

-

-#ifndef Z_MAXFILENAMEINZIP

-#define Z_MAXFILENAMEINZIP (256)

-#endif

-

-#ifndef ALLOC

-# define ALLOC(size) (malloc(size))

-#endif

-#ifndef TRYFREE

-# define TRYFREE(p) {if (p) free(p);}

-#endif

-

-/*

-#define SIZECENTRALDIRITEM (0x2e)

-#define SIZEZIPLOCALHEADER (0x1e)

-*/

-

-/* I've found an old Unix (a SunOS 4.1.3_U1) without all SEEK_* defined.... */

-

-#ifndef SEEK_CUR

-#define SEEK_CUR    1

-#endif

-

-#ifndef SEEK_END

-#define SEEK_END    2

-#endif

-

-#ifndef SEEK_SET

-#define SEEK_SET    0

-#endif

-

-#ifndef DEF_MEM_LEVEL

-#if MAX_MEM_LEVEL >= 8

-#  define DEF_MEM_LEVEL 8

-#else

-#  define DEF_MEM_LEVEL  MAX_MEM_LEVEL

-#endif

-#endif

-const char zip_copyright[] =

-   " zip 1.01 Copyright 1998-2004 Gilles Vollant - http://www.winimage.com/zLibDll";

-

-

-#define SIZEDATA_INDATABLOCK (4096-(4*4))

-

-#define LOCALHEADERMAGIC    (0x04034b50)

-#define CENTRALHEADERMAGIC  (0x02014b50)

-#define ENDHEADERMAGIC      (0x06054b50)

-

-#define FLAG_LOCALHEADER_OFFSET (0x06)

-#define CRC_LOCALHEADER_OFFSET  (0x0e)

-

-#define SIZECENTRALHEADER (0x2e) /* 46 */

-

-typedef struct linkedlist_datablock_internal_s

-{

-  struct linkedlist_datablock_internal_s* next_datablock;

-  uLong  avail_in_this_block;

-  uLong  filled_in_this_block;

-  uLong  unused; /* for future use and alignement */

-  unsigned char data[SIZEDATA_INDATABLOCK];

-} linkedlist_datablock_internal;

-

-typedef struct linkedlist_data_s

-{

-    linkedlist_datablock_internal* first_block;

-    linkedlist_datablock_internal* last_block;

-} linkedlist_data;

-

-

-typedef struct

-{

-    z_stream stream;            /* zLib stream structure for inflate */

-    int  stream_initialised;    /* 1 is stream is initialised */

-    uInt pos_in_buffered_data;  /* last written byte in buffered_data */

-

-    uLong pos_local_header;     /* offset of the local header of the file

-                                     currenty writing */

-    char* central_header;       /* central header data for the current file */

-    uLong size_centralheader;   /* size of the central header for cur file */

-    uLong flag;                 /* flag of the file currently writing */

-

-    int  method;                /* compression method of file currenty wr.*/

-    int  raw;                   /* 1 for directly writing raw data */

-    Byte buffered_data[Z_BUFSIZE];/* buffer contain compressed data to be writ*/

-    uLong dosDate;

-    uLong crc32;

-    int  encrypt;

-#ifndef NOCRYPT

-    unsigned long keys[3];     /* keys defining the pseudo-random sequence */

-    const unsigned long* pcrc_32_tab;

-    int crypt_header_size;

-#endif

-} curfile_info;

-

-typedef struct

-{

-    zlib_filefunc_def z_filefunc;

-    voidpf filestream;        /* io structore of the zipfile */

-    linkedlist_data central_dir;/* datablock with central dir in construction*/

-    int  in_opened_file_inzip;  /* 1 if a file in the zip is currently writ.*/

-    curfile_info ci;            /* info on the file curretly writing */

-

-    uLong begin_pos;            /* position of the beginning of the zipfile */

-    uLong add_position_when_writting_offset;

-    uLong number_entry;

-#ifndef NO_ADDFILEINEXISTINGZIP

-    char *globalcomment;

-#endif

-} zip_internal;

-

-

-

-#ifndef NOCRYPT

-#define INCLUDECRYPTINGCODE_IFCRYPTALLOWED

-#include "crypt.h"

-#endif

-

-local linkedlist_datablock_internal* allocate_new_datablock()

-{

-    linkedlist_datablock_internal* ldi;

-    ldi = (linkedlist_datablock_internal*)

-                 ALLOC(sizeof(linkedlist_datablock_internal));

-    if (ldi!=NULL)

-    {

-        ldi->next_datablock = NULL ;

-        ldi->filled_in_this_block = 0 ;

-        ldi->avail_in_this_block = SIZEDATA_INDATABLOCK ;

-    }

-    return ldi;

-}

-

-local void free_datablock(ldi)

-    linkedlist_datablock_internal* ldi;

-{

-    while (ldi!=NULL)

-    {

-        linkedlist_datablock_internal* ldinext = ldi->next_datablock;

-        TRYFREE(ldi);

-        ldi = ldinext;

-    }

-}

-

-local void init_linkedlist(ll)

-    linkedlist_data* ll;

-{

-    ll->first_block = ll->last_block = NULL;

-}

-

-local void free_linkedlist(ll)

-    linkedlist_data* ll;

-{

-    free_datablock(ll->first_block);

-    ll->first_block = ll->last_block = NULL;

-}

-

-

-local int add_data_in_datablock(ll,buf,len)

-    linkedlist_data* ll;

-    const void* buf;

-    uLong len;

-{

-    linkedlist_datablock_internal* ldi;

-    const unsigned char* from_copy;

-

-    if (ll==NULL)

-        return ZIP_INTERNALERROR;

-

-    if (ll->last_block == NULL)

-    {

-        ll->first_block = ll->last_block = allocate_new_datablock();

-        if (ll->first_block == NULL)

-            return ZIP_INTERNALERROR;

-    }

-

-    ldi = ll->last_block;

-    from_copy = (unsigned char*)buf;

-

-    while (len>0)

-    {

-        uInt copy_this;

-        uInt i;

-        unsigned char* to_copy;

-

-        if (ldi->avail_in_this_block==0)

-        {

-            ldi->next_datablock = allocate_new_datablock();

-            if (ldi->next_datablock == NULL)

-                return ZIP_INTERNALERROR;

-            ldi = ldi->next_datablock ;

-            ll->last_block = ldi;

-        }

-

-        if (ldi->avail_in_this_block < len)

-            copy_this = (uInt)ldi->avail_in_this_block;

-        else

-            copy_this = (uInt)len;

-

-        to_copy = &(ldi->data[ldi->filled_in_this_block]);

-

-        for (i=0;i<copy_this;i++)

-            *(to_copy+i)=*(from_copy+i);

-

-        ldi->filled_in_this_block += copy_this;

-        ldi->avail_in_this_block -= copy_this;

-        from_copy += copy_this ;

-        len -= copy_this;

-    }

-    return ZIP_OK;

-}

-

-

-

-/****************************************************************************/

-

-#ifndef NO_ADDFILEINEXISTINGZIP

-/* ===========================================================================

-   Inputs a long in LSB order to the given file

-   nbByte == 1, 2 or 4 (byte, short or long)

-*/

-

-local int ziplocal_putValue OF((const zlib_filefunc_def* pzlib_filefunc_def,

-                                voidpf filestream, uLong x, int nbByte));

-local int ziplocal_putValue (pzlib_filefunc_def, filestream, x, nbByte)

-    const zlib_filefunc_def* pzlib_filefunc_def;

-    voidpf filestream;

-    uLong x;

-    int nbByte;

-{

-    unsigned char buf[4];

-    int n;

-    for (n = 0; n < nbByte; n++)

-    {

-        buf[n] = (unsigned char)(x & 0xff);

-        x >>= 8;

-    }

-    if (x != 0)

-      {     /* data overflow - hack for ZIP64 (X Roche) */

-      for (n = 0; n < nbByte; n++)

-        {

-          buf[n] = 0xff;

-        }

-      }

-

-    if (ZWRITE(*pzlib_filefunc_def,filestream,buf,nbByte)!=(uLong)nbByte)

-        return ZIP_ERRNO;

-    else

-        return ZIP_OK;

-}

-

-local void ziplocal_putValue_inmemory OF((void* dest, uLong x, int nbByte));

-local void ziplocal_putValue_inmemory (dest, x, nbByte)

-    void* dest;

-    uLong x;

-    int nbByte;

-{

-    unsigned char* buf=(unsigned char*)dest;

-    int n;

-    for (n = 0; n < nbByte; n++) {

-        buf[n] = (unsigned char)(x & 0xff);

-        x >>= 8;

-    }

-

-    if (x != 0)

-    {     /* data overflow - hack for ZIP64 */

-       for (n = 0; n < nbByte; n++)

-       {

-          buf[n] = 0xff;

-       }

-    }

-}

-

-/****************************************************************************/

-

-

-local uLong ziplocal_TmzDateToDosDate(ptm,dosDate)

-    const tm_zip* ptm;

-    uLong dosDate;

-{

-    uLong year = (uLong)ptm->tm_year;

-    if (year>1980)

-        year-=1980;

-    else if (year>80)

-        year-=80;

-    return

-      (uLong) (((ptm->tm_mday) + (32 * (ptm->tm_mon+1)) + (512 * year)) << 16) |

-        ((ptm->tm_sec/2) + (32* ptm->tm_min) + (2048 * (uLong)ptm->tm_hour));

-}

-

-

-/****************************************************************************/

-

-local int ziplocal_getByte OF((

-    const zlib_filefunc_def* pzlib_filefunc_def,

-    voidpf filestream,

-    int *pi));

-

-local int ziplocal_getByte(pzlib_filefunc_def,filestream,pi)

-    const zlib_filefunc_def* pzlib_filefunc_def;

-    voidpf filestream;

-    int *pi;

-{

-    unsigned char c;

-    int err = (int)ZREAD(*pzlib_filefunc_def,filestream,&c,1);

-    if (err==1)

-    {

-        *pi = (int)c;

-        return ZIP_OK;

-    }

-    else

-    {

-        if (ZERROR(*pzlib_filefunc_def,filestream))

-            return ZIP_ERRNO;

-        else

-            return ZIP_EOF;

-    }

-}

-

-

-/* ===========================================================================

-   Reads a long in LSB order from the given gz_stream. Sets

-*/

-local int ziplocal_getShort OF((

-    const zlib_filefunc_def* pzlib_filefunc_def,

-    voidpf filestream,

-    uLong *pX));

-

-local int ziplocal_getShort (pzlib_filefunc_def,filestream,pX)

-    const zlib_filefunc_def* pzlib_filefunc_def;

-    voidpf filestream;

-    uLong *pX;

-{

-    uLong x ;

-    int i;

-    int err;

-

-    err = ziplocal_getByte(pzlib_filefunc_def,filestream,&i);

-    x = (uLong)i;

-

-    if (err==ZIP_OK)

-        err = ziplocal_getByte(pzlib_filefunc_def,filestream,&i);

-    x += ((uLong)i)<<8;

-

-    if (err==ZIP_OK)

-        *pX = x;

-    else

-        *pX = 0;

-    return err;

-}

-

-local int ziplocal_getLong OF((

-    const zlib_filefunc_def* pzlib_filefunc_def,

-    voidpf filestream,

-    uLong *pX));

-

-local int ziplocal_getLong (pzlib_filefunc_def,filestream,pX)

-    const zlib_filefunc_def* pzlib_filefunc_def;

-    voidpf filestream;

-    uLong *pX;

-{

-    uLong x ;

-    int i;

-    int err;

-

-    err = ziplocal_getByte(pzlib_filefunc_def,filestream,&i);

-    x = (uLong)i;

-

-    if (err==ZIP_OK)

-        err = ziplocal_getByte(pzlib_filefunc_def,filestream,&i);

-    x += ((uLong)i)<<8;

-

-    if (err==ZIP_OK)

-        err = ziplocal_getByte(pzlib_filefunc_def,filestream,&i);

-    x += ((uLong)i)<<16;

-

-    if (err==ZIP_OK)

-        err = ziplocal_getByte(pzlib_filefunc_def,filestream,&i);

-    x += ((uLong)i)<<24;

-

-    if (err==ZIP_OK)

-        *pX = x;

-    else

-        *pX = 0;

-    return err;

-}

-

-#ifndef BUFREADCOMMENT

-#define BUFREADCOMMENT (0x400)

-#endif

-/*

-  Locate the Central directory of a zipfile (at the end, just before

-    the global comment)

-*/

-local uLong ziplocal_SearchCentralDir OF((

-    const zlib_filefunc_def* pzlib_filefunc_def,

-    voidpf filestream));

-

-local uLong ziplocal_SearchCentralDir(pzlib_filefunc_def,filestream)

-    const zlib_filefunc_def* pzlib_filefunc_def;

-    voidpf filestream;

-{

-    unsigned char* buf;

-    uLong uSizeFile;

-    uLong uBackRead;

-    uLong uMaxBack=0xffff; /* maximum size of global comment */

-    uLong uPosFound=0;

-

-    if (ZSEEK(*pzlib_filefunc_def,filestream,0,ZLIB_FILEFUNC_SEEK_END) != 0)

-        return 0;

-

-

-    uSizeFile = ZTELL(*pzlib_filefunc_def,filestream);

-

-    if (uMaxBack>uSizeFile)

-        uMaxBack = uSizeFile;

-

-    buf = (unsigned char*)ALLOC(BUFREADCOMMENT+4);

-    if (buf==NULL)

-        return 0;

-

-    uBackRead = 4;

-    while (uBackRead<uMaxBack)

-    {

-        uLong uReadSize,uReadPos ;

-        int i;

-        if (uBackRead+BUFREADCOMMENT>uMaxBack)

-            uBackRead = uMaxBack;

-        else

-            uBackRead+=BUFREADCOMMENT;

-        uReadPos = uSizeFile-uBackRead ;

-

-        uReadSize = ((BUFREADCOMMENT+4) < (uSizeFile-uReadPos)) ?

-                     (BUFREADCOMMENT+4) : (uSizeFile-uReadPos);

-        if (ZSEEK(*pzlib_filefunc_def,filestream,uReadPos,ZLIB_FILEFUNC_SEEK_SET)!=0)

-            break;

-

-        if (ZREAD(*pzlib_filefunc_def,filestream,buf,uReadSize)!=uReadSize)

-            break;

-

-        for (i=(int)uReadSize-3; (i--)>0;)

-            if (((*(buf+i))==0x50) && ((*(buf+i+1))==0x4b) &&

-                ((*(buf+i+2))==0x05) && ((*(buf+i+3))==0x06))

-            {

-                uPosFound = uReadPos+i;

-                break;

-            }

-

-        if (uPosFound!=0)

-            break;

-    }

-    TRYFREE(buf);

-    return uPosFound;

-}

-#endif /* !NO_ADDFILEINEXISTINGZIP*/

-

-/************************************************************/

-extern zipFile ZEXPORT zipOpen2 (pathname, append, globalcomment, pzlib_filefunc_def)

-    const char *pathname;

-    int append;

-    zipcharpc* globalcomment;

-    zlib_filefunc_def* pzlib_filefunc_def;

-{

-    zip_internal ziinit;

-    zip_internal* zi;

-    int err=ZIP_OK;

-

-

-    if (pzlib_filefunc_def==NULL)

-        fill_fopen_filefunc(&ziinit.z_filefunc);

-    else

-        ziinit.z_filefunc = *pzlib_filefunc_def;

-

-    ziinit.filestream = (*(ziinit.z_filefunc.zopen_file))

-                 (ziinit.z_filefunc.opaque,

-                  pathname,

-                  (append == APPEND_STATUS_CREATE) ?

-                  (ZLIB_FILEFUNC_MODE_READ | ZLIB_FILEFUNC_MODE_WRITE | ZLIB_FILEFUNC_MODE_CREATE) :

-                    (ZLIB_FILEFUNC_MODE_READ | ZLIB_FILEFUNC_MODE_WRITE | ZLIB_FILEFUNC_MODE_EXISTING));

-

-    if (ziinit.filestream == NULL)

-        return NULL;

-    ziinit.begin_pos = ZTELL(ziinit.z_filefunc,ziinit.filestream);

-    ziinit.in_opened_file_inzip = 0;

-    ziinit.ci.stream_initialised = 0;

-    ziinit.number_entry = 0;

-    ziinit.add_position_when_writting_offset = 0;

-    init_linkedlist(&(ziinit.central_dir));

-

-

-    zi = (zip_internal*)ALLOC(sizeof(zip_internal));

-    if (zi==NULL)

-    {

-        ZCLOSE(ziinit.z_filefunc,ziinit.filestream);

-        return NULL;

-    }

-

-    /* now we add file in a zipfile */

-#    ifndef NO_ADDFILEINEXISTINGZIP

-    ziinit.globalcomment = NULL;

-    if (append == APPEND_STATUS_ADDINZIP)

-    {

-        uLong byte_before_the_zipfile;/* byte before the zipfile, (>0 for sfx)*/

-

-        uLong size_central_dir;     /* size of the central directory  */

-        uLong offset_central_dir;   /* offset of start of central directory */

-        uLong central_pos,uL;

-

-        uLong number_disk;          /* number of the current dist, used for

-                                    spaning ZIP, unsupported, always 0*/

-        uLong number_disk_with_CD;  /* number the the disk with central dir, used

-                                    for spaning ZIP, unsupported, always 0*/

-        uLong number_entry;

-        uLong number_entry_CD;      /* total number of entries in

-                                    the central dir

-                                    (same than number_entry on nospan) */

-        uLong size_comment;

-

-        central_pos = ziplocal_SearchCentralDir(&ziinit.z_filefunc,ziinit.filestream);

-        if (central_pos==0)

-            err=ZIP_ERRNO;

-

-        if (ZSEEK(ziinit.z_filefunc, ziinit.filestream,

-                                        central_pos,ZLIB_FILEFUNC_SEEK_SET)!=0)

-            err=ZIP_ERRNO;

-

-        /* the signature, already checked */

-        if (ziplocal_getLong(&ziinit.z_filefunc, ziinit.filestream,&uL)!=ZIP_OK)

-            err=ZIP_ERRNO;

-

-        /* number of this disk */

-        if (ziplocal_getShort(&ziinit.z_filefunc, ziinit.filestream,&number_disk)!=ZIP_OK)

-            err=ZIP_ERRNO;

-

-        /* number of the disk with the start of the central directory */

-        if (ziplocal_getShort(&ziinit.z_filefunc, ziinit.filestream,&number_disk_with_CD)!=ZIP_OK)

-            err=ZIP_ERRNO;

-

-        /* total number of entries in the central dir on this disk */

-        if (ziplocal_getShort(&ziinit.z_filefunc, ziinit.filestream,&number_entry)!=ZIP_OK)

-            err=ZIP_ERRNO;

-

-        /* total number of entries in the central dir */

-        if (ziplocal_getShort(&ziinit.z_filefunc, ziinit.filestream,&number_entry_CD)!=ZIP_OK)

-            err=ZIP_ERRNO;

-

-        if ((number_entry_CD!=number_entry) ||

-            (number_disk_with_CD!=0) ||

-            (number_disk!=0))

-            err=ZIP_BADZIPFILE;

-

-        /* size of the central directory */

-        if (ziplocal_getLong(&ziinit.z_filefunc, ziinit.filestream,&size_central_dir)!=ZIP_OK)

-            err=ZIP_ERRNO;

-

-        /* offset of start of central directory with respect to the

-            starting disk number */

-        if (ziplocal_getLong(&ziinit.z_filefunc, ziinit.filestream,&offset_central_dir)!=ZIP_OK)

-            err=ZIP_ERRNO;

-

-        /* zipfile global comment length */

-        if (ziplocal_getShort(&ziinit.z_filefunc, ziinit.filestream,&size_comment)!=ZIP_OK)

-            err=ZIP_ERRNO;

-

-        if ((central_pos<offset_central_dir+size_central_dir) &&

-            (err==ZIP_OK))

-            err=ZIP_BADZIPFILE;

-

-        if (err!=ZIP_OK)

-        {

-            ZCLOSE(ziinit.z_filefunc, ziinit.filestream);

-            return NULL;

-        }

-

-        if (size_comment>0)

-        {

-            ziinit.globalcomment = ALLOC(size_comment+1);

-            if (ziinit.globalcomment)

-            {

-               size_comment = ZREAD(ziinit.z_filefunc, ziinit.filestream,ziinit.globalcomment,size_comment);

-               ziinit.globalcomment[size_comment]=0;

-            }

-        }

-

-        byte_before_the_zipfile = central_pos -

-                                (offset_central_dir+size_central_dir);

-        ziinit.add_position_when_writting_offset = byte_before_the_zipfile;

-

-        {

-            uLong size_central_dir_to_read = size_central_dir;

-            size_t buf_size = SIZEDATA_INDATABLOCK;

-            void* buf_read = (void*)ALLOC(buf_size);

-            if (ZSEEK(ziinit.z_filefunc, ziinit.filestream,

-                  offset_central_dir + byte_before_the_zipfile,

-                  ZLIB_FILEFUNC_SEEK_SET) != 0)

-                  err=ZIP_ERRNO;

-

-            while ((size_central_dir_to_read>0) && (err==ZIP_OK))

-            {

-                uLong read_this = SIZEDATA_INDATABLOCK;

-                if (read_this > size_central_dir_to_read)

-                    read_this = size_central_dir_to_read;

-                if (ZREAD(ziinit.z_filefunc, ziinit.filestream,buf_read,read_this) != read_this)

-                    err=ZIP_ERRNO;

-

-                if (err==ZIP_OK)

-                    err = add_data_in_datablock(&ziinit.central_dir,buf_read,

-                                                (uLong)read_this);

-                size_central_dir_to_read-=read_this;

-            }

-            TRYFREE(buf_read);

-        }

-        ziinit.begin_pos = byte_before_the_zipfile;

-        ziinit.number_entry = number_entry_CD;

-

-        if (ZSEEK(ziinit.z_filefunc, ziinit.filestream,

-                  offset_central_dir+byte_before_the_zipfile,ZLIB_FILEFUNC_SEEK_SET)!=0)

-            err=ZIP_ERRNO;

-    }

-

-    if (globalcomment)

-    {

-      *globalcomment = ziinit.globalcomment;

-    }

-#    endif /* !NO_ADDFILEINEXISTINGZIP*/

-

-    if (err != ZIP_OK)

-    {

-#    ifndef NO_ADDFILEINEXISTINGZIP

-        TRYFREE(ziinit.globalcomment);

-#    endif /* !NO_ADDFILEINEXISTINGZIP*/

-        TRYFREE(zi);

-        return NULL;

-    }

-    else

-    {

-        *zi = ziinit;

-        return (zipFile)zi;

-    }

-}

-

-extern zipFile ZEXPORT zipOpen (pathname, append)

-    const char *pathname;

-    int append;

-{

-    return zipOpen2(pathname,append,NULL,NULL);

-}

-

-extern int ZEXPORT zipOpenNewFileInZip3 (file, filename, zipfi,

-                                         extrafield_local, size_extrafield_local,

-                                         extrafield_global, size_extrafield_global,

-                                         comment, method, level, raw,

-                                         windowBits, memLevel, strategy,

-                                         password, crcForCrypting)

-    zipFile file;

-    const char* filename;

-    const zip_fileinfo* zipfi;

-    const void* extrafield_local;

-    uInt size_extrafield_local;

-    const void* extrafield_global;

-    uInt size_extrafield_global;

-    const char* comment;

-    int method;

-    int level;

-    int raw;

-    int windowBits;

-    int memLevel;

-    int strategy;

-    const char* password;

-    uLong crcForCrypting;

-{

-    zip_internal* zi;

-    uInt size_filename;

-    uInt size_comment;

-    uInt i;

-    int err = ZIP_OK;

-

-#    ifdef NOCRYPT

-    if (password != NULL)

-        return ZIP_PARAMERROR;

-#    endif

-

-    if (file == NULL)

-        return ZIP_PARAMERROR;

-    if ((method!=0) && (method!=Z_DEFLATED))

-        return ZIP_PARAMERROR;

-

-    zi = (zip_internal*)file;

-

-    if (zi->in_opened_file_inzip == 1)

-    {

-        err = zipCloseFileInZip (file);

-        if (err != ZIP_OK)

-            return err;

-    }

-

-

-    if (filename==NULL)

-        filename="-";

-

-    if (comment==NULL)

-        size_comment = 0;

-    else

-        size_comment = (uInt)strlen(comment);

-

-    size_filename = (uInt)strlen(filename);

-

-    if (zipfi == NULL)

-        zi->ci.dosDate = 0;

-    else

-    {

-        if (zipfi->dosDate != 0)

-            zi->ci.dosDate = zipfi->dosDate;

-        else zi->ci.dosDate = ziplocal_TmzDateToDosDate(&zipfi->tmz_date,zipfi->dosDate);

-    }

-

-    zi->ci.flag = 0;

-    if ((level==8) || (level==9))

-      zi->ci.flag |= 2;

-    if ((level==2))

-      zi->ci.flag |= 4;

-    if ((level==1))

-      zi->ci.flag |= 6;

-    if (password != NULL)

-      zi->ci.flag |= 1;

-

-    zi->ci.crc32 = 0;

-    zi->ci.method = method;

-    zi->ci.encrypt = 0;

-    zi->ci.stream_initialised = 0;

-    zi->ci.pos_in_buffered_data = 0;

-    zi->ci.raw = raw;

-    zi->ci.pos_local_header = ZTELL(zi->z_filefunc,zi->filestream) ;

-    zi->ci.size_centralheader = SIZECENTRALHEADER + size_filename +

-                                      size_extrafield_global + size_comment;

-    zi->ci.central_header = (char*)ALLOC((uInt)zi->ci.size_centralheader);

-

-    ziplocal_putValue_inmemory(zi->ci.central_header,(uLong)CENTRALHEADERMAGIC,4);

-    /* version info */

-    ziplocal_putValue_inmemory(zi->ci.central_header+4,(uLong)VERSIONMADEBY,2);

-    ziplocal_putValue_inmemory(zi->ci.central_header+6,(uLong)20,2);

-    ziplocal_putValue_inmemory(zi->ci.central_header+8,(uLong)zi->ci.flag,2);

-    ziplocal_putValue_inmemory(zi->ci.central_header+10,(uLong)zi->ci.method,2);

-    ziplocal_putValue_inmemory(zi->ci.central_header+12,(uLong)zi->ci.dosDate,4);

-    ziplocal_putValue_inmemory(zi->ci.central_header+16,(uLong)0,4); /*crc*/

-    ziplocal_putValue_inmemory(zi->ci.central_header+20,(uLong)0,4); /*compr size*/

-    ziplocal_putValue_inmemory(zi->ci.central_header+24,(uLong)0,4); /*uncompr size*/

-    ziplocal_putValue_inmemory(zi->ci.central_header+28,(uLong)size_filename,2);

-    ziplocal_putValue_inmemory(zi->ci.central_header+30,(uLong)size_extrafield_global,2);

-    ziplocal_putValue_inmemory(zi->ci.central_header+32,(uLong)size_comment,2);

-    ziplocal_putValue_inmemory(zi->ci.central_header+34,(uLong)0,2); /*disk nm start*/

-

-    if (zipfi==NULL)

-        ziplocal_putValue_inmemory(zi->ci.central_header+36,(uLong)0,2);

-    else

-        ziplocal_putValue_inmemory(zi->ci.central_header+36,(uLong)zipfi->internal_fa,2);

-

-    if (zipfi==NULL)

-        ziplocal_putValue_inmemory(zi->ci.central_header+38,(uLong)0,4);

-    else

-        ziplocal_putValue_inmemory(zi->ci.central_header+38,(uLong)zipfi->external_fa,4);

-

-    ziplocal_putValue_inmemory(zi->ci.central_header+42,(uLong)zi->ci.pos_local_header- zi->add_position_when_writting_offset,4);

-

-    for (i=0;i<size_filename;i++)

-        *(zi->ci.central_header+SIZECENTRALHEADER+i) = *(filename+i);

-

-    for (i=0;i<size_extrafield_global;i++)

-        *(zi->ci.central_header+SIZECENTRALHEADER+size_filename+i) =

-              *(((const char*)extrafield_global)+i);

-

-    for (i=0;i<size_comment;i++)

-        *(zi->ci.central_header+SIZECENTRALHEADER+size_filename+

-              size_extrafield_global+i) = *(comment+i);

-    if (zi->ci.central_header == NULL)

-        return ZIP_INTERNALERROR;

-

-    /* write the local header */

-    err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)LOCALHEADERMAGIC,4);

-

-    if (err==ZIP_OK)

-        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)20,2);/* version needed to extract */

-    if (err==ZIP_OK)

-        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->ci.flag,2);

-

-    if (err==ZIP_OK)

-        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->ci.method,2);

-

-    if (err==ZIP_OK)

-        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->ci.dosDate,4);

-

-    if (err==ZIP_OK)

-        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4); /* crc 32, unknown */

-    if (err==ZIP_OK)

-        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4); /* compressed size, unknown */

-    if (err==ZIP_OK)

-        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4); /* uncompressed size, unknown */

-

-    if (err==ZIP_OK)

-        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)size_filename,2);

-

-    if (err==ZIP_OK)

-        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)size_extrafield_local,2);

-

-    if ((err==ZIP_OK) && (size_filename>0))

-        if (ZWRITE(zi->z_filefunc,zi->filestream,filename,size_filename)!=size_filename)

-                err = ZIP_ERRNO;

-

-    if ((err==ZIP_OK) && (size_extrafield_local>0))

-        if (ZWRITE(zi->z_filefunc,zi->filestream,extrafield_local,size_extrafield_local)

-                                                                           !=size_extrafield_local)

-                err = ZIP_ERRNO;

-

-    zi->ci.stream.avail_in = (uInt)0;

-    zi->ci.stream.avail_out = (uInt)Z_BUFSIZE;

-    zi->ci.stream.next_out = zi->ci.buffered_data;

-    zi->ci.stream.total_in = 0;

-    zi->ci.stream.total_out = 0;

-

-    if ((err==ZIP_OK) && (zi->ci.method == Z_DEFLATED) && (!zi->ci.raw))

-    {

-        zi->ci.stream.zalloc = (alloc_func)0;

-        zi->ci.stream.zfree = (free_func)0;

-        zi->ci.stream.opaque = (voidpf)0;

-

-        if (windowBits>0)

-            windowBits = -windowBits;

-

-        err = deflateInit2(&zi->ci.stream, level,

-               Z_DEFLATED, windowBits, memLevel, strategy);

-

-        if (err==Z_OK)

-            zi->ci.stream_initialised = 1;

-    }

-#    ifndef NOCRYPT

-    zi->ci.crypt_header_size = 0;

-    if ((err==Z_OK) && (password != NULL))

-    {

-        unsigned char bufHead[RAND_HEAD_LEN];

-        unsigned int sizeHead;

-        zi->ci.encrypt = 1;

-        zi->ci.pcrc_32_tab = get_crc_table();

-        /*init_keys(password,zi->ci.keys,zi->ci.pcrc_32_tab);*/

-

-        sizeHead=crypthead(password,bufHead,RAND_HEAD_LEN,zi->ci.keys,zi->ci.pcrc_32_tab,crcForCrypting);

-        zi->ci.crypt_header_size = sizeHead;

-

-        if (ZWRITE(zi->z_filefunc,zi->filestream,bufHead,sizeHead) != sizeHead)

-                err = ZIP_ERRNO;

-    }

-#    endif

-

-    if (err==Z_OK)

-        zi->in_opened_file_inzip = 1;

-    return err;

-}

-

-extern int ZEXPORT zipOpenNewFileInZip2(file, filename, zipfi,

-                                        extrafield_local, size_extrafield_local,

-                                        extrafield_global, size_extrafield_global,

-                                        comment, method, level, raw)

-    zipFile file;

-    const char* filename;

-    const zip_fileinfo* zipfi;

-    const void* extrafield_local;

-    uInt size_extrafield_local;

-    const void* extrafield_global;

-    uInt size_extrafield_global;

-    const char* comment;

-    int method;

-    int level;

-    int raw;

-{

-    return zipOpenNewFileInZip3 (file, filename, zipfi,

-                                 extrafield_local, size_extrafield_local,

-                                 extrafield_global, size_extrafield_global,

-                                 comment, method, level, raw,

-                                 -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY,

-                                 NULL, 0);

-}

-

-extern int ZEXPORT zipOpenNewFileInZip (file, filename, zipfi,

-                                        extrafield_local, size_extrafield_local,

-                                        extrafield_global, size_extrafield_global,

-                                        comment, method, level)

-    zipFile file;

-    const char* filename;

-    const zip_fileinfo* zipfi;

-    const void* extrafield_local;

-    uInt size_extrafield_local;

-    const void* extrafield_global;

-    uInt size_extrafield_global;

-    const char* comment;

-    int method;

-    int level;

-{

-    return zipOpenNewFileInZip2 (file, filename, zipfi,

-                                 extrafield_local, size_extrafield_local,

-                                 extrafield_global, size_extrafield_global,

-                                 comment, method, level, 0);

-}

-

-local int zipFlushWriteBuffer(zi)

-  zip_internal* zi;

-{

-    int err=ZIP_OK;

-

-    if (zi->ci.encrypt != 0)

-    {

-#ifndef NOCRYPT

-        uInt i;

-        int t;

-        for (i=0;i<zi->ci.pos_in_buffered_data;i++)

-            zi->ci.buffered_data[i] = zencode(zi->ci.keys, zi->ci.pcrc_32_tab,

-                                       zi->ci.buffered_data[i],t);

-#endif

-    }

-    if (ZWRITE(zi->z_filefunc,zi->filestream,zi->ci.buffered_data,zi->ci.pos_in_buffered_data)

-                                                                    !=zi->ci.pos_in_buffered_data)

-      err = ZIP_ERRNO;

-    zi->ci.pos_in_buffered_data = 0;

-    return err;

-}

-

-extern int ZEXPORT zipWriteInFileInZip (file, buf, len)

-    zipFile file;

-    const void* buf;

-    unsigned len;

-{

-    zip_internal* zi;

-    int err=ZIP_OK;

-

-    if (file == NULL)

-        return ZIP_PARAMERROR;

-    zi = (zip_internal*)file;

-

-    if (zi->in_opened_file_inzip == 0)

-        return ZIP_PARAMERROR;

-

-    zi->ci.stream.next_in = (void*)buf;

-    zi->ci.stream.avail_in = len;

-    zi->ci.crc32 = crc32(zi->ci.crc32,buf,len);

-

-    while ((err==ZIP_OK) && (zi->ci.stream.avail_in>0))

-    {

-        if (zi->ci.stream.avail_out == 0)

-        {

-            if (zipFlushWriteBuffer(zi) == ZIP_ERRNO)

-                err = ZIP_ERRNO;

-            zi->ci.stream.avail_out = (uInt)Z_BUFSIZE;

-            zi->ci.stream.next_out = zi->ci.buffered_data;

-        }

-

-

-        if(err != ZIP_OK)

-            break;

-

-        if ((zi->ci.method == Z_DEFLATED) && (!zi->ci.raw))

-        {

-            uLong uTotalOutBefore = zi->ci.stream.total_out;

-            err=deflate(&zi->ci.stream,  Z_NO_FLUSH);

-            zi->ci.pos_in_buffered_data += (uInt)(zi->ci.stream.total_out - uTotalOutBefore) ;

-

-        }

-        else

-        {

-            uInt copy_this,i;

-            if (zi->ci.stream.avail_in < zi->ci.stream.avail_out)

-                copy_this = zi->ci.stream.avail_in;

-            else

-                copy_this = zi->ci.stream.avail_out;

-            for (i=0;i<copy_this;i++)

-                *(((char*)zi->ci.stream.next_out)+i) =

-                    *(((const char*)zi->ci.stream.next_in)+i);

-            {

-                zi->ci.stream.avail_in -= copy_this;

-                zi->ci.stream.avail_out-= copy_this;

-                zi->ci.stream.next_in+= copy_this;

-                zi->ci.stream.next_out+= copy_this;

-                zi->ci.stream.total_in+= copy_this;

-                zi->ci.stream.total_out+= copy_this;

-                zi->ci.pos_in_buffered_data += copy_this;

-            }

-        }

-    }

-

-    return err;

-}

-

-extern int ZEXPORT zipCloseFileInZipRaw (file, uncompressed_size, crc32)

-    zipFile file;

-    uLong uncompressed_size;

-    uLong crc32;

-{

-    zip_internal* zi;

-    uLong compressed_size;

-    int err=ZIP_OK;

-

-    if (file == NULL)

-        return ZIP_PARAMERROR;

-    zi = (zip_internal*)file;

-

-    if (zi->in_opened_file_inzip == 0)

-        return ZIP_PARAMERROR;

-    zi->ci.stream.avail_in = 0;

-

-    if ((zi->ci.method == Z_DEFLATED) && (!zi->ci.raw))

-        while (err==ZIP_OK)

-    {

-        uLong uTotalOutBefore;

-        if (zi->ci.stream.avail_out == 0)

-        {

-            if (zipFlushWriteBuffer(zi) == ZIP_ERRNO)

-                err = ZIP_ERRNO;

-            zi->ci.stream.avail_out = (uInt)Z_BUFSIZE;

-            zi->ci.stream.next_out = zi->ci.buffered_data;

-        }

-        uTotalOutBefore = zi->ci.stream.total_out;

-        err=deflate(&zi->ci.stream,  Z_FINISH);

-        zi->ci.pos_in_buffered_data += (uInt)(zi->ci.stream.total_out - uTotalOutBefore) ;

-    }

-

-    if (err==Z_STREAM_END)

-        err=ZIP_OK; /* this is normal */

-

-    if ((zi->ci.pos_in_buffered_data>0) && (err==ZIP_OK))

-        if (zipFlushWriteBuffer(zi)==ZIP_ERRNO)

-            err = ZIP_ERRNO;

-

-    if ((zi->ci.method == Z_DEFLATED) && (!zi->ci.raw))

-    {

-        err=deflateEnd(&zi->ci.stream);

-        zi->ci.stream_initialised = 0;

-    }

-

-    if (!zi->ci.raw)

-    {

-        crc32 = (uLong)zi->ci.crc32;

-        uncompressed_size = (uLong)zi->ci.stream.total_in;

-    }

-    compressed_size = (uLong)zi->ci.stream.total_out;

-#    ifndef NOCRYPT

-    compressed_size += zi->ci.crypt_header_size;

-#    endif

-

-    ziplocal_putValue_inmemory(zi->ci.central_header+16,crc32,4); /*crc*/

-    ziplocal_putValue_inmemory(zi->ci.central_header+20,

-                                compressed_size,4); /*compr size*/

-    if (zi->ci.stream.data_type == Z_ASCII)

-        ziplocal_putValue_inmemory(zi->ci.central_header+36,(uLong)Z_ASCII,2);

-    ziplocal_putValue_inmemory(zi->ci.central_header+24,

-                                uncompressed_size,4); /*uncompr size*/

-

-    if (err==ZIP_OK)

-        err = add_data_in_datablock(&zi->central_dir,zi->ci.central_header,

-                                       (uLong)zi->ci.size_centralheader);

-    free(zi->ci.central_header);

-

-    if (err==ZIP_OK)

-    {

-        long cur_pos_inzip = ZTELL(zi->z_filefunc,zi->filestream);

-        if (ZSEEK(zi->z_filefunc,zi->filestream,

-                  zi->ci.pos_local_header + 14,ZLIB_FILEFUNC_SEEK_SET)!=0)

-            err = ZIP_ERRNO;

-

-        if (err==ZIP_OK)

-            err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,crc32,4); /* crc 32, unknown */

-

-        if (err==ZIP_OK) /* compressed size, unknown */

-            err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,compressed_size,4);

-

-        if (err==ZIP_OK) /* uncompressed size, unknown */

-            err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,uncompressed_size,4);

-

-        if (ZSEEK(zi->z_filefunc,zi->filestream,

-                  cur_pos_inzip,ZLIB_FILEFUNC_SEEK_SET)!=0)

-            err = ZIP_ERRNO;

-    }

-

-    zi->number_entry ++;

-    zi->in_opened_file_inzip = 0;

-

-    return err;

-}

-

-extern int ZEXPORT zipCloseFileInZip (file)

-    zipFile file;

-{

-    return zipCloseFileInZipRaw (file,0,0);

-}

-

-extern int ZEXPORT zipClose (file, global_comment)

-    zipFile file;

-    const char* global_comment;

-{

-    zip_internal* zi;

-    int err = 0;

-    uLong size_centraldir = 0;

-    uLong centraldir_pos_inzip;

-    uInt size_global_comment;

-    if (file == NULL)

-        return ZIP_PARAMERROR;

-    zi = (zip_internal*)file;

-

-    if (zi->in_opened_file_inzip == 1)

-    {

-        err = zipCloseFileInZip (file);

-    }

-

-#ifndef NO_ADDFILEINEXISTINGZIP

-    if (global_comment==NULL)

-        global_comment = zi->globalcomment;

-#endif

-    if (global_comment==NULL)

-        size_global_comment = 0;

-    else

-        size_global_comment = (uInt)strlen(global_comment);

-

-    centraldir_pos_inzip = ZTELL(zi->z_filefunc,zi->filestream);

-    if (err==ZIP_OK)

-    {

-        linkedlist_datablock_internal* ldi = zi->central_dir.first_block ;

-        while (ldi!=NULL)

-        {

-            if ((err==ZIP_OK) && (ldi->filled_in_this_block>0))

-                if (ZWRITE(zi->z_filefunc,zi->filestream,

-                           ldi->data,ldi->filled_in_this_block)

-                              !=ldi->filled_in_this_block )

-                    err = ZIP_ERRNO;

-

-            size_centraldir += ldi->filled_in_this_block;

-            ldi = ldi->next_datablock;

-        }

-    }

-    free_datablock(zi->central_dir.first_block);

-

-    if (err==ZIP_OK) /* Magic End */

-        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)ENDHEADERMAGIC,4);

-

-    if (err==ZIP_OK) /* number of this disk */

-        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,2);

-

-    if (err==ZIP_OK) /* number of the disk with the start of the central directory */

-        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,2);

-

-    if (err==ZIP_OK) /* total number of entries in the central dir on this disk */

-        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->number_entry,2);

-

-    if (err==ZIP_OK) /* total number of entries in the central dir */

-        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->number_entry,2);

-

-    if (err==ZIP_OK) /* size of the central directory */

-        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)size_centraldir,4);

-

-    if (err==ZIP_OK) /* offset of start of central directory with respect to the

-                            starting disk number */

-        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,

-                                (uLong)(centraldir_pos_inzip - zi->add_position_when_writting_offset),4);

-

-    if (err==ZIP_OK) /* zipfile comment length */

-        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)size_global_comment,2);

-

-    if ((err==ZIP_OK) && (size_global_comment>0))

-        if (ZWRITE(zi->z_filefunc,zi->filestream,

-                   global_comment,size_global_comment) != size_global_comment)

-                err = ZIP_ERRNO;

-

-    if (ZCLOSE(zi->z_filefunc,zi->filestream) != 0)

-        if (err == ZIP_OK)

-            err = ZIP_ERRNO;

-

-#ifndef NO_ADDFILEINEXISTINGZIP

-    TRYFREE(zi->globalcomment);

-#endif

-    TRYFREE(zi);

-

-    return err;

-}

diff --git a/updater/zbin/minizip/mztools.c b/updater/zbin/minizip/mztools.c
index bc5c798..f9092e6 100644
--- a/updater/zbin/minizip/mztools.c
+++ b/updater/zbin/minizip/mztools.c
@@ -1,281 +1,281 @@
-/*

-  Additional tools for Minizip

-  Code: Xavier Roche '2004

-  License: Same as ZLIB (www.gzip.org)

-*/

-

-/* Code */

-#include <stdio.h>

-#include <stdlib.h>

-#include <string.h>

-#include "zlib.h"

-#include "unzip.h"

-

-#define READ_8(adr)  ((unsigned char)*(adr))

-#define READ_16(adr) ( READ_8(adr) | (READ_8(adr+1) << 8) )

-#define READ_32(adr) ( READ_16(adr) | (READ_16((adr)+2) << 16) )

-

-#define WRITE_8(buff, n) do { \

-  *((unsigned char*)(buff)) = (unsigned char) ((n) & 0xff); \

-} while(0)

-#define WRITE_16(buff, n) do { \

-  WRITE_8((unsigned char*)(buff), n); \

-  WRITE_8(((unsigned char*)(buff)) + 1, (n) >> 8); \

-} while(0)

-#define WRITE_32(buff, n) do { \

-  WRITE_16((unsigned char*)(buff), (n) & 0xffff); \

-  WRITE_16((unsigned char*)(buff) + 2, (n) >> 16); \

-} while(0)

-

-extern int ZEXPORT unzRepair(file, fileOut, fileOutTmp, nRecovered, bytesRecovered)

-const char* file;

-const char* fileOut;

-const char* fileOutTmp;

-uLong* nRecovered;

-uLong* bytesRecovered;

-{

-  int err = Z_OK;

-  FILE* fpZip = fopen(file, "rb");

-  FILE* fpOut = fopen(fileOut, "wb");

-  FILE* fpOutCD = fopen(fileOutTmp, "wb");

-  if (fpZip != NULL &&  fpOut != NULL) {

-    int entries = 0;

-    uLong totalBytes = 0;

-    char header[30];

-    char filename[256];

-    char extra[1024];

-    int offset = 0;

-    int offsetCD = 0;

-    while ( fread(header, 1, 30, fpZip) == 30 ) {

-      int currentOffset = offset;

-

-      /* File entry */

-      if (READ_32(header) == 0x04034b50) {

-        unsigned int version = READ_16(header + 4);

-        unsigned int gpflag = READ_16(header + 6);

-        unsigned int method = READ_16(header + 8);

-        unsigned int filetime = READ_16(header + 10);

-        unsigned int filedate = READ_16(header + 12);

-        unsigned int crc = READ_32(header + 14); /* crc */

-        unsigned int cpsize = READ_32(header + 18); /* compressed size */

-        unsigned int uncpsize = READ_32(header + 22); /* uncompressed sz */

-        unsigned int fnsize = READ_16(header + 26); /* file name length */

-        unsigned int extsize = READ_16(header + 28); /* extra field length */

-        filename[0] = extra[0] = '\0';

-        

-        /* Header */

-        if (fwrite(header, 1, 30, fpOut) == 30) {

-          offset += 30;

-        } else {

-          err = Z_ERRNO;

-          break;

-        }

-        

-        /* Filename */

-        if (fnsize > 0) {

-          if (fread(filename, 1, fnsize, fpZip) == fnsize) {

-            if (fwrite(filename, 1, fnsize, fpOut) == fnsize) {

-              offset += fnsize;

-            } else {

-              err = Z_ERRNO;

-              break;

-            }

-          } else {

-            err = Z_ERRNO;

-            break;

-          }

-        } else {

-          err = Z_STREAM_ERROR;

-          break;

-        }

-

-        /* Extra field */

-        if (extsize > 0) {

-          if (fread(extra, 1, extsize, fpZip) == extsize) {

-            if (fwrite(extra, 1, extsize, fpOut) == extsize) {

-              offset += extsize;

-            } else {

-              err = Z_ERRNO;

-              break;

-            }

-          } else {

-            err = Z_ERRNO;

-            break;

-          }

-        }

-        

-        /* Data */

-        {

-          int dataSize = cpsize;

-          if (dataSize == 0) {

-            dataSize = uncpsize;

-          }

-          if (dataSize > 0) {

-            char* data = malloc(dataSize);

-            if (data != NULL) {

-              if ((int)fread(data, 1, dataSize, fpZip) == dataSize) {

-                if ((int)fwrite(data, 1, dataSize, fpOut) == dataSize) {

-                  offset += dataSize;

-                  totalBytes += dataSize;

-                } else {

-                  err = Z_ERRNO;

-                }

-              } else {

-                err = Z_ERRNO;

-              }

-              free(data);

-              if (err != Z_OK) {

-                break;

-              }

-            } else {

-              err = Z_MEM_ERROR;

-              break;

-            }

-          }

-        }

-        

-        /* Central directory entry */

-        {

-          char header[46];

-          char* comment = "";

-          int comsize = (int) strlen(comment);

-          WRITE_32(header, 0x02014b50);

-          WRITE_16(header + 4, version);

-          WRITE_16(header + 6, version);

-          WRITE_16(header + 8, gpflag);

-          WRITE_16(header + 10, method);

-          WRITE_16(header + 12, filetime);

-          WRITE_16(header + 14, filedate);

-          WRITE_32(header + 16, crc);

-          WRITE_32(header + 20, cpsize);

-          WRITE_32(header + 24, uncpsize);

-          WRITE_16(header + 28, fnsize);

-          WRITE_16(header + 30, extsize);

-          WRITE_16(header + 32, comsize);

-          WRITE_16(header + 34, 0);     /* disk # */

-          WRITE_16(header + 36, 0);     /* int attrb */

-          WRITE_32(header + 38, 0);     /* ext attrb */

-          WRITE_32(header + 42, currentOffset);

-          /* Header */

-          if (fwrite(header, 1, 46, fpOutCD) == 46) {

-            offsetCD += 46;

-            

-            /* Filename */

-            if (fnsize > 0) {

-              if (fwrite(filename, 1, fnsize, fpOutCD) == fnsize) {

-                offsetCD += fnsize;

-              } else {

-                err = Z_ERRNO;

-                break;

-              }

-            } else {

-              err = Z_STREAM_ERROR;

-              break;

-            }

-            

-            /* Extra field */

-            if (extsize > 0) {

-              if (fwrite(extra, 1, extsize, fpOutCD) == extsize) {

-                offsetCD += extsize;

-              } else {

-                err = Z_ERRNO;

-                break;

-              }

-            }

-            

-            /* Comment field */

-            if (comsize > 0) {

-              if ((int)fwrite(comment, 1, comsize, fpOutCD) == comsize) {

-                offsetCD += comsize;

-              } else {

-                err = Z_ERRNO;

-                break;

-              }

-            }

-            

-            

-          } else {

-            err = Z_ERRNO;

-            break;

-          }

-        }

-

-        /* Success */

-        entries++;

-

-      } else {

-        break;

-      }

-    }

-

-    /* Final central directory  */

-    {

-      int entriesZip = entries;

-      char header[22];

-      char* comment = ""; // "ZIP File recovered by zlib/minizip/mztools";

-      int comsize = (int) strlen(comment);

-      if (entriesZip > 0xffff) {

-        entriesZip = 0xffff;

-      }

-      WRITE_32(header, 0x06054b50);

-      WRITE_16(header + 4, 0);    /* disk # */

-      WRITE_16(header + 6, 0);    /* disk # */

-      WRITE_16(header + 8, entriesZip);   /* hack */

-      WRITE_16(header + 10, entriesZip);  /* hack */

-      WRITE_32(header + 12, offsetCD);    /* size of CD */

-      WRITE_32(header + 16, offset);      /* offset to CD */

-      WRITE_16(header + 20, comsize);     /* comment */

-      

-      /* Header */

-      if (fwrite(header, 1, 22, fpOutCD) == 22) {

-        

-        /* Comment field */

-        if (comsize > 0) {

-          if ((int)fwrite(comment, 1, comsize, fpOutCD) != comsize) {

-            err = Z_ERRNO;

-          }

-        }

-        

-      } else {

-        err = Z_ERRNO;

-      }

-    }

-

-    /* Final merge (file + central directory) */

-    fclose(fpOutCD);

-    if (err == Z_OK) {

-      fpOutCD = fopen(fileOutTmp, "rb");

-      if (fpOutCD != NULL) {

-        int nRead;

-        char buffer[8192];

-        while ( (nRead = (int)fread(buffer, 1, sizeof(buffer), fpOutCD)) > 0) {

-          if ((int)fwrite(buffer, 1, nRead, fpOut) != nRead) {

-            err = Z_ERRNO;

-            break;

-          }

-        }

-        fclose(fpOutCD);

-      }

-    }

-    

-    /* Close */

-    fclose(fpZip);

-    fclose(fpOut);

-    

-    /* Wipe temporary file */

-    (void)remove(fileOutTmp);

-    

-    /* Number of recovered entries */

-    if (err == Z_OK) {

-      if (nRecovered != NULL) {

-        *nRecovered = entries;

-      }

-      if (bytesRecovered != NULL) {

-        *bytesRecovered = totalBytes;

-      }

-    }

-  } else {

-    err = Z_STREAM_ERROR;

-  }

-  return err;

-}

+/*
+  Additional tools for Minizip
+  Code: Xavier Roche '2004
+  License: Same as ZLIB (www.gzip.org)
+*/
+
+/* Code */
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "zlib.h"
+#include "unzip.h"
+
+#define READ_8(adr)  ((unsigned char)*(adr))
+#define READ_16(adr) ( READ_8(adr) | (READ_8(adr+1) << 8) )
+#define READ_32(adr) ( READ_16(adr) | (READ_16((adr)+2) << 16) )
+
+#define WRITE_8(buff, n) do { \
+  *((unsigned char*)(buff)) = (unsigned char) ((n) & 0xff); \
+} while(0)
+#define WRITE_16(buff, n) do { \
+  WRITE_8((unsigned char*)(buff), n); \
+  WRITE_8(((unsigned char*)(buff)) + 1, (n) >> 8); \
+} while(0)
+#define WRITE_32(buff, n) do { \
+  WRITE_16((unsigned char*)(buff), (n) & 0xffff); \
+  WRITE_16((unsigned char*)(buff) + 2, (n) >> 16); \
+} while(0)
+
+extern int ZEXPORT unzRepair(file, fileOut, fileOutTmp, nRecovered, bytesRecovered)
+const char* file;
+const char* fileOut;
+const char* fileOutTmp;
+uLong* nRecovered;
+uLong* bytesRecovered;
+{
+  int err = Z_OK;
+  FILE* fpZip = fopen(file, "rb");
+  FILE* fpOut = fopen(fileOut, "wb");
+  FILE* fpOutCD = fopen(fileOutTmp, "wb");
+  if (fpZip != NULL &&  fpOut != NULL) {
+    int entries = 0;
+    uLong totalBytes = 0;
+    char header[30];
+    char filename[256];
+    char extra[1024];
+    int offset = 0;
+    int offsetCD = 0;
+    while ( fread(header, 1, 30, fpZip) == 30 ) {
+      int currentOffset = offset;
+
+      /* File entry */
+      if (READ_32(header) == 0x04034b50) {
+        unsigned int version = READ_16(header + 4);
+        unsigned int gpflag = READ_16(header + 6);
+        unsigned int method = READ_16(header + 8);
+        unsigned int filetime = READ_16(header + 10);
+        unsigned int filedate = READ_16(header + 12);
+        unsigned int crc = READ_32(header + 14); /* crc */
+        unsigned int cpsize = READ_32(header + 18); /* compressed size */
+        unsigned int uncpsize = READ_32(header + 22); /* uncompressed sz */
+        unsigned int fnsize = READ_16(header + 26); /* file name length */
+        unsigned int extsize = READ_16(header + 28); /* extra field length */
+        filename[0] = extra[0] = '\0';
+
+        /* Header */
+        if (fwrite(header, 1, 30, fpOut) == 30) {
+          offset += 30;
+        } else {
+          err = Z_ERRNO;
+          break;
+        }
+
+        /* Filename */
+        if (fnsize > 0) {
+          if (fread(filename, 1, fnsize, fpZip) == fnsize) {
+            if (fwrite(filename, 1, fnsize, fpOut) == fnsize) {
+              offset += fnsize;
+            } else {
+              err = Z_ERRNO;
+              break;
+            }
+          } else {
+            err = Z_ERRNO;
+            break;
+          }
+        } else {
+          err = Z_STREAM_ERROR;
+          break;
+        }
+
+        /* Extra field */
+        if (extsize > 0) {
+          if (fread(extra, 1, extsize, fpZip) == extsize) {
+            if (fwrite(extra, 1, extsize, fpOut) == extsize) {
+              offset += extsize;
+            } else {
+              err = Z_ERRNO;
+              break;
+            }
+          } else {
+            err = Z_ERRNO;
+            break;
+          }
+        }
+
+        /* Data */
+        {
+          int dataSize = cpsize;
+          if (dataSize == 0) {
+            dataSize = uncpsize;
+          }
+          if (dataSize > 0) {
+            char* data = malloc(dataSize);
+            if (data != NULL) {
+              if ((int)fread(data, 1, dataSize, fpZip) == dataSize) {
+                if ((int)fwrite(data, 1, dataSize, fpOut) == dataSize) {
+                  offset += dataSize;
+                  totalBytes += dataSize;
+                } else {
+                  err = Z_ERRNO;
+                }
+              } else {
+                err = Z_ERRNO;
+              }
+              free(data);
+              if (err != Z_OK) {
+                break;
+              }
+            } else {
+              err = Z_MEM_ERROR;
+              break;
+            }
+          }
+        }
+
+        /* Central directory entry */
+        {
+          char header[46];
+          char* comment = "";
+          int comsize = (int) strlen(comment);
+          WRITE_32(header, 0x02014b50);
+          WRITE_16(header + 4, version);
+          WRITE_16(header + 6, version);
+          WRITE_16(header + 8, gpflag);
+          WRITE_16(header + 10, method);
+          WRITE_16(header + 12, filetime);
+          WRITE_16(header + 14, filedate);
+          WRITE_32(header + 16, crc);
+          WRITE_32(header + 20, cpsize);
+          WRITE_32(header + 24, uncpsize);
+          WRITE_16(header + 28, fnsize);
+          WRITE_16(header + 30, extsize);
+          WRITE_16(header + 32, comsize);
+          WRITE_16(header + 34, 0);     /* disk # */
+          WRITE_16(header + 36, 0);     /* int attrb */
+          WRITE_32(header + 38, 0);     /* ext attrb */
+          WRITE_32(header + 42, currentOffset);
+          /* Header */
+          if (fwrite(header, 1, 46, fpOutCD) == 46) {
+            offsetCD += 46;
+
+            /* Filename */
+            if (fnsize > 0) {
+              if (fwrite(filename, 1, fnsize, fpOutCD) == fnsize) {
+                offsetCD += fnsize;
+              } else {
+                err = Z_ERRNO;
+                break;
+              }
+            } else {
+              err = Z_STREAM_ERROR;
+              break;
+            }
+
+            /* Extra field */
+            if (extsize > 0) {
+              if (fwrite(extra, 1, extsize, fpOutCD) == extsize) {
+                offsetCD += extsize;
+              } else {
+                err = Z_ERRNO;
+                break;
+              }
+            }
+
+            /* Comment field */
+            if (comsize > 0) {
+              if ((int)fwrite(comment, 1, comsize, fpOutCD) == comsize) {
+                offsetCD += comsize;
+              } else {
+                err = Z_ERRNO;
+                break;
+              }
+            }
+
+
+          } else {
+            err = Z_ERRNO;
+            break;
+          }
+        }
+
+        /* Success */
+        entries++;
+
+      } else {
+        break;
+      }
+    }
+
+    /* Final central directory  */
+    {
+      int entriesZip = entries;
+      char header[22];
+      char* comment = ""; // "ZIP File recovered by zlib/minizip/mztools";
+      int comsize = (int) strlen(comment);
+      if (entriesZip > 0xffff) {
+        entriesZip = 0xffff;
+      }
+      WRITE_32(header, 0x06054b50);
+      WRITE_16(header + 4, 0);    /* disk # */
+      WRITE_16(header + 6, 0);    /* disk # */
+      WRITE_16(header + 8, entriesZip);   /* hack */
+      WRITE_16(header + 10, entriesZip);  /* hack */
+      WRITE_32(header + 12, offsetCD);    /* size of CD */
+      WRITE_32(header + 16, offset);      /* offset to CD */
+      WRITE_16(header + 20, comsize);     /* comment */
+
+      /* Header */
+      if (fwrite(header, 1, 22, fpOutCD) == 22) {
+
+        /* Comment field */
+        if (comsize > 0) {
+          if ((int)fwrite(comment, 1, comsize, fpOutCD) != comsize) {
+            err = Z_ERRNO;
+          }
+        }
+
+      } else {
+        err = Z_ERRNO;
+      }
+    }
+
+    /* Final merge (file + central directory) */
+    fclose(fpOutCD);
+    if (err == Z_OK) {
+      fpOutCD = fopen(fileOutTmp, "rb");
+      if (fpOutCD != NULL) {
+        int nRead;
+        char buffer[8192];
+        while ( (nRead = (int)fread(buffer, 1, sizeof(buffer), fpOutCD)) > 0) {
+          if ((int)fwrite(buffer, 1, nRead, fpOut) != nRead) {
+            err = Z_ERRNO;
+            break;
+          }
+        }
+        fclose(fpOutCD);
+      }
+    }
+
+    /* Close */
+    fclose(fpZip);
+    fclose(fpOut);
+
+    /* Wipe temporary file */
+    (void)remove(fileOutTmp);
+
+    /* Number of recovered entries */
+    if (err == Z_OK) {
+      if (nRecovered != NULL) {
+        *nRecovered = entries;
+      }
+      if (bytesRecovered != NULL) {
+        *bytesRecovered = totalBytes;
+      }
+    }
+  } else {
+    err = Z_STREAM_ERROR;
+  }
+  return err;
+}
diff --git a/updater/zbin/minizip/mztools.h b/updater/zbin/minizip/mztools.h
index 82d1597..88b3459 100644
--- a/updater/zbin/minizip/mztools.h
+++ b/updater/zbin/minizip/mztools.h
@@ -1,31 +1,31 @@
-/*

-  Additional tools for Minizip

-  Code: Xavier Roche '2004

-  License: Same as ZLIB (www.gzip.org)

-*/

-

-#ifndef _zip_tools_H

-#define _zip_tools_H

-

-#ifdef __cplusplus

-extern "C" {

-#endif

-

-#ifndef _ZLIB_H

-#include "zlib.h"

-#endif

-

-#include "unzip.h"

-

-/* Repair a ZIP file (missing central directory) 

-   file: file to recover

-   fileOut: output file after recovery

-   fileOutTmp: temporary file name used for recovery

-*/

-extern int ZEXPORT unzRepair(const char* file, 

-                             const char* fileOut, 

-                             const char* fileOutTmp, 

-                             uLong* nRecovered,

-                             uLong* bytesRecovered);

-

-#endif

+/*
+  Additional tools for Minizip
+  Code: Xavier Roche '2004
+  License: Same as ZLIB (www.gzip.org)
+*/
+
+#ifndef _zip_tools_H
+#define _zip_tools_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifndef _ZLIB_H
+#include "zlib.h"
+#endif
+
+#include "unzip.h"
+
+/* Repair a ZIP file (missing central directory)
+   file: file to recover
+   fileOut: output file after recovery
+   fileOutTmp: temporary file name used for recovery
+*/
+extern int ZEXPORT unzRepair(const char* file,
+                             const char* fileOut,
+                             const char* fileOutTmp,
+                             uLong* nRecovered,
+                             uLong* bytesRecovered);
+
+#endif
diff --git a/updater/zbin/minizip/unzip.c b/updater/zbin/minizip/unzip.c
new file mode 100644
index 0000000..7617f41
--- /dev/null
+++ b/updater/zbin/minizip/unzip.c
@@ -0,0 +1,2125 @@
+/* unzip.c -- IO for uncompress .zip files using zlib
+   Version 1.1, February 14h, 2010
+   part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
+
+         Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
+
+         Modifications of Unzip for Zip64
+         Copyright (C) 2007-2008 Even Rouault
+
+         Modifications for Zip64 support on both zip and unzip
+         Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
+
+         For more info read MiniZip_info.txt
+
+
+  ------------------------------------------------------------------------------------
+  Decryption code comes from crypt.c by Info-ZIP but has been greatly reduced in terms of
+  compatibility with older software. The following is from the original crypt.c.
+  Code woven in by Terry Thorsen 1/2003.
+
+  Copyright (c) 1990-2000 Info-ZIP.  All rights reserved.
+
+  See the accompanying file LICENSE, version 2000-Apr-09 or later
+  (the contents of which are also included in zip.h) for terms of use.
+  If, for some reason, all these files are missing, the Info-ZIP license
+  also may be found at:  ftp://ftp.info-zip.org/pub/infozip/license.html
+
+        crypt.c (full version) by Info-ZIP.      Last revised:  [see crypt.h]
+
+  The encryption/decryption parts of this source code (as opposed to the
+  non-echoing password parts) were originally written in Europe.  The
+  whole source package can be freely distributed, including from the USA.
+  (Prior to January 2000, re-export from the US was a violation of US law.)
+
+        This encryption code is a direct transcription of the algorithm from
+  Roger Schlafly, described by Phil Katz in the file appnote.txt.  This
+  file (appnote.txt) is distributed with the PKZIP program (even in the
+  version without encryption capabilities).
+
+        ------------------------------------------------------------------------------------
+
+        Changes in unzip.c
+
+        2007-2008 - Even Rouault - Addition of cpl_unzGetCurrentFileZStreamPos
+  2007-2008 - Even Rouault - Decoration of symbol names unz* -> cpl_unz*
+  2007-2008 - Even Rouault - Remove old C style function prototypes
+  2007-2008 - Even Rouault - Add unzip support for ZIP64
+
+        Copyright (C) 2007-2008 Even Rouault
+
+
+        Oct-2009 - Mathias Svensson - Removed cpl_* from symbol names (Even Rouault added them but since this is now moved to a new project (minizip64) I renamed them again).
+  Oct-2009 - Mathias Svensson - Fixed problem if uncompressed size was > 4G and compressed size was <4G
+                                should only read the compressed/uncompressed size from the Zip64 format if
+                                the size from normal header was 0xFFFFFFFF
+  Oct-2009 - Mathias Svensson - Applied some bug fixes from paches recived from Gilles Vollant
+        Oct-2009 - Mathias Svensson - Applied support to unzip files with compression mathod BZIP2 (bzip2 lib is required)
+                                Patch created by Daniel Borca
+
+  Jan-2010 - back to unzip and minizip 1.0 name scheme, with compatibility layer
+
+  Copyright (C) 1998 - 2010 Gilles Vollant, Even Rouault, Mathias Svensson
+
+*/
+
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#ifndef NOUNCRYPT
+        #define NOUNCRYPT
+#endif
+
+#include "zlib.h"
+#include "unzip.h"
+
+#ifdef STDC
+#  include <stddef.h>
+#  include <string.h>
+#  include <stdlib.h>
+#endif
+#ifdef NO_ERRNO_H
+    extern int errno;
+#else
+#   include <errno.h>
+#endif
+
+
+#ifndef local
+#  define local static
+#endif
+/* compile with -Dlocal if your debugger can't find static symbols */
+
+
+#ifndef CASESENSITIVITYDEFAULT_NO
+#  if !defined(unix) && !defined(CASESENSITIVITYDEFAULT_YES)
+#    define CASESENSITIVITYDEFAULT_NO
+#  endif
+#endif
+
+
+#ifndef UNZ_BUFSIZE
+#define UNZ_BUFSIZE (16384)
+#endif
+
+#ifndef UNZ_MAXFILENAMEINZIP
+#define UNZ_MAXFILENAMEINZIP (256)
+#endif
+
+#ifndef ALLOC
+# define ALLOC(size) (malloc(size))
+#endif
+#ifndef TRYFREE
+# define TRYFREE(p) {if (p) free(p);}
+#endif
+
+#define SIZECENTRALDIRITEM (0x2e)
+#define SIZEZIPLOCALHEADER (0x1e)
+
+
+const char unz_copyright[] =
+   " unzip 1.01 Copyright 1998-2004 Gilles Vollant - http://www.winimage.com/zLibDll";
+
+/* unz_file_info_interntal contain internal info about a file in zipfile*/
+typedef struct unz_file_info64_internal_s
+{
+    ZPOS64_T offset_curfile;/* relative offset of local header 8 bytes */
+} unz_file_info64_internal;
+
+
+/* file_in_zip_read_info_s contain internal information about a file in zipfile,
+    when reading and decompress it */
+typedef struct
+{
+    char  *read_buffer;         /* internal buffer for compressed data */
+    z_stream stream;            /* zLib stream structure for inflate */
+
+#ifdef HAVE_BZIP2
+    bz_stream bstream;          /* bzLib stream structure for bziped */
+#endif
+
+    ZPOS64_T pos_in_zipfile;       /* position in byte on the zipfile, for fseek*/
+    uLong stream_initialised;   /* flag set if stream structure is initialised*/
+
+    ZPOS64_T offset_local_extrafield;/* offset of the local extra field */
+    uInt  size_local_extrafield;/* size of the local extra field */
+    ZPOS64_T pos_local_extrafield;   /* position in the local extra field in read*/
+    ZPOS64_T total_out_64;
+
+    uLong crc32;                /* crc32 of all data uncompressed */
+    uLong crc32_wait;           /* crc32 we must obtain after decompress all */
+    ZPOS64_T rest_read_compressed; /* number of byte to be decompressed */
+    ZPOS64_T rest_read_uncompressed;/*number of byte to be obtained after decomp*/
+    zlib_filefunc64_32_def z_filefunc;
+    voidpf filestream;        /* io structore of the zipfile */
+    uLong compression_method;   /* compression method (0==store) */
+    ZPOS64_T byte_before_the_zipfile;/* byte before the zipfile, (>0 for sfx)*/
+    int   raw;
+} file_in_zip64_read_info_s;
+
+
+/* unz64_s contain internal information about the zipfile
+*/
+typedef struct
+{
+    zlib_filefunc64_32_def z_filefunc;
+    int is64bitOpenFunction;
+    voidpf filestream;        /* io structore of the zipfile */
+    unz_global_info64 gi;       /* public global information */
+    ZPOS64_T byte_before_the_zipfile;/* byte before the zipfile, (>0 for sfx)*/
+    ZPOS64_T num_file;             /* number of the current file in the zipfile*/
+    ZPOS64_T pos_in_central_dir;   /* pos of the current file in the central dir*/
+    ZPOS64_T current_file_ok;      /* flag about the usability of the current file*/
+    ZPOS64_T central_pos;          /* position of the beginning of the central dir*/
+
+    ZPOS64_T size_central_dir;     /* size of the central directory  */
+    ZPOS64_T offset_central_dir;   /* offset of start of central directory with
+                                   respect to the starting disk number */
+
+    unz_file_info64 cur_file_info; /* public info about the current file in zip*/
+    unz_file_info64_internal cur_file_info_internal; /* private info about it*/
+    file_in_zip64_read_info_s* pfile_in_zip_read; /* structure about the current
+                                        file if we are decompressing it */
+    int encrypted;
+
+    int isZip64;
+
+#    ifndef NOUNCRYPT
+    unsigned long keys[3];     /* keys defining the pseudo-random sequence */
+    const unsigned long* pcrc_32_tab;
+#    endif
+} unz64_s;
+
+
+#ifndef NOUNCRYPT
+#include "crypt.h"
+#endif
+
+/* ===========================================================================
+     Read a byte from a gz_stream; update next_in and avail_in. Return EOF
+   for end of file.
+   IN assertion: the stream s has been sucessfully opened for reading.
+*/
+
+
+local int unz64local_getByte OF((
+    const zlib_filefunc64_32_def* pzlib_filefunc_def,
+    voidpf filestream,
+    int *pi));
+
+local int unz64local_getByte(const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, int *pi)
+{
+    unsigned char c;
+    int err = (int)ZREAD64(*pzlib_filefunc_def,filestream,&c,1);
+    if (err==1)
+    {
+        *pi = (int)c;
+        return UNZ_OK;
+    }
+    else
+    {
+        if (ZERROR64(*pzlib_filefunc_def,filestream))
+            return UNZ_ERRNO;
+        else
+            return UNZ_EOF;
+    }
+}
+
+
+/* ===========================================================================
+   Reads a long in LSB order from the given gz_stream. Sets
+*/
+local int unz64local_getShort OF((
+    const zlib_filefunc64_32_def* pzlib_filefunc_def,
+    voidpf filestream,
+    uLong *pX));
+
+local int unz64local_getShort (const zlib_filefunc64_32_def* pzlib_filefunc_def,
+                             voidpf filestream,
+                             uLong *pX)
+{
+    uLong x ;
+    int i = 0;
+    int err;
+
+    err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
+    x = (uLong)i;
+
+    if (err==UNZ_OK)
+        err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
+    x |= ((uLong)i)<<8;
+
+    if (err==UNZ_OK)
+        *pX = x;
+    else
+        *pX = 0;
+    return err;
+}
+
+local int unz64local_getLong OF((
+    const zlib_filefunc64_32_def* pzlib_filefunc_def,
+    voidpf filestream,
+    uLong *pX));
+
+local int unz64local_getLong (const zlib_filefunc64_32_def* pzlib_filefunc_def,
+                            voidpf filestream,
+                            uLong *pX)
+{
+    uLong x ;
+    int i = 0;
+    int err;
+
+    err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
+    x = (uLong)i;
+
+    if (err==UNZ_OK)
+        err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
+    x |= ((uLong)i)<<8;
+
+    if (err==UNZ_OK)
+        err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
+    x |= ((uLong)i)<<16;
+
+    if (err==UNZ_OK)
+        err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
+    x += ((uLong)i)<<24;
+
+    if (err==UNZ_OK)
+        *pX = x;
+    else
+        *pX = 0;
+    return err;
+}
+
+local int unz64local_getLong64 OF((
+    const zlib_filefunc64_32_def* pzlib_filefunc_def,
+    voidpf filestream,
+    ZPOS64_T *pX));
+
+
+local int unz64local_getLong64 (const zlib_filefunc64_32_def* pzlib_filefunc_def,
+                            voidpf filestream,
+                            ZPOS64_T *pX)
+{
+    ZPOS64_T x ;
+    int i = 0;
+    int err;
+
+    err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
+    x = (ZPOS64_T)i;
+
+    if (err==UNZ_OK)
+        err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
+    x |= ((ZPOS64_T)i)<<8;
+
+    if (err==UNZ_OK)
+        err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
+    x |= ((ZPOS64_T)i)<<16;
+
+    if (err==UNZ_OK)
+        err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
+    x |= ((ZPOS64_T)i)<<24;
+
+    if (err==UNZ_OK)
+        err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
+    x |= ((ZPOS64_T)i)<<32;
+
+    if (err==UNZ_OK)
+        err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
+    x |= ((ZPOS64_T)i)<<40;
+
+    if (err==UNZ_OK)
+        err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
+    x |= ((ZPOS64_T)i)<<48;
+
+    if (err==UNZ_OK)
+        err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
+    x |= ((ZPOS64_T)i)<<56;
+
+    if (err==UNZ_OK)
+        *pX = x;
+    else
+        *pX = 0;
+    return err;
+}
+
+/* My own strcmpi / strcasecmp */
+local int strcmpcasenosensitive_internal (const char* fileName1, const char* fileName2)
+{
+    for (;;)
+    {
+        char c1=*(fileName1++);
+        char c2=*(fileName2++);
+        if ((c1>='a') && (c1<='z'))
+            c1 -= 0x20;
+        if ((c2>='a') && (c2<='z'))
+            c2 -= 0x20;
+        if (c1=='\0')
+            return ((c2=='\0') ? 0 : -1);
+        if (c2=='\0')
+            return 1;
+        if (c1<c2)
+            return -1;
+        if (c1>c2)
+            return 1;
+    }
+}
+
+
+#ifdef  CASESENSITIVITYDEFAULT_NO
+#define CASESENSITIVITYDEFAULTVALUE 2
+#else
+#define CASESENSITIVITYDEFAULTVALUE 1
+#endif
+
+#ifndef STRCMPCASENOSENTIVEFUNCTION
+#define STRCMPCASENOSENTIVEFUNCTION strcmpcasenosensitive_internal
+#endif
+
+/*
+   Compare two filename (fileName1,fileName2).
+   If iCaseSenisivity = 1, comparision is case sensitivity (like strcmp)
+   If iCaseSenisivity = 2, comparision is not case sensitivity (like strcmpi
+                                                                or strcasecmp)
+   If iCaseSenisivity = 0, case sensitivity is defaut of your operating system
+        (like 1 on Unix, 2 on Windows)
+
+*/
+extern int ZEXPORT unzStringFileNameCompare (const char*  fileName1,
+                                                 const char*  fileName2,
+                                                 int iCaseSensitivity)
+
+{
+    if (iCaseSensitivity==0)
+        iCaseSensitivity=CASESENSITIVITYDEFAULTVALUE;
+
+    if (iCaseSensitivity==1)
+        return strcmp(fileName1,fileName2);
+
+    return STRCMPCASENOSENTIVEFUNCTION(fileName1,fileName2);
+}
+
+#ifndef BUFREADCOMMENT
+#define BUFREADCOMMENT (0x400)
+#endif
+
+/*
+  Locate the Central directory of a zipfile (at the end, just before
+    the global comment)
+*/
+local ZPOS64_T unz64local_SearchCentralDir OF((const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream));
+local ZPOS64_T unz64local_SearchCentralDir(const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream)
+{
+    unsigned char* buf;
+    ZPOS64_T uSizeFile;
+    ZPOS64_T uBackRead;
+    ZPOS64_T uMaxBack=0xffff; /* maximum size of global comment */
+    ZPOS64_T uPosFound=0;
+
+    if (ZSEEK64(*pzlib_filefunc_def,filestream,0,ZLIB_FILEFUNC_SEEK_END) != 0)
+        return 0;
+
+
+    uSizeFile = ZTELL64(*pzlib_filefunc_def,filestream);
+
+    if (uMaxBack>uSizeFile)
+        uMaxBack = uSizeFile;
+
+    buf = (unsigned char*)ALLOC(BUFREADCOMMENT+4);
+    if (buf==NULL)
+        return 0;
+
+    uBackRead = 4;
+    while (uBackRead<uMaxBack)
+    {
+        uLong uReadSize;
+        ZPOS64_T uReadPos ;
+        int i;
+        if (uBackRead+BUFREADCOMMENT>uMaxBack)
+            uBackRead = uMaxBack;
+        else
+            uBackRead+=BUFREADCOMMENT;
+        uReadPos = uSizeFile-uBackRead ;
+
+        uReadSize = ((BUFREADCOMMENT+4) < (uSizeFile-uReadPos)) ?
+                     (BUFREADCOMMENT+4) : (uLong)(uSizeFile-uReadPos);
+        if (ZSEEK64(*pzlib_filefunc_def,filestream,uReadPos,ZLIB_FILEFUNC_SEEK_SET)!=0)
+            break;
+
+        if (ZREAD64(*pzlib_filefunc_def,filestream,buf,uReadSize)!=uReadSize)
+            break;
+
+        for (i=(int)uReadSize-3; (i--)>0;)
+            if (((*(buf+i))==0x50) && ((*(buf+i+1))==0x4b) &&
+                ((*(buf+i+2))==0x05) && ((*(buf+i+3))==0x06))
+            {
+                uPosFound = uReadPos+i;
+                break;
+            }
+
+        if (uPosFound!=0)
+            break;
+    }
+    TRYFREE(buf);
+    return uPosFound;
+}
+
+
+/*
+  Locate the Central directory 64 of a zipfile (at the end, just before
+    the global comment)
+*/
+local ZPOS64_T unz64local_SearchCentralDir64 OF((
+    const zlib_filefunc64_32_def* pzlib_filefunc_def,
+    voidpf filestream));
+
+local ZPOS64_T unz64local_SearchCentralDir64(const zlib_filefunc64_32_def* pzlib_filefunc_def,
+                                      voidpf filestream)
+{
+    unsigned char* buf;
+    ZPOS64_T uSizeFile;
+    ZPOS64_T uBackRead;
+    ZPOS64_T uMaxBack=0xffff; /* maximum size of global comment */
+    ZPOS64_T uPosFound=0;
+    uLong uL;
+                ZPOS64_T relativeOffset;
+
+    if (ZSEEK64(*pzlib_filefunc_def,filestream,0,ZLIB_FILEFUNC_SEEK_END) != 0)
+        return 0;
+
+
+    uSizeFile = ZTELL64(*pzlib_filefunc_def,filestream);
+
+    if (uMaxBack>uSizeFile)
+        uMaxBack = uSizeFile;
+
+    buf = (unsigned char*)ALLOC(BUFREADCOMMENT+4);
+    if (buf==NULL)
+        return 0;
+
+    uBackRead = 4;
+    while (uBackRead<uMaxBack)
+    {
+        uLong uReadSize;
+        ZPOS64_T uReadPos;
+        int i;
+        if (uBackRead+BUFREADCOMMENT>uMaxBack)
+            uBackRead = uMaxBack;
+        else
+            uBackRead+=BUFREADCOMMENT;
+        uReadPos = uSizeFile-uBackRead ;
+
+        uReadSize = ((BUFREADCOMMENT+4) < (uSizeFile-uReadPos)) ?
+                     (BUFREADCOMMENT+4) : (uLong)(uSizeFile-uReadPos);
+        if (ZSEEK64(*pzlib_filefunc_def,filestream,uReadPos,ZLIB_FILEFUNC_SEEK_SET)!=0)
+            break;
+
+        if (ZREAD64(*pzlib_filefunc_def,filestream,buf,uReadSize)!=uReadSize)
+            break;
+
+        for (i=(int)uReadSize-3; (i--)>0;)
+            if (((*(buf+i))==0x50) && ((*(buf+i+1))==0x4b) &&
+                ((*(buf+i+2))==0x06) && ((*(buf+i+3))==0x07))
+            {
+                uPosFound = uReadPos+i;
+                break;
+            }
+
+        if (uPosFound!=0)
+            break;
+    }
+    TRYFREE(buf);
+    if (uPosFound == 0)
+        return 0;
+
+    /* Zip64 end of central directory locator */
+    if (ZSEEK64(*pzlib_filefunc_def,filestream, uPosFound,ZLIB_FILEFUNC_SEEK_SET)!=0)
+        return 0;
+
+    /* the signature, already checked */
+    if (unz64local_getLong(pzlib_filefunc_def,filestream,&uL)!=UNZ_OK)
+        return 0;
+
+    /* number of the disk with the start of the zip64 end of  central directory */
+    if (unz64local_getLong(pzlib_filefunc_def,filestream,&uL)!=UNZ_OK)
+        return 0;
+    if (uL != 0)
+        return 0;
+
+    /* relative offset of the zip64 end of central directory record */
+    if (unz64local_getLong64(pzlib_filefunc_def,filestream,&relativeOffset)!=UNZ_OK)
+        return 0;
+
+    /* total number of disks */
+    if (unz64local_getLong(pzlib_filefunc_def,filestream,&uL)!=UNZ_OK)
+        return 0;
+    if (uL != 1)
+        return 0;
+
+    /* Goto end of central directory record */
+    if (ZSEEK64(*pzlib_filefunc_def,filestream, relativeOffset,ZLIB_FILEFUNC_SEEK_SET)!=0)
+        return 0;
+
+     /* the signature */
+    if (unz64local_getLong(pzlib_filefunc_def,filestream,&uL)!=UNZ_OK)
+        return 0;
+
+    if (uL != 0x06064b50)
+        return 0;
+
+    return relativeOffset;
+}
+
+/*
+  Open a Zip file. path contain the full pathname (by example,
+     on a Windows NT computer "c:\\test\\zlib114.zip" or on an Unix computer
+     "zlib/zlib114.zip".
+     If the zipfile cannot be opened (file doesn't exist or in not valid), the
+       return value is NULL.
+     Else, the return value is a unzFile Handle, usable with other function
+       of this unzip package.
+*/
+local unzFile unzOpenInternal (const void *path,
+                               zlib_filefunc64_32_def* pzlib_filefunc64_32_def,
+                               int is64bitOpenFunction)
+{
+    unz64_s us;
+    unz64_s *s;
+    ZPOS64_T central_pos;
+    uLong   uL;
+
+    uLong number_disk;          /* number of the current dist, used for
+                                   spaning ZIP, unsupported, always 0*/
+    uLong number_disk_with_CD;  /* number the the disk with central dir, used
+                                   for spaning ZIP, unsupported, always 0*/
+    ZPOS64_T number_entry_CD;      /* total number of entries in
+                                   the central dir
+                                   (same than number_entry on nospan) */
+
+    int err=UNZ_OK;
+
+    if (unz_copyright[0]!=' ')
+        return NULL;
+
+    us.z_filefunc.zseek32_file = NULL;
+    us.z_filefunc.ztell32_file = NULL;
+    if (pzlib_filefunc64_32_def==NULL)
+        fill_fopen64_filefunc(&us.z_filefunc.zfile_func64);
+    else
+        us.z_filefunc = *pzlib_filefunc64_32_def;
+    us.is64bitOpenFunction = is64bitOpenFunction;
+
+
+
+    us.filestream = ZOPEN64(us.z_filefunc,
+                                                 path,
+                                                 ZLIB_FILEFUNC_MODE_READ |
+                                                 ZLIB_FILEFUNC_MODE_EXISTING);
+    if (us.filestream==NULL)
+        return NULL;
+
+    central_pos = unz64local_SearchCentralDir64(&us.z_filefunc,us.filestream);
+    if (central_pos)
+    {
+        uLong uS;
+        ZPOS64_T uL64;
+
+        us.isZip64 = 1;
+
+        if (ZSEEK64(us.z_filefunc, us.filestream,
+                                      central_pos,ZLIB_FILEFUNC_SEEK_SET)!=0)
+        err=UNZ_ERRNO;
+
+        /* the signature, already checked */
+        if (unz64local_getLong(&us.z_filefunc, us.filestream,&uL)!=UNZ_OK)
+            err=UNZ_ERRNO;
+
+        /* size of zip64 end of central directory record */
+        if (unz64local_getLong64(&us.z_filefunc, us.filestream,&uL64)!=UNZ_OK)
+            err=UNZ_ERRNO;
+
+        /* version made by */
+        if (unz64local_getShort(&us.z_filefunc, us.filestream,&uS)!=UNZ_OK)
+            err=UNZ_ERRNO;
+
+        /* version needed to extract */
+        if (unz64local_getShort(&us.z_filefunc, us.filestream,&uS)!=UNZ_OK)
+            err=UNZ_ERRNO;
+
+        /* number of this disk */
+        if (unz64local_getLong(&us.z_filefunc, us.filestream,&number_disk)!=UNZ_OK)
+            err=UNZ_ERRNO;
+
+        /* number of the disk with the start of the central directory */
+        if (unz64local_getLong(&us.z_filefunc, us.filestream,&number_disk_with_CD)!=UNZ_OK)
+            err=UNZ_ERRNO;
+
+        /* total number of entries in the central directory on this disk */
+        if (unz64local_getLong64(&us.z_filefunc, us.filestream,&us.gi.number_entry)!=UNZ_OK)
+            err=UNZ_ERRNO;
+
+        /* total number of entries in the central directory */
+        if (unz64local_getLong64(&us.z_filefunc, us.filestream,&number_entry_CD)!=UNZ_OK)
+            err=UNZ_ERRNO;
+
+        if ((number_entry_CD!=us.gi.number_entry) ||
+            (number_disk_with_CD!=0) ||
+            (number_disk!=0))
+            err=UNZ_BADZIPFILE;
+
+        /* size of the central directory */
+        if (unz64local_getLong64(&us.z_filefunc, us.filestream,&us.size_central_dir)!=UNZ_OK)
+            err=UNZ_ERRNO;
+
+        /* offset of start of central directory with respect to the
+          starting disk number */
+        if (unz64local_getLong64(&us.z_filefunc, us.filestream,&us.offset_central_dir)!=UNZ_OK)
+            err=UNZ_ERRNO;
+
+        us.gi.size_comment = 0;
+    }
+    else
+    {
+        central_pos = unz64local_SearchCentralDir(&us.z_filefunc,us.filestream);
+        if (central_pos==0)
+            err=UNZ_ERRNO;
+
+        us.isZip64 = 0;
+
+        if (ZSEEK64(us.z_filefunc, us.filestream,
+                                        central_pos,ZLIB_FILEFUNC_SEEK_SET)!=0)
+            err=UNZ_ERRNO;
+
+        /* the signature, already checked */
+        if (unz64local_getLong(&us.z_filefunc, us.filestream,&uL)!=UNZ_OK)
+            err=UNZ_ERRNO;
+
+        /* number of this disk */
+        if (unz64local_getShort(&us.z_filefunc, us.filestream,&number_disk)!=UNZ_OK)
+            err=UNZ_ERRNO;
+
+        /* number of the disk with the start of the central directory */
+        if (unz64local_getShort(&us.z_filefunc, us.filestream,&number_disk_with_CD)!=UNZ_OK)
+            err=UNZ_ERRNO;
+
+        /* total number of entries in the central dir on this disk */
+        if (unz64local_getShort(&us.z_filefunc, us.filestream,&uL)!=UNZ_OK)
+            err=UNZ_ERRNO;
+        us.gi.number_entry = uL;
+
+        /* total number of entries in the central dir */
+        if (unz64local_getShort(&us.z_filefunc, us.filestream,&uL)!=UNZ_OK)
+            err=UNZ_ERRNO;
+        number_entry_CD = uL;
+
+        if ((number_entry_CD!=us.gi.number_entry) ||
+            (number_disk_with_CD!=0) ||
+            (number_disk!=0))
+            err=UNZ_BADZIPFILE;
+
+        /* size of the central directory */
+        if (unz64local_getLong(&us.z_filefunc, us.filestream,&uL)!=UNZ_OK)
+            err=UNZ_ERRNO;
+        us.size_central_dir = uL;
+
+        /* offset of start of central directory with respect to the
+            starting disk number */
+        if (unz64local_getLong(&us.z_filefunc, us.filestream,&uL)!=UNZ_OK)
+            err=UNZ_ERRNO;
+        us.offset_central_dir = uL;
+
+        /* zipfile comment length */
+        if (unz64local_getShort(&us.z_filefunc, us.filestream,&us.gi.size_comment)!=UNZ_OK)
+            err=UNZ_ERRNO;
+    }
+
+    if ((central_pos<us.offset_central_dir+us.size_central_dir) &&
+        (err==UNZ_OK))
+        err=UNZ_BADZIPFILE;
+
+    if (err!=UNZ_OK)
+    {
+        ZCLOSE64(us.z_filefunc, us.filestream);
+        return NULL;
+    }
+
+    us.byte_before_the_zipfile = central_pos -
+                            (us.offset_central_dir+us.size_central_dir);
+    us.central_pos = central_pos;
+    us.pfile_in_zip_read = NULL;
+    us.encrypted = 0;
+
+
+    s=(unz64_s*)ALLOC(sizeof(unz64_s));
+    if( s != NULL)
+    {
+        *s=us;
+        unzGoToFirstFile((unzFile)s);
+    }
+    return (unzFile)s;
+}
+
+
+extern unzFile ZEXPORT unzOpen2 (const char *path,
+                                        zlib_filefunc_def* pzlib_filefunc32_def)
+{
+    if (pzlib_filefunc32_def != NULL)
+    {
+        zlib_filefunc64_32_def zlib_filefunc64_32_def_fill;
+        fill_zlib_filefunc64_32_def_from_filefunc32(&zlib_filefunc64_32_def_fill,pzlib_filefunc32_def);
+        return unzOpenInternal(path, &zlib_filefunc64_32_def_fill, 0);
+    }
+    else
+        return unzOpenInternal(path, NULL, 0);
+}
+
+extern unzFile ZEXPORT unzOpen2_64 (const void *path,
+                                     zlib_filefunc64_def* pzlib_filefunc_def)
+{
+    if (pzlib_filefunc_def != NULL)
+    {
+        zlib_filefunc64_32_def zlib_filefunc64_32_def_fill;
+        zlib_filefunc64_32_def_fill.zfile_func64 = *pzlib_filefunc_def;
+        zlib_filefunc64_32_def_fill.ztell32_file = NULL;
+        zlib_filefunc64_32_def_fill.zseek32_file = NULL;
+        return unzOpenInternal(path, &zlib_filefunc64_32_def_fill, 1);
+    }
+    else
+        return unzOpenInternal(path, NULL, 1);
+}
+
+extern unzFile ZEXPORT unzOpen (const char *path)
+{
+    return unzOpenInternal(path, NULL, 0);
+}
+
+extern unzFile ZEXPORT unzOpen64 (const void *path)
+{
+    return unzOpenInternal(path, NULL, 1);
+}
+
+/*
+  Close a ZipFile opened with unzipOpen.
+  If there is files inside the .Zip opened with unzipOpenCurrentFile (see later),
+    these files MUST be closed with unzipCloseCurrentFile before call unzipClose.
+  return UNZ_OK if there is no problem. */
+extern int ZEXPORT unzClose (unzFile file)
+{
+    unz64_s* s;
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz64_s*)file;
+
+    if (s->pfile_in_zip_read!=NULL)
+        unzCloseCurrentFile(file);
+
+    ZCLOSE64(s->z_filefunc, s->filestream);
+    TRYFREE(s);
+    return UNZ_OK;
+}
+
+
+/*
+  Write info about the ZipFile in the *pglobal_info structure.
+  No preparation of the structure is needed
+  return UNZ_OK if there is no problem. */
+extern int ZEXPORT unzGetGlobalInfo64 (unzFile file, unz_global_info64* pglobal_info)
+{
+    unz64_s* s;
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz64_s*)file;
+    *pglobal_info=s->gi;
+    return UNZ_OK;
+}
+
+extern int ZEXPORT unzGetGlobalInfo (unzFile file, unz_global_info* pglobal_info32)
+{
+    unz64_s* s;
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz64_s*)file;
+    /* to do : check if number_entry is not truncated */
+    pglobal_info32->number_entry = (uLong)s->gi.number_entry;
+    pglobal_info32->size_comment = s->gi.size_comment;
+    return UNZ_OK;
+}
+/*
+   Translate date/time from Dos format to tm_unz (readable more easilty)
+*/
+local void unz64local_DosDateToTmuDate (ZPOS64_T ulDosDate, tm_unz* ptm)
+{
+    ZPOS64_T uDate;
+    uDate = (ZPOS64_T)(ulDosDate>>16);
+    ptm->tm_mday = (uInt)(uDate&0x1f) ;
+    ptm->tm_mon =  (uInt)((((uDate)&0x1E0)/0x20)-1) ;
+    ptm->tm_year = (uInt)(((uDate&0x0FE00)/0x0200)+1980) ;
+
+    ptm->tm_hour = (uInt) ((ulDosDate &0xF800)/0x800);
+    ptm->tm_min =  (uInt) ((ulDosDate&0x7E0)/0x20) ;
+    ptm->tm_sec =  (uInt) (2*(ulDosDate&0x1f)) ;
+}
+
+/*
+  Get Info about the current file in the zipfile, with internal only info
+*/
+local int unz64local_GetCurrentFileInfoInternal OF((unzFile file,
+                                                  unz_file_info64 *pfile_info,
+                                                  unz_file_info64_internal
+                                                  *pfile_info_internal,
+                                                  char *szFileName,
+                                                  uLong fileNameBufferSize,
+                                                  void *extraField,
+                                                  uLong extraFieldBufferSize,
+                                                  char *szComment,
+                                                  uLong commentBufferSize));
+
+local int unz64local_GetCurrentFileInfoInternal (unzFile file,
+                                                  unz_file_info64 *pfile_info,
+                                                  unz_file_info64_internal
+                                                  *pfile_info_internal,
+                                                  char *szFileName,
+                                                  uLong fileNameBufferSize,
+                                                  void *extraField,
+                                                  uLong extraFieldBufferSize,
+                                                  char *szComment,
+                                                  uLong commentBufferSize)
+{
+    unz64_s* s;
+    unz_file_info64 file_info;
+    unz_file_info64_internal file_info_internal;
+    int err=UNZ_OK;
+    uLong uMagic;
+    long lSeek=0;
+    uLong uL;
+
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz64_s*)file;
+    if (ZSEEK64(s->z_filefunc, s->filestream,
+              s->pos_in_central_dir+s->byte_before_the_zipfile,
+              ZLIB_FILEFUNC_SEEK_SET)!=0)
+        err=UNZ_ERRNO;
+
+
+    /* we check the magic */
+    if (err==UNZ_OK)
+    {
+        if (unz64local_getLong(&s->z_filefunc, s->filestream,&uMagic) != UNZ_OK)
+            err=UNZ_ERRNO;
+        else if (uMagic!=0x02014b50)
+            err=UNZ_BADZIPFILE;
+    }
+
+    if (unz64local_getShort(&s->z_filefunc, s->filestream,&file_info.version) != UNZ_OK)
+        err=UNZ_ERRNO;
+
+    if (unz64local_getShort(&s->z_filefunc, s->filestream,&file_info.version_needed) != UNZ_OK)
+        err=UNZ_ERRNO;
+
+    if (unz64local_getShort(&s->z_filefunc, s->filestream,&file_info.flag) != UNZ_OK)
+        err=UNZ_ERRNO;
+
+    if (unz64local_getShort(&s->z_filefunc, s->filestream,&file_info.compression_method) != UNZ_OK)
+        err=UNZ_ERRNO;
+
+    if (unz64local_getLong(&s->z_filefunc, s->filestream,&file_info.dosDate) != UNZ_OK)
+        err=UNZ_ERRNO;
+
+    unz64local_DosDateToTmuDate(file_info.dosDate,&file_info.tmu_date);
+
+    if (unz64local_getLong(&s->z_filefunc, s->filestream,&file_info.crc) != UNZ_OK)
+        err=UNZ_ERRNO;
+
+    if (unz64local_getLong(&s->z_filefunc, s->filestream,&uL) != UNZ_OK)
+        err=UNZ_ERRNO;
+    file_info.compressed_size = uL;
+
+    if (unz64local_getLong(&s->z_filefunc, s->filestream,&uL) != UNZ_OK)
+        err=UNZ_ERRNO;
+    file_info.uncompressed_size = uL;
+
+    if (unz64local_getShort(&s->z_filefunc, s->filestream,&file_info.size_filename) != UNZ_OK)
+        err=UNZ_ERRNO;
+
+    if (unz64local_getShort(&s->z_filefunc, s->filestream,&file_info.size_file_extra) != UNZ_OK)
+        err=UNZ_ERRNO;
+
+    if (unz64local_getShort(&s->z_filefunc, s->filestream,&file_info.size_file_comment) != UNZ_OK)
+        err=UNZ_ERRNO;
+
+    if (unz64local_getShort(&s->z_filefunc, s->filestream,&file_info.disk_num_start) != UNZ_OK)
+        err=UNZ_ERRNO;
+
+    if (unz64local_getShort(&s->z_filefunc, s->filestream,&file_info.internal_fa) != UNZ_OK)
+        err=UNZ_ERRNO;
+
+    if (unz64local_getLong(&s->z_filefunc, s->filestream,&file_info.external_fa) != UNZ_OK)
+        err=UNZ_ERRNO;
+
+                // relative offset of local header
+    if (unz64local_getLong(&s->z_filefunc, s->filestream,&uL) != UNZ_OK)
+        err=UNZ_ERRNO;
+    file_info_internal.offset_curfile = uL;
+
+    lSeek+=file_info.size_filename;
+    if ((err==UNZ_OK) && (szFileName!=NULL))
+    {
+        uLong uSizeRead ;
+        if (file_info.size_filename<fileNameBufferSize)
+        {
+            *(szFileName+file_info.size_filename)='\0';
+            uSizeRead = file_info.size_filename;
+        }
+        else
+            uSizeRead = fileNameBufferSize;
+
+        if ((file_info.size_filename>0) && (fileNameBufferSize>0))
+            if (ZREAD64(s->z_filefunc, s->filestream,szFileName,uSizeRead)!=uSizeRead)
+                err=UNZ_ERRNO;
+        lSeek -= uSizeRead;
+    }
+
+    // Read extrafield
+    if ((err==UNZ_OK) && (extraField!=NULL))
+    {
+        ZPOS64_T uSizeRead ;
+        if (file_info.size_file_extra<extraFieldBufferSize)
+            uSizeRead = file_info.size_file_extra;
+        else
+            uSizeRead = extraFieldBufferSize;
+
+        if (lSeek!=0)
+        {
+            if (ZSEEK64(s->z_filefunc, s->filestream,lSeek,ZLIB_FILEFUNC_SEEK_CUR)==0)
+                lSeek=0;
+            else
+                err=UNZ_ERRNO;
+        }
+
+        if ((file_info.size_file_extra>0) && (extraFieldBufferSize>0))
+            if (ZREAD64(s->z_filefunc, s->filestream,extraField,(uLong)uSizeRead)!=uSizeRead)
+                err=UNZ_ERRNO;
+
+        lSeek += file_info.size_file_extra - (uLong)uSizeRead;
+    }
+    else
+        lSeek += file_info.size_file_extra;
+
+
+    if ((err==UNZ_OK) && (file_info.size_file_extra != 0))
+    {
+                                uLong acc = 0;
+
+        // since lSeek now points to after the extra field we need to move back
+        lSeek -= file_info.size_file_extra;
+
+        if (lSeek!=0)
+        {
+            if (ZSEEK64(s->z_filefunc, s->filestream,lSeek,ZLIB_FILEFUNC_SEEK_CUR)==0)
+                lSeek=0;
+            else
+                err=UNZ_ERRNO;
+        }
+
+        while(acc < file_info.size_file_extra)
+        {
+            uLong headerId;
+                                                uLong dataSize;
+
+            if (unz64local_getShort(&s->z_filefunc, s->filestream,&headerId) != UNZ_OK)
+                err=UNZ_ERRNO;
+
+            if (unz64local_getShort(&s->z_filefunc, s->filestream,&dataSize) != UNZ_OK)
+                err=UNZ_ERRNO;
+
+            /* ZIP64 extra fields */
+            if (headerId == 0x0001)
+            {
+                                                        uLong uL;
+
+                                                                if(file_info.uncompressed_size == (ZPOS64_T)(unsigned long)-1)
+                                                                {
+                                                                        if (unz64local_getLong64(&s->z_filefunc, s->filestream,&file_info.uncompressed_size) != UNZ_OK)
+                                                                                        err=UNZ_ERRNO;
+                                                                }
+
+                                                                if(file_info.compressed_size == (ZPOS64_T)(unsigned long)-1)
+                                                                {
+                                                                        if (unz64local_getLong64(&s->z_filefunc, s->filestream,&file_info.compressed_size) != UNZ_OK)
+                                                                                  err=UNZ_ERRNO;
+                                                                }
+
+                                                                if(file_info_internal.offset_curfile == (ZPOS64_T)(unsigned long)-1)
+                                                                {
+                                                                        /* Relative Header offset */
+                                                                        if (unz64local_getLong64(&s->z_filefunc, s->filestream,&file_info_internal.offset_curfile) != UNZ_OK)
+                                                                                err=UNZ_ERRNO;
+                                                                }
+
+                                                                if(file_info.disk_num_start == (unsigned long)-1)
+                                                                {
+                                                                        /* Disk Start Number */
+                                                                        if (unz64local_getLong(&s->z_filefunc, s->filestream,&uL) != UNZ_OK)
+                                                                                err=UNZ_ERRNO;
+                                                                }
+
+            }
+            else
+            {
+                if (ZSEEK64(s->z_filefunc, s->filestream,dataSize,ZLIB_FILEFUNC_SEEK_CUR)!=0)
+                    err=UNZ_ERRNO;
+            }
+
+            acc += 2 + 2 + dataSize;
+        }
+    }
+
+    if ((err==UNZ_OK) && (szComment!=NULL))
+    {
+        uLong uSizeRead ;
+        if (file_info.size_file_comment<commentBufferSize)
+        {
+            *(szComment+file_info.size_file_comment)='\0';
+            uSizeRead = file_info.size_file_comment;
+        }
+        else
+            uSizeRead = commentBufferSize;
+
+        if (lSeek!=0)
+        {
+            if (ZSEEK64(s->z_filefunc, s->filestream,lSeek,ZLIB_FILEFUNC_SEEK_CUR)==0)
+                lSeek=0;
+            else
+                err=UNZ_ERRNO;
+        }
+
+        if ((file_info.size_file_comment>0) && (commentBufferSize>0))
+            if (ZREAD64(s->z_filefunc, s->filestream,szComment,uSizeRead)!=uSizeRead)
+                err=UNZ_ERRNO;
+        lSeek+=file_info.size_file_comment - uSizeRead;
+    }
+    else
+        lSeek+=file_info.size_file_comment;
+
+
+    if ((err==UNZ_OK) && (pfile_info!=NULL))
+        *pfile_info=file_info;
+
+    if ((err==UNZ_OK) && (pfile_info_internal!=NULL))
+        *pfile_info_internal=file_info_internal;
+
+    return err;
+}
+
+
+
+/*
+  Write info about the ZipFile in the *pglobal_info structure.
+  No preparation of the structure is needed
+  return UNZ_OK if there is no problem.
+*/
+extern int ZEXPORT unzGetCurrentFileInfo64 (unzFile file,
+                                          unz_file_info64 * pfile_info,
+                                          char * szFileName, uLong fileNameBufferSize,
+                                          void *extraField, uLong extraFieldBufferSize,
+                                          char* szComment,  uLong commentBufferSize)
+{
+    return unz64local_GetCurrentFileInfoInternal(file,pfile_info,NULL,
+                                                szFileName,fileNameBufferSize,
+                                                extraField,extraFieldBufferSize,
+                                                szComment,commentBufferSize);
+}
+
+extern int ZEXPORT unzGetCurrentFileInfo (unzFile file,
+                                          unz_file_info * pfile_info,
+                                          char * szFileName, uLong fileNameBufferSize,
+                                          void *extraField, uLong extraFieldBufferSize,
+                                          char* szComment,  uLong commentBufferSize)
+{
+    int err;
+    unz_file_info64 file_info64;
+    err = unz64local_GetCurrentFileInfoInternal(file,&file_info64,NULL,
+                                                szFileName,fileNameBufferSize,
+                                                extraField,extraFieldBufferSize,
+                                                szComment,commentBufferSize);
+    if (err==UNZ_OK)
+    {
+        pfile_info->version = file_info64.version;
+        pfile_info->version_needed = file_info64.version_needed;
+        pfile_info->flag = file_info64.flag;
+        pfile_info->compression_method = file_info64.compression_method;
+        pfile_info->dosDate = file_info64.dosDate;
+        pfile_info->crc = file_info64.crc;
+
+        pfile_info->size_filename = file_info64.size_filename;
+        pfile_info->size_file_extra = file_info64.size_file_extra;
+        pfile_info->size_file_comment = file_info64.size_file_comment;
+
+        pfile_info->disk_num_start = file_info64.disk_num_start;
+        pfile_info->internal_fa = file_info64.internal_fa;
+        pfile_info->external_fa = file_info64.external_fa;
+
+        pfile_info->tmu_date = file_info64.tmu_date,
+
+
+        pfile_info->compressed_size = (uLong)file_info64.compressed_size;
+        pfile_info->uncompressed_size = (uLong)file_info64.uncompressed_size;
+
+    }
+    return err;
+}
+/*
+  Set the current file of the zipfile to the first file.
+  return UNZ_OK if there is no problem
+*/
+extern int ZEXPORT unzGoToFirstFile (unzFile file)
+{
+    int err=UNZ_OK;
+    unz64_s* s;
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz64_s*)file;
+    s->pos_in_central_dir=s->offset_central_dir;
+    s->num_file=0;
+    err=unz64local_GetCurrentFileInfoInternal(file,&s->cur_file_info,
+                                             &s->cur_file_info_internal,
+                                             NULL,0,NULL,0,NULL,0);
+    s->current_file_ok = (err == UNZ_OK);
+    return err;
+}
+
+/*
+  Set the current file of the zipfile to the next file.
+  return UNZ_OK if there is no problem
+  return UNZ_END_OF_LIST_OF_FILE if the actual file was the latest.
+*/
+extern int ZEXPORT unzGoToNextFile (unzFile  file)
+{
+    unz64_s* s;
+    int err;
+
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz64_s*)file;
+    if (!s->current_file_ok)
+        return UNZ_END_OF_LIST_OF_FILE;
+    if (s->gi.number_entry != 0xffff)    /* 2^16 files overflow hack */
+      if (s->num_file+1==s->gi.number_entry)
+        return UNZ_END_OF_LIST_OF_FILE;
+
+    s->pos_in_central_dir += SIZECENTRALDIRITEM + s->cur_file_info.size_filename +
+            s->cur_file_info.size_file_extra + s->cur_file_info.size_file_comment ;
+    s->num_file++;
+    err = unz64local_GetCurrentFileInfoInternal(file,&s->cur_file_info,
+                                               &s->cur_file_info_internal,
+                                               NULL,0,NULL,0,NULL,0);
+    s->current_file_ok = (err == UNZ_OK);
+    return err;
+}
+
+
+/*
+  Try locate the file szFileName in the zipfile.
+  For the iCaseSensitivity signification, see unzipStringFileNameCompare
+
+  return value :
+  UNZ_OK if the file is found. It becomes the current file.
+  UNZ_END_OF_LIST_OF_FILE if the file is not found
+*/
+extern int ZEXPORT unzLocateFile (unzFile file, const char *szFileName, int iCaseSensitivity)
+{
+    unz64_s* s;
+    int err;
+
+    /* We remember the 'current' position in the file so that we can jump
+     * back there if we fail.
+     */
+    unz_file_info64 cur_file_infoSaved;
+    unz_file_info64_internal cur_file_info_internalSaved;
+    ZPOS64_T num_fileSaved;
+    ZPOS64_T pos_in_central_dirSaved;
+
+
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+
+    if (strlen(szFileName)>=UNZ_MAXFILENAMEINZIP)
+        return UNZ_PARAMERROR;
+
+    s=(unz64_s*)file;
+    if (!s->current_file_ok)
+        return UNZ_END_OF_LIST_OF_FILE;
+
+    /* Save the current state */
+    num_fileSaved = s->num_file;
+    pos_in_central_dirSaved = s->pos_in_central_dir;
+    cur_file_infoSaved = s->cur_file_info;
+    cur_file_info_internalSaved = s->cur_file_info_internal;
+
+    err = unzGoToFirstFile(file);
+
+    while (err == UNZ_OK)
+    {
+        char szCurrentFileName[UNZ_MAXFILENAMEINZIP+1];
+        err = unzGetCurrentFileInfo64(file,NULL,
+                                    szCurrentFileName,sizeof(szCurrentFileName)-1,
+                                    NULL,0,NULL,0);
+        if (err == UNZ_OK)
+        {
+            if (unzStringFileNameCompare(szCurrentFileName,
+                                            szFileName,iCaseSensitivity)==0)
+                return UNZ_OK;
+            err = unzGoToNextFile(file);
+        }
+    }
+
+    /* We failed, so restore the state of the 'current file' to where we
+     * were.
+     */
+    s->num_file = num_fileSaved ;
+    s->pos_in_central_dir = pos_in_central_dirSaved ;
+    s->cur_file_info = cur_file_infoSaved;
+    s->cur_file_info_internal = cur_file_info_internalSaved;
+    return err;
+}
+
+
+/*
+///////////////////////////////////////////
+// Contributed by Ryan Haksi (mailto://cryogen@infoserve.net)
+// I need random access
+//
+// Further optimization could be realized by adding an ability
+// to cache the directory in memory. The goal being a single
+// comprehensive file read to put the file I need in a memory.
+*/
+
+/*
+typedef struct unz_file_pos_s
+{
+    ZPOS64_T pos_in_zip_directory;   // offset in file
+    ZPOS64_T num_of_file;            // # of file
+} unz_file_pos;
+*/
+
+extern int ZEXPORT unzGetFilePos64(unzFile file, unz64_file_pos*  file_pos)
+{
+    unz64_s* s;
+
+    if (file==NULL || file_pos==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz64_s*)file;
+    if (!s->current_file_ok)
+        return UNZ_END_OF_LIST_OF_FILE;
+
+    file_pos->pos_in_zip_directory  = s->pos_in_central_dir;
+    file_pos->num_of_file           = s->num_file;
+
+    return UNZ_OK;
+}
+
+extern int ZEXPORT unzGetFilePos(
+    unzFile file,
+    unz_file_pos* file_pos)
+{
+    unz64_file_pos file_pos64;
+    int err = unzGetFilePos64(file,&file_pos64);
+    if (err==UNZ_OK)
+    {
+        file_pos->pos_in_zip_directory = (uLong)file_pos64.pos_in_zip_directory;
+        file_pos->num_of_file = (uLong)file_pos64.num_of_file;
+    }
+    return err;
+}
+
+extern int ZEXPORT unzGoToFilePos64(unzFile file, const unz64_file_pos* file_pos)
+{
+    unz64_s* s;
+    int err;
+
+    if (file==NULL || file_pos==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz64_s*)file;
+
+    /* jump to the right spot */
+    s->pos_in_central_dir = file_pos->pos_in_zip_directory;
+    s->num_file           = file_pos->num_of_file;
+
+    /* set the current file */
+    err = unz64local_GetCurrentFileInfoInternal(file,&s->cur_file_info,
+                                               &s->cur_file_info_internal,
+                                               NULL,0,NULL,0,NULL,0);
+    /* return results */
+    s->current_file_ok = (err == UNZ_OK);
+    return err;
+}
+
+extern int ZEXPORT unzGoToFilePos(
+    unzFile file,
+    unz_file_pos* file_pos)
+{
+    unz64_file_pos file_pos64;
+    if (file_pos == NULL)
+        return UNZ_PARAMERROR;
+
+    file_pos64.pos_in_zip_directory = file_pos->pos_in_zip_directory;
+    file_pos64.num_of_file = file_pos->num_of_file;
+    return unzGoToFilePos64(file,&file_pos64);
+}
+
+/*
+// Unzip Helper Functions - should be here?
+///////////////////////////////////////////
+*/
+
+/*
+  Read the local header of the current zipfile
+  Check the coherency of the local header and info in the end of central
+        directory about this file
+  store in *piSizeVar the size of extra info in local header
+        (filename and size of extra field data)
+*/
+local int unz64local_CheckCurrentFileCoherencyHeader (unz64_s* s, uInt* piSizeVar,
+                                                    ZPOS64_T * poffset_local_extrafield,
+                                                    uInt  * psize_local_extrafield)
+{
+    uLong uMagic,uData,uFlags;
+    uLong size_filename;
+    uLong size_extra_field;
+    int err=UNZ_OK;
+
+    *piSizeVar = 0;
+    *poffset_local_extrafield = 0;
+    *psize_local_extrafield = 0;
+
+    if (ZSEEK64(s->z_filefunc, s->filestream,s->cur_file_info_internal.offset_curfile +
+                                s->byte_before_the_zipfile,ZLIB_FILEFUNC_SEEK_SET)!=0)
+        return UNZ_ERRNO;
+
+
+    if (err==UNZ_OK)
+    {
+        if (unz64local_getLong(&s->z_filefunc, s->filestream,&uMagic) != UNZ_OK)
+            err=UNZ_ERRNO;
+        else if (uMagic!=0x04034b50)
+            err=UNZ_BADZIPFILE;
+    }
+
+    if (unz64local_getShort(&s->z_filefunc, s->filestream,&uData) != UNZ_OK)
+        err=UNZ_ERRNO;
+/*
+    else if ((err==UNZ_OK) && (uData!=s->cur_file_info.wVersion))
+        err=UNZ_BADZIPFILE;
+*/
+    if (unz64local_getShort(&s->z_filefunc, s->filestream,&uFlags) != UNZ_OK)
+        err=UNZ_ERRNO;
+
+    if (unz64local_getShort(&s->z_filefunc, s->filestream,&uData) != UNZ_OK)
+        err=UNZ_ERRNO;
+    else if ((err==UNZ_OK) && (uData!=s->cur_file_info.compression_method))
+        err=UNZ_BADZIPFILE;
+
+    if ((err==UNZ_OK) && (s->cur_file_info.compression_method!=0) &&
+/* #ifdef HAVE_BZIP2 */
+                         (s->cur_file_info.compression_method!=Z_BZIP2ED) &&
+/* #endif */
+                         (s->cur_file_info.compression_method!=Z_DEFLATED))
+        err=UNZ_BADZIPFILE;
+
+    if (unz64local_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* date/time */
+        err=UNZ_ERRNO;
+
+    if (unz64local_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* crc */
+        err=UNZ_ERRNO;
+    else if ((err==UNZ_OK) && (uData!=s->cur_file_info.crc) && ((uFlags & 8)==0))
+        err=UNZ_BADZIPFILE;
+
+    if (unz64local_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* size compr */
+        err=UNZ_ERRNO;
+    else if (uData != 0xFFFFFFFF && (err==UNZ_OK) && (uData!=s->cur_file_info.compressed_size) && ((uFlags & 8)==0))
+        err=UNZ_BADZIPFILE;
+
+    if (unz64local_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* size uncompr */
+        err=UNZ_ERRNO;
+    else if (uData != 0xFFFFFFFF && (err==UNZ_OK) && (uData!=s->cur_file_info.uncompressed_size) && ((uFlags & 8)==0))
+        err=UNZ_BADZIPFILE;
+
+    if (unz64local_getShort(&s->z_filefunc, s->filestream,&size_filename) != UNZ_OK)
+        err=UNZ_ERRNO;
+    else if ((err==UNZ_OK) && (size_filename!=s->cur_file_info.size_filename))
+        err=UNZ_BADZIPFILE;
+
+    *piSizeVar += (uInt)size_filename;
+
+    if (unz64local_getShort(&s->z_filefunc, s->filestream,&size_extra_field) != UNZ_OK)
+        err=UNZ_ERRNO;
+    *poffset_local_extrafield= s->cur_file_info_internal.offset_curfile +
+                                    SIZEZIPLOCALHEADER + size_filename;
+    *psize_local_extrafield = (uInt)size_extra_field;
+
+    *piSizeVar += (uInt)size_extra_field;
+
+    return err;
+}
+
+/*
+  Open for reading data the current file in the zipfile.
+  If there is no error and the file is opened, the return value is UNZ_OK.
+*/
+extern int ZEXPORT unzOpenCurrentFile3 (unzFile file, int* method,
+                                            int* level, int raw, const char* password)
+{
+    int err=UNZ_OK;
+    uInt iSizeVar;
+    unz64_s* s;
+    file_in_zip64_read_info_s* pfile_in_zip_read_info;
+    ZPOS64_T offset_local_extrafield;  /* offset of the local extra field */
+    uInt  size_local_extrafield;    /* size of the local extra field */
+#    ifndef NOUNCRYPT
+    char source[12];
+#    else
+    if (password != NULL)
+        return UNZ_PARAMERROR;
+#    endif
+
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz64_s*)file;
+    if (!s->current_file_ok)
+        return UNZ_PARAMERROR;
+
+    if (s->pfile_in_zip_read != NULL)
+        unzCloseCurrentFile(file);
+
+    if (unz64local_CheckCurrentFileCoherencyHeader(s,&iSizeVar, &offset_local_extrafield,&size_local_extrafield)!=UNZ_OK)
+        return UNZ_BADZIPFILE;
+
+    pfile_in_zip_read_info = (file_in_zip64_read_info_s*)ALLOC(sizeof(file_in_zip64_read_info_s));
+    if (pfile_in_zip_read_info==NULL)
+        return UNZ_INTERNALERROR;
+
+    pfile_in_zip_read_info->read_buffer=(char*)ALLOC(UNZ_BUFSIZE);
+    pfile_in_zip_read_info->offset_local_extrafield = offset_local_extrafield;
+    pfile_in_zip_read_info->size_local_extrafield = size_local_extrafield;
+    pfile_in_zip_read_info->pos_local_extrafield=0;
+    pfile_in_zip_read_info->raw=raw;
+
+    if (pfile_in_zip_read_info->read_buffer==NULL)
+    {
+        TRYFREE(pfile_in_zip_read_info);
+        return UNZ_INTERNALERROR;
+    }
+
+    pfile_in_zip_read_info->stream_initialised=0;
+
+    if (method!=NULL)
+        *method = (int)s->cur_file_info.compression_method;
+
+    if (level!=NULL)
+    {
+        *level = 6;
+        switch (s->cur_file_info.flag & 0x06)
+        {
+          case 6 : *level = 1; break;
+          case 4 : *level = 2; break;
+          case 2 : *level = 9; break;
+        }
+    }
+
+    if ((s->cur_file_info.compression_method!=0) &&
+/* #ifdef HAVE_BZIP2 */
+        (s->cur_file_info.compression_method!=Z_BZIP2ED) &&
+/* #endif */
+        (s->cur_file_info.compression_method!=Z_DEFLATED))
+
+        err=UNZ_BADZIPFILE;
+
+    pfile_in_zip_read_info->crc32_wait=s->cur_file_info.crc;
+    pfile_in_zip_read_info->crc32=0;
+    pfile_in_zip_read_info->total_out_64=0;
+    pfile_in_zip_read_info->compression_method = s->cur_file_info.compression_method;
+    pfile_in_zip_read_info->filestream=s->filestream;
+    pfile_in_zip_read_info->z_filefunc=s->z_filefunc;
+    pfile_in_zip_read_info->byte_before_the_zipfile=s->byte_before_the_zipfile;
+
+    pfile_in_zip_read_info->stream.total_out = 0;
+
+    if ((s->cur_file_info.compression_method==Z_BZIP2ED) && (!raw))
+    {
+#ifdef HAVE_BZIP2
+      pfile_in_zip_read_info->bstream.bzalloc = (void *(*) (void *, int, int))0;
+      pfile_in_zip_read_info->bstream.bzfree = (free_func)0;
+      pfile_in_zip_read_info->bstream.opaque = (voidpf)0;
+      pfile_in_zip_read_info->bstream.state = (voidpf)0;
+
+      pfile_in_zip_read_info->stream.zalloc = (alloc_func)0;
+      pfile_in_zip_read_info->stream.zfree = (free_func)0;
+      pfile_in_zip_read_info->stream.opaque = (voidpf)0;
+      pfile_in_zip_read_info->stream.next_in = (voidpf)0;
+      pfile_in_zip_read_info->stream.avail_in = 0;
+
+      err=BZ2_bzDecompressInit(&pfile_in_zip_read_info->bstream, 0, 0);
+      if (err == Z_OK)
+        pfile_in_zip_read_info->stream_initialised=Z_BZIP2ED;
+      else
+      {
+        TRYFREE(pfile_in_zip_read_info);
+        return err;
+      }
+#else
+      pfile_in_zip_read_info->raw=1;
+#endif
+    }
+    else if ((s->cur_file_info.compression_method==Z_DEFLATED) && (!raw))
+    {
+      pfile_in_zip_read_info->stream.zalloc = (alloc_func)0;
+      pfile_in_zip_read_info->stream.zfree = (free_func)0;
+      pfile_in_zip_read_info->stream.opaque = (voidpf)0;
+      pfile_in_zip_read_info->stream.next_in = 0;
+      pfile_in_zip_read_info->stream.avail_in = 0;
+
+      err=inflateInit2(&pfile_in_zip_read_info->stream, -MAX_WBITS);
+      if (err == Z_OK)
+        pfile_in_zip_read_info->stream_initialised=Z_DEFLATED;
+      else
+      {
+        TRYFREE(pfile_in_zip_read_info);
+        return err;
+      }
+        /* windowBits is passed < 0 to tell that there is no zlib header.
+         * Note that in this case inflate *requires* an extra "dummy" byte
+         * after the compressed stream in order to complete decompression and
+         * return Z_STREAM_END.
+         * In unzip, i don't wait absolutely Z_STREAM_END because I known the
+         * size of both compressed and uncompressed data
+         */
+    }
+    pfile_in_zip_read_info->rest_read_compressed =
+            s->cur_file_info.compressed_size ;
+    pfile_in_zip_read_info->rest_read_uncompressed =
+            s->cur_file_info.uncompressed_size ;
+
+
+    pfile_in_zip_read_info->pos_in_zipfile =
+            s->cur_file_info_internal.offset_curfile + SIZEZIPLOCALHEADER +
+              iSizeVar;
+
+    pfile_in_zip_read_info->stream.avail_in = (uInt)0;
+
+    s->pfile_in_zip_read = pfile_in_zip_read_info;
+                s->encrypted = 0;
+
+#    ifndef NOUNCRYPT
+    if (password != NULL)
+    {
+        int i;
+        s->pcrc_32_tab = get_crc_table();
+        init_keys(password,s->keys,s->pcrc_32_tab);
+        if (ZSEEK64(s->z_filefunc, s->filestream,
+                  s->pfile_in_zip_read->pos_in_zipfile +
+                     s->pfile_in_zip_read->byte_before_the_zipfile,
+                  SEEK_SET)!=0)
+            return UNZ_INTERNALERROR;
+        if(ZREAD64(s->z_filefunc, s->filestream,source, 12)<12)
+            return UNZ_INTERNALERROR;
+
+        for (i = 0; i<12; i++)
+            zdecode(s->keys,s->pcrc_32_tab,source[i]);
+
+        s->pfile_in_zip_read->pos_in_zipfile+=12;
+        s->encrypted=1;
+    }
+#    endif
+
+
+    return UNZ_OK;
+}
+
+extern int ZEXPORT unzOpenCurrentFile (unzFile file)
+{
+    return unzOpenCurrentFile3(file, NULL, NULL, 0, NULL);
+}
+
+extern int ZEXPORT unzOpenCurrentFilePassword (unzFile file, const char*  password)
+{
+    return unzOpenCurrentFile3(file, NULL, NULL, 0, password);
+}
+
+extern int ZEXPORT unzOpenCurrentFile2 (unzFile file, int* method, int* level, int raw)
+{
+    return unzOpenCurrentFile3(file, method, level, raw, NULL);
+}
+
+/** Addition for GDAL : START */
+
+extern ZPOS64_T ZEXPORT unzGetCurrentFileZStreamPos64( unzFile file)
+{
+    unz64_s* s;
+    file_in_zip64_read_info_s* pfile_in_zip_read_info;
+    s=(unz64_s*)file;
+    if (file==NULL)
+        return 0; //UNZ_PARAMERROR;
+    pfile_in_zip_read_info=s->pfile_in_zip_read;
+    if (pfile_in_zip_read_info==NULL)
+        return 0; //UNZ_PARAMERROR;
+    return pfile_in_zip_read_info->pos_in_zipfile +
+                         pfile_in_zip_read_info->byte_before_the_zipfile;
+}
+
+/** Addition for GDAL : END */
+
+/*
+  Read bytes from the current file.
+  buf contain buffer where data must be copied
+  len the size of buf.
+
+  return the number of byte copied if somes bytes are copied
+  return 0 if the end of file was reached
+  return <0 with error code if there is an error
+    (UNZ_ERRNO for IO error, or zLib error for uncompress error)
+*/
+extern int ZEXPORT unzReadCurrentFile  (unzFile file, voidp buf, unsigned len)
+{
+    int err=UNZ_OK;
+    uInt iRead = 0;
+    unz64_s* s;
+    file_in_zip64_read_info_s* pfile_in_zip_read_info;
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz64_s*)file;
+    pfile_in_zip_read_info=s->pfile_in_zip_read;
+
+    if (pfile_in_zip_read_info==NULL)
+        return UNZ_PARAMERROR;
+
+
+    if ((pfile_in_zip_read_info->read_buffer == NULL))
+        return UNZ_END_OF_LIST_OF_FILE;
+    if (len==0)
+        return 0;
+
+    pfile_in_zip_read_info->stream.next_out = (Bytef*)buf;
+
+    pfile_in_zip_read_info->stream.avail_out = (uInt)len;
+
+    if ((len>pfile_in_zip_read_info->rest_read_uncompressed) &&
+        (!(pfile_in_zip_read_info->raw)))
+        pfile_in_zip_read_info->stream.avail_out =
+            (uInt)pfile_in_zip_read_info->rest_read_uncompressed;
+
+    if ((len>pfile_in_zip_read_info->rest_read_compressed+
+           pfile_in_zip_read_info->stream.avail_in) &&
+         (pfile_in_zip_read_info->raw))
+        pfile_in_zip_read_info->stream.avail_out =
+            (uInt)pfile_in_zip_read_info->rest_read_compressed+
+            pfile_in_zip_read_info->stream.avail_in;
+
+    while (pfile_in_zip_read_info->stream.avail_out>0)
+    {
+        if ((pfile_in_zip_read_info->stream.avail_in==0) &&
+            (pfile_in_zip_read_info->rest_read_compressed>0))
+        {
+            uInt uReadThis = UNZ_BUFSIZE;
+            if (pfile_in_zip_read_info->rest_read_compressed<uReadThis)
+                uReadThis = (uInt)pfile_in_zip_read_info->rest_read_compressed;
+            if (uReadThis == 0)
+                return UNZ_EOF;
+            if (ZSEEK64(pfile_in_zip_read_info->z_filefunc,
+                      pfile_in_zip_read_info->filestream,
+                      pfile_in_zip_read_info->pos_in_zipfile +
+                         pfile_in_zip_read_info->byte_before_the_zipfile,
+                         ZLIB_FILEFUNC_SEEK_SET)!=0)
+                return UNZ_ERRNO;
+            if (ZREAD64(pfile_in_zip_read_info->z_filefunc,
+                      pfile_in_zip_read_info->filestream,
+                      pfile_in_zip_read_info->read_buffer,
+                      uReadThis)!=uReadThis)
+                return UNZ_ERRNO;
+
+
+#            ifndef NOUNCRYPT
+            if(s->encrypted)
+            {
+                uInt i;
+                for(i=0;i<uReadThis;i++)
+                  pfile_in_zip_read_info->read_buffer[i] =
+                      zdecode(s->keys,s->pcrc_32_tab,
+                              pfile_in_zip_read_info->read_buffer[i]);
+            }
+#            endif
+
+
+            pfile_in_zip_read_info->pos_in_zipfile += uReadThis;
+
+            pfile_in_zip_read_info->rest_read_compressed-=uReadThis;
+
+            pfile_in_zip_read_info->stream.next_in =
+                (Bytef*)pfile_in_zip_read_info->read_buffer;
+            pfile_in_zip_read_info->stream.avail_in = (uInt)uReadThis;
+        }
+
+        if ((pfile_in_zip_read_info->compression_method==0) || (pfile_in_zip_read_info->raw))
+        {
+            uInt uDoCopy,i ;
+
+            if ((pfile_in_zip_read_info->stream.avail_in == 0) &&
+                (pfile_in_zip_read_info->rest_read_compressed == 0))
+                return (iRead==0) ? UNZ_EOF : iRead;
+
+            if (pfile_in_zip_read_info->stream.avail_out <
+                            pfile_in_zip_read_info->stream.avail_in)
+                uDoCopy = pfile_in_zip_read_info->stream.avail_out ;
+            else
+                uDoCopy = pfile_in_zip_read_info->stream.avail_in ;
+
+            for (i=0;i<uDoCopy;i++)
+                *(pfile_in_zip_read_info->stream.next_out+i) =
+                        *(pfile_in_zip_read_info->stream.next_in+i);
+
+            pfile_in_zip_read_info->total_out_64 = pfile_in_zip_read_info->total_out_64 + uDoCopy;
+
+            pfile_in_zip_read_info->crc32 = crc32(pfile_in_zip_read_info->crc32,
+                                pfile_in_zip_read_info->stream.next_out,
+                                uDoCopy);
+            pfile_in_zip_read_info->rest_read_uncompressed-=uDoCopy;
+            pfile_in_zip_read_info->stream.avail_in -= uDoCopy;
+            pfile_in_zip_read_info->stream.avail_out -= uDoCopy;
+            pfile_in_zip_read_info->stream.next_out += uDoCopy;
+            pfile_in_zip_read_info->stream.next_in += uDoCopy;
+            pfile_in_zip_read_info->stream.total_out += uDoCopy;
+            iRead += uDoCopy;
+        }
+        else if (pfile_in_zip_read_info->compression_method==Z_BZIP2ED)
+        {
+#ifdef HAVE_BZIP2
+            uLong uTotalOutBefore,uTotalOutAfter;
+            const Bytef *bufBefore;
+            uLong uOutThis;
+
+            pfile_in_zip_read_info->bstream.next_in        = (char*)pfile_in_zip_read_info->stream.next_in;
+            pfile_in_zip_read_info->bstream.avail_in       = pfile_in_zip_read_info->stream.avail_in;
+            pfile_in_zip_read_info->bstream.total_in_lo32  = pfile_in_zip_read_info->stream.total_in;
+            pfile_in_zip_read_info->bstream.total_in_hi32  = 0;
+            pfile_in_zip_read_info->bstream.next_out       = (char*)pfile_in_zip_read_info->stream.next_out;
+            pfile_in_zip_read_info->bstream.avail_out      = pfile_in_zip_read_info->stream.avail_out;
+            pfile_in_zip_read_info->bstream.total_out_lo32 = pfile_in_zip_read_info->stream.total_out;
+            pfile_in_zip_read_info->bstream.total_out_hi32 = 0;
+
+            uTotalOutBefore = pfile_in_zip_read_info->bstream.total_out_lo32;
+            bufBefore = (const Bytef *)pfile_in_zip_read_info->bstream.next_out;
+
+            err=BZ2_bzDecompress(&pfile_in_zip_read_info->bstream);
+
+            uTotalOutAfter = pfile_in_zip_read_info->bstream.total_out_lo32;
+            uOutThis = uTotalOutAfter-uTotalOutBefore;
+
+            pfile_in_zip_read_info->total_out_64 = pfile_in_zip_read_info->total_out_64 + uOutThis;
+
+            pfile_in_zip_read_info->crc32 = crc32(pfile_in_zip_read_info->crc32,bufBefore, (uInt)(uOutThis));
+            pfile_in_zip_read_info->rest_read_uncompressed -= uOutThis;
+            iRead += (uInt)(uTotalOutAfter - uTotalOutBefore);
+
+            pfile_in_zip_read_info->stream.next_in   = (Bytef*)pfile_in_zip_read_info->bstream.next_in;
+            pfile_in_zip_read_info->stream.avail_in  = pfile_in_zip_read_info->bstream.avail_in;
+            pfile_in_zip_read_info->stream.total_in  = pfile_in_zip_read_info->bstream.total_in_lo32;
+            pfile_in_zip_read_info->stream.next_out  = (Bytef*)pfile_in_zip_read_info->bstream.next_out;
+            pfile_in_zip_read_info->stream.avail_out = pfile_in_zip_read_info->bstream.avail_out;
+            pfile_in_zip_read_info->stream.total_out = pfile_in_zip_read_info->bstream.total_out_lo32;
+
+            if (err==BZ_STREAM_END)
+              return (iRead==0) ? UNZ_EOF : iRead;
+            if (err!=BZ_OK)
+              break;
+#endif
+        } // end Z_BZIP2ED
+        else
+        {
+            ZPOS64_T uTotalOutBefore,uTotalOutAfter;
+            const Bytef *bufBefore;
+            ZPOS64_T uOutThis;
+            int flush=Z_SYNC_FLUSH;
+
+            uTotalOutBefore = pfile_in_zip_read_info->stream.total_out;
+            bufBefore = pfile_in_zip_read_info->stream.next_out;
+
+            /*
+            if ((pfile_in_zip_read_info->rest_read_uncompressed ==
+                     pfile_in_zip_read_info->stream.avail_out) &&
+                (pfile_in_zip_read_info->rest_read_compressed == 0))
+                flush = Z_FINISH;
+            */
+            err=inflate(&pfile_in_zip_read_info->stream,flush);
+
+            if ((err>=0) && (pfile_in_zip_read_info->stream.msg!=NULL))
+              err = Z_DATA_ERROR;
+
+            uTotalOutAfter = pfile_in_zip_read_info->stream.total_out;
+            uOutThis = uTotalOutAfter-uTotalOutBefore;
+
+            pfile_in_zip_read_info->total_out_64 = pfile_in_zip_read_info->total_out_64 + uOutThis;
+
+            pfile_in_zip_read_info->crc32 =
+                crc32(pfile_in_zip_read_info->crc32,bufBefore,
+                        (uInt)(uOutThis));
+
+            pfile_in_zip_read_info->rest_read_uncompressed -=
+                uOutThis;
+
+            iRead += (uInt)(uTotalOutAfter - uTotalOutBefore);
+
+            if (err==Z_STREAM_END)
+                return (iRead==0) ? UNZ_EOF : iRead;
+            if (err!=Z_OK)
+                break;
+        }
+    }
+
+    if (err==Z_OK)
+        return iRead;
+    return err;
+}
+
+
+/*
+  Give the current position in uncompressed data
+*/
+extern z_off_t ZEXPORT unztell (unzFile file)
+{
+    unz64_s* s;
+    file_in_zip64_read_info_s* pfile_in_zip_read_info;
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz64_s*)file;
+    pfile_in_zip_read_info=s->pfile_in_zip_read;
+
+    if (pfile_in_zip_read_info==NULL)
+        return UNZ_PARAMERROR;
+
+    return (z_off_t)pfile_in_zip_read_info->stream.total_out;
+}
+
+extern ZPOS64_T ZEXPORT unztell64 (unzFile file)
+{
+
+    unz64_s* s;
+    file_in_zip64_read_info_s* pfile_in_zip_read_info;
+    if (file==NULL)
+        return (ZPOS64_T)-1;
+    s=(unz64_s*)file;
+    pfile_in_zip_read_info=s->pfile_in_zip_read;
+
+    if (pfile_in_zip_read_info==NULL)
+        return (ZPOS64_T)-1;
+
+    return pfile_in_zip_read_info->total_out_64;
+}
+
+
+/*
+  return 1 if the end of file was reached, 0 elsewhere
+*/
+extern int ZEXPORT unzeof (unzFile file)
+{
+    unz64_s* s;
+    file_in_zip64_read_info_s* pfile_in_zip_read_info;
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz64_s*)file;
+    pfile_in_zip_read_info=s->pfile_in_zip_read;
+
+    if (pfile_in_zip_read_info==NULL)
+        return UNZ_PARAMERROR;
+
+    if (pfile_in_zip_read_info->rest_read_uncompressed == 0)
+        return 1;
+    else
+        return 0;
+}
+
+
+
+/*
+Read extra field from the current file (opened by unzOpenCurrentFile)
+This is the local-header version of the extra field (sometimes, there is
+more info in the local-header version than in the central-header)
+
+  if buf==NULL, it return the size of the local extra field that can be read
+
+  if buf!=NULL, len is the size of the buffer, the extra header is copied in
+    buf.
+  the return value is the number of bytes copied in buf, or (if <0)
+    the error code
+*/
+extern int ZEXPORT unzGetLocalExtrafield (unzFile file, voidp buf, unsigned len)
+{
+    unz64_s* s;
+    file_in_zip64_read_info_s* pfile_in_zip_read_info;
+    uInt read_now;
+    ZPOS64_T size_to_read;
+
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz64_s*)file;
+    pfile_in_zip_read_info=s->pfile_in_zip_read;
+
+    if (pfile_in_zip_read_info==NULL)
+        return UNZ_PARAMERROR;
+
+    size_to_read = (pfile_in_zip_read_info->size_local_extrafield -
+                pfile_in_zip_read_info->pos_local_extrafield);
+
+    if (buf==NULL)
+        return (int)size_to_read;
+
+    if (len>size_to_read)
+        read_now = (uInt)size_to_read;
+    else
+        read_now = (uInt)len ;
+
+    if (read_now==0)
+        return 0;
+
+    if (ZSEEK64(pfile_in_zip_read_info->z_filefunc,
+              pfile_in_zip_read_info->filestream,
+              pfile_in_zip_read_info->offset_local_extrafield +
+              pfile_in_zip_read_info->pos_local_extrafield,
+              ZLIB_FILEFUNC_SEEK_SET)!=0)
+        return UNZ_ERRNO;
+
+    if (ZREAD64(pfile_in_zip_read_info->z_filefunc,
+              pfile_in_zip_read_info->filestream,
+              buf,read_now)!=read_now)
+        return UNZ_ERRNO;
+
+    return (int)read_now;
+}
+
+/*
+  Close the file in zip opened with unzipOpenCurrentFile
+  Return UNZ_CRCERROR if all the file was read but the CRC is not good
+*/
+extern int ZEXPORT unzCloseCurrentFile (unzFile file)
+{
+    int err=UNZ_OK;
+
+    unz64_s* s;
+    file_in_zip64_read_info_s* pfile_in_zip_read_info;
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz64_s*)file;
+    pfile_in_zip_read_info=s->pfile_in_zip_read;
+
+    if (pfile_in_zip_read_info==NULL)
+        return UNZ_PARAMERROR;
+
+
+    if ((pfile_in_zip_read_info->rest_read_uncompressed == 0) &&
+        (!pfile_in_zip_read_info->raw))
+    {
+        if (pfile_in_zip_read_info->crc32 != pfile_in_zip_read_info->crc32_wait)
+            err=UNZ_CRCERROR;
+    }
+
+
+    TRYFREE(pfile_in_zip_read_info->read_buffer);
+    pfile_in_zip_read_info->read_buffer = NULL;
+    if (pfile_in_zip_read_info->stream_initialised == Z_DEFLATED)
+        inflateEnd(&pfile_in_zip_read_info->stream);
+#ifdef HAVE_BZIP2
+    else if (pfile_in_zip_read_info->stream_initialised == Z_BZIP2ED)
+        BZ2_bzDecompressEnd(&pfile_in_zip_read_info->bstream);
+#endif
+
+
+    pfile_in_zip_read_info->stream_initialised = 0;
+    TRYFREE(pfile_in_zip_read_info);
+
+    s->pfile_in_zip_read=NULL;
+
+    return err;
+}
+
+
+/*
+  Get the global comment string of the ZipFile, in the szComment buffer.
+  uSizeBuf is the size of the szComment buffer.
+  return the number of byte copied or an error code <0
+*/
+extern int ZEXPORT unzGetGlobalComment (unzFile file, char * szComment, uLong uSizeBuf)
+{
+    unz64_s* s;
+    uLong uReadThis ;
+    if (file==NULL)
+        return (int)UNZ_PARAMERROR;
+    s=(unz64_s*)file;
+
+    uReadThis = uSizeBuf;
+    if (uReadThis>s->gi.size_comment)
+        uReadThis = s->gi.size_comment;
+
+    if (ZSEEK64(s->z_filefunc,s->filestream,s->central_pos+22,ZLIB_FILEFUNC_SEEK_SET)!=0)
+        return UNZ_ERRNO;
+
+    if (uReadThis>0)
+    {
+      *szComment='\0';
+      if (ZREAD64(s->z_filefunc,s->filestream,szComment,uReadThis)!=uReadThis)
+        return UNZ_ERRNO;
+    }
+
+    if ((szComment != NULL) && (uSizeBuf > s->gi.size_comment))
+        *(szComment+s->gi.size_comment)='\0';
+    return (int)uReadThis;
+}
+
+/* Additions by RX '2004 */
+extern ZPOS64_T ZEXPORT unzGetOffset64(unzFile file)
+{
+    unz64_s* s;
+
+    if (file==NULL)
+          return 0; //UNZ_PARAMERROR;
+    s=(unz64_s*)file;
+    if (!s->current_file_ok)
+      return 0;
+    if (s->gi.number_entry != 0 && s->gi.number_entry != 0xffff)
+      if (s->num_file==s->gi.number_entry)
+         return 0;
+    return s->pos_in_central_dir;
+}
+
+extern uLong ZEXPORT unzGetOffset (unzFile file)
+{
+    ZPOS64_T offset64;
+
+    if (file==NULL)
+          return 0; //UNZ_PARAMERROR;
+    offset64 = unzGetOffset64(file);
+    return (uLong)offset64;
+}
+
+extern int ZEXPORT unzSetOffset64(unzFile file, ZPOS64_T pos)
+{
+    unz64_s* s;
+    int err;
+
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz64_s*)file;
+
+    s->pos_in_central_dir = pos;
+    s->num_file = s->gi.number_entry;      /* hack */
+    err = unz64local_GetCurrentFileInfoInternal(file,&s->cur_file_info,
+                                              &s->cur_file_info_internal,
+                                              NULL,0,NULL,0,NULL,0);
+    s->current_file_ok = (err == UNZ_OK);
+    return err;
+}
+
+extern int ZEXPORT unzSetOffset (unzFile file, uLong pos)
+{
+    return unzSetOffset64(file,pos);
+}
diff --git a/updater/zbin/minizip/munzip.h b/updater/zbin/minizip/unzip.h
index 1c23a9a..3183968 100644
--- a/updater/zbin/minizip/munzip.h
+++ b/updater/zbin/minizip/unzip.h
@@ -1,355 +1,437 @@
-/* unzip.h -- IO for uncompress .zip files using zlib

-   Version 1.01e, February 12th, 2005

-

-   Copyright (C) 1998-2005 Gilles Vollant

-

-   This unzip package allow extract file from .ZIP file, compatible with PKZip 2.04g

-     WinZip, InfoZip tools and compatible.

-

-   Multi volume ZipFile (span) are not supported.

-   Encryption compatible with pkzip 2.04g only supported

-   Old compressions used by old PKZip 1.x are not supported

-

-

-   I WAIT FEEDBACK at mail info@winimage.com

-   Visit also http://www.winimage.com/zLibDll/unzip.htm for evolution

-

-   Condition of use and distribution are the same than zlib :

-

-  This software is provided 'as-is', without any express or implied

-  warranty.  In no event will the authors be held liable for any damages

-  arising from the use of this software.

-

-  Permission is granted to anyone to use this software for any purpose,

-  including commercial applications, and to alter it and redistribute it

-  freely, subject to the following restrictions:

-

-  1. The origin of this software must not be misrepresented; you must not

-     claim that you wrote the original software. If you use this software

-     in a product, an acknowledgment in the product documentation would be

-     appreciated but is not required.

-  2. Altered source versions must be plainly marked as such, and must not be

-     misrepresented as being the original software.

-  3. This notice may not be removed or altered from any source distribution.

-

-

-*/

-

-/* for more info about .ZIP format, see

-      http://www.info-zip.org/pub/infozip/doc/appnote-981119-iz.zip

-      http://www.info-zip.org/pub/infozip/doc/

-   PkWare has also a specification at :

-      ftp://ftp.pkware.com/probdesc.zip

-*/

-

-#ifndef _unz_H

-#define _unz_H

-

-#ifdef __cplusplus

-extern "C" {

-#endif

-

-#ifndef _ZLIB_H

-#include "zlib.h"

-#endif

-

-#ifndef _ZLIBIOAPI_H

-#include "ioapi.h"

-#endif

-

-#if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP)

-/* like the STRICT of WIN32, we define a pointer that cannot be converted

-    from (void*) without cast */

-typedef struct TagunzFile__ { int unused; } unzFile__;

-typedef unzFile__ *unzFile;

-#else

-typedef voidp unzFile;

-#endif

-

-

-#define UNZ_OK                          (0)

-#define UNZ_END_OF_LIST_OF_FILE         (-100)

-#define UNZ_ERRNO                       (Z_ERRNO)

-#define UNZ_EOF                         (0)

-#define UNZ_PARAMERROR                  (-102)

-#define UNZ_BADZIPFILE                  (-103)

-#define UNZ_INTERNALERROR               (-104)

-#define UNZ_CRCERROR                    (-105)

-

-/* tm_unz contain date/time info */

-typedef struct tm_unz_s

-{

-    uInt tm_sec;            /* seconds after the minute - [0,59] */

-    uInt tm_min;            /* minutes after the hour - [0,59] */

-    uInt tm_hour;           /* hours since midnight - [0,23] */

-    uInt tm_mday;           /* day of the month - [1,31] */

-    uInt tm_mon;            /* months since January - [0,11] */

-    uInt tm_year;           /* years - [1980..2044] */

-} tm_unz;

-

-/* unz_global_info structure contain global data about the ZIPfile

-   These data comes from the end of central dir */

-typedef struct unz_global_info_s

-{

-    uLong number_entry;         /* total number of entries in

-                       the central dir on this disk */

-    uLong size_comment;         /* size of the global comment of the zipfile */

-} unz_global_info;

-

-

-/* unz_file_info contain information about a file in the zipfile */

-typedef struct unz_file_info_s

-{

-    uLong version;              /* version made by                 2 bytes */

-    uLong version_needed;       /* version needed to extract       2 bytes */

-    uLong flag;                 /* general purpose bit flag        2 bytes */

-    uLong compression_method;   /* compression method              2 bytes */

-    uLong dosDate;              /* last mod file date in Dos fmt   4 bytes */

-    uLong crc;                  /* crc-32                          4 bytes */

-    uLong compressed_size;      /* compressed size                 4 bytes */

-    uLong uncompressed_size;    /* uncompressed size               4 bytes */

-    uLong size_filename;        /* filename length                 2 bytes */

-    uLong size_file_extra;      /* extra field length              2 bytes */

-    uLong size_file_comment;    /* file comment length             2 bytes */

-

-    uLong disk_num_start;       /* disk number start               2 bytes */

-    uLong internal_fa;          /* internal file attributes        2 bytes */

-    uLong external_fa;          /* external file attributes        4 bytes */

-

-    tm_unz tmu_date;

-} unz_file_info;

-

-extern int ZEXPORT unzStringFileNameCompare OF ((const char* fileName1,

-                                                 const char* fileName2,

-                                                 int iCaseSensitivity));

-/*

-   Compare two filename (fileName1,fileName2).

-   If iCaseSenisivity = 1, comparision is case sensitivity (like strcmp)

-   If iCaseSenisivity = 2, comparision is not case sensitivity (like strcmpi

-                                or strcasecmp)

-   If iCaseSenisivity = 0, case sensitivity is defaut of your operating system

-    (like 1 on Unix, 2 on Windows)

-*/

-

-

-extern unzFile ZEXPORT unzOpen OF((const char *path));

-/*

-  Open a Zip file. path contain the full pathname (by example,

-     on a Windows XP computer "c:\\zlib\\zlib113.zip" or on an Unix computer

-     "zlib/zlib113.zip".

-     If the zipfile cannot be opened (file don't exist or in not valid), the

-       return value is NULL.

-     Else, the return value is a unzFile Handle, usable with other function

-       of this unzip package.

-*/

-

-extern unzFile ZEXPORT unzOpen2 OF((const char *path,

-                                    zlib_filefunc_def* pzlib_filefunc_def));

-/*

-   Open a Zip file, like unzOpen, but provide a set of file low level API

-      for read/write the zip file (see ioapi.h)

-*/

-

-extern int ZEXPORT unzClose OF((unzFile file));

-/*

-  Close a ZipFile opened with unzipOpen.

-  If there is files inside the .Zip opened with unzOpenCurrentFile (see later),

-    these files MUST be closed with unzipCloseCurrentFile before call unzipClose.

-  return UNZ_OK if there is no problem. */

-

-extern int ZEXPORT unzGetGlobalInfo OF((unzFile file,

-                                        unz_global_info *pglobal_info));

-/*

-  Write info about the ZipFile in the *pglobal_info structure.

-  No preparation of the structure is needed

-  return UNZ_OK if there is no problem. */

-

-

-extern int ZEXPORT unzGetGlobalComment OF((unzFile file,

-                                           char *szComment,

-                                           uLong uSizeBuf));

-/*

-  Get the global comment string of the ZipFile, in the szComment buffer.

-  uSizeBuf is the size of the szComment buffer.

-  return the number of byte copied or an error code <0

-*/

-

-

-/***************************************************************************/

-/* Unzip package allow you browse the directory of the zipfile */

-

-extern int ZEXPORT unzGoToFirstFile OF((unzFile file));

-/*

-  Set the current file of the zipfile to the first file.

-  return UNZ_OK if there is no problem

-*/

-

-extern int ZEXPORT unzGoToNextFile OF((unzFile file));

-/*

-  Set the current file of the zipfile to the next file.

-  return UNZ_OK if there is no problem

-  return UNZ_END_OF_LIST_OF_FILE if the actual file was the latest.

-*/

-

-extern int ZEXPORT unzLocateFile OF((unzFile file,

-                     const char *szFileName,

-                     int iCaseSensitivity));

-/*

-  Try locate the file szFileName in the zipfile.

-  For the iCaseSensitivity signification, see unzStringFileNameCompare

-

-  return value :

-  UNZ_OK if the file is found. It becomes the current file.

-  UNZ_END_OF_LIST_OF_FILE if the file is not found

-*/

-

-

-/* ****************************************** */

-/* Ryan supplied functions */

-/* unz_file_info contain information about a file in the zipfile */

-typedef struct unz_file_pos_s

-{

-    uLong pos_in_zip_directory;   /* offset in zip file directory */

-    uLong num_of_file;            /* # of file */

-} unz_file_pos;

-

-extern int ZEXPORT unzGetFilePos(

-    unzFile file,

-    unz_file_pos* file_pos);

-

-extern int ZEXPORT unzGoToFilePos(

-    unzFile file,

-    unz_file_pos* file_pos);

-

-/* ****************************************** */

-

-extern int ZEXPORT unzGetCurrentFileInfo OF((unzFile file,

-                         unz_file_info *pfile_info,

-                         char *szFileName,

-                         uLong fileNameBufferSize,

-                         void *extraField,

-                         uLong extraFieldBufferSize,

-                         char *szComment,

-                         uLong commentBufferSize));

-/*

-  Get Info about the current file

-  if pfile_info!=NULL, the *pfile_info structure will contain somes info about

-        the current file

-  if szFileName!=NULL, the filemane string will be copied in szFileName

-            (fileNameBufferSize is the size of the buffer)

-  if extraField!=NULL, the extra field information will be copied in extraField

-            (extraFieldBufferSize is the size of the buffer).

-            This is the Central-header version of the extra field

-  if szComment!=NULL, the comment string of the file will be copied in szComment

-            (commentBufferSize is the size of the buffer)

-*/

-

-/***************************************************************************/

-/* for reading the content of the current zipfile, you can open it, read data

-   from it, and close it (you can close it before reading all the file)

-   */

-

-extern int ZEXPORT unzOpenCurrentFile OF((unzFile file));

-/*

-  Open for reading data the current file in the zipfile.

-  If there is no error, the return value is UNZ_OK.

-*/

-

-extern int ZEXPORT unzOpenCurrentFilePassword OF((unzFile file,

-                                                  const char* password));

-/*

-  Open for reading data the current file in the zipfile.

-  password is a crypting password

-  If there is no error, the return value is UNZ_OK.

-*/

-

-extern int ZEXPORT unzOpenCurrentFile2 OF((unzFile file,

-                                           int* method,

-                                           int* level,

-                                           int raw));

-/*

-  Same than unzOpenCurrentFile, but open for read raw the file (not uncompress)

-    if raw==1

-  *method will receive method of compression, *level will receive level of

-     compression

-  note : you can set level parameter as NULL (if you did not want known level,

-         but you CANNOT set method parameter as NULL

-*/

-

-extern int ZEXPORT unzOpenCurrentFile3 OF((unzFile file,

-                                           int* method,

-                                           int* level,

-                                           int raw,

-                                           const char* password));

-/*

-  Same than unzOpenCurrentFile, but open for read raw the file (not uncompress)

-    if raw==1

-  *method will receive method of compression, *level will receive level of

-     compression

-  note : you can set level parameter as NULL (if you did not want known level,

-         but you CANNOT set method parameter as NULL

-*/

-

-

-extern int ZEXPORT unzCloseCurrentFile OF((unzFile file));

-/*

-  Close the file in zip opened with unzOpenCurrentFile

-  Return UNZ_CRCERROR if all the file was read but the CRC is not good

-*/

-

-extern int ZEXPORT unzReadCurrentFile OF((unzFile file,

-                      voidp buf,

-                      unsigned len));

-/*

-  Read bytes from the current file (opened by unzOpenCurrentFile)

-  buf contain buffer where data must be copied

-  len the size of buf.

-

-  return the number of byte copied if somes bytes are copied

-  return 0 if the end of file was reached

-  return <0 with error code if there is an error

-    (UNZ_ERRNO for IO error, or zLib error for uncompress error)

-*/

-

-extern z_off_t ZEXPORT unztell OF((unzFile file));

-/*

-  Give the current position in uncompressed data

-*/

-

-extern int ZEXPORT unzeof OF((unzFile file));

-/*

-  return 1 if the end of file was reached, 0 elsewhere

-*/

-

-extern int ZEXPORT unzGetLocalExtrafield OF((unzFile file,

-                                             voidp buf,

-                                             unsigned len));

-/*

-  Read extra field from the current file (opened by unzOpenCurrentFile)

-  This is the local-header version of the extra field (sometimes, there is

-    more info in the local-header version than in the central-header)

-

-  if buf==NULL, it return the size of the local extra field

-

-  if buf!=NULL, len is the size of the buffer, the extra header is copied in

-    buf.

-  the return value is the number of bytes copied in buf, or (if <0)

-    the error code

-*/

-

-/***************************************************************************/

-

-/* Get the current file offset */

-extern uLong ZEXPORT unzGetOffset (unzFile file);

-

-/* Set the current file offset */

-extern int ZEXPORT unzSetOffset (unzFile file, uLong pos);

-

-

-extern int ZEXPORT unzip_file(const char *zipfilename, const char *out_dir);

-

-#ifdef __cplusplus

-}

-#endif

-

-#endif /* _unz_H */

+/* unzip.h -- IO for uncompress .zip files using zlib
+   Version 1.1, February 14h, 2010
+   part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
+
+         Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
+
+         Modifications of Unzip for Zip64
+         Copyright (C) 2007-2008 Even Rouault
+
+         Modifications for Zip64 support on both zip and unzip
+         Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
+
+         For more info read MiniZip_info.txt
+
+         ---------------------------------------------------------------------------------
+
+        Condition of use and distribution are the same than zlib :
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  ---------------------------------------------------------------------------------
+
+        Changes
+
+        See header of unzip64.c
+
+*/
+
+#ifndef _unz64_H
+#define _unz64_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifndef _ZLIB_H
+#include "zlib.h"
+#endif
+
+#ifndef  _ZLIBIOAPI_H
+#include "ioapi.h"
+#endif
+
+#ifdef HAVE_BZIP2
+#include "bzlib.h"
+#endif
+
+#define Z_BZIP2ED 12
+
+#if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP)
+/* like the STRICT of WIN32, we define a pointer that cannot be converted
+    from (void*) without cast */
+typedef struct TagunzFile__ { int unused; } unzFile__;
+typedef unzFile__ *unzFile;
+#else
+typedef voidp unzFile;
+#endif
+
+
+#define UNZ_OK                          (0)
+#define UNZ_END_OF_LIST_OF_FILE         (-100)
+#define UNZ_ERRNO                       (Z_ERRNO)
+#define UNZ_EOF                         (0)
+#define UNZ_PARAMERROR                  (-102)
+#define UNZ_BADZIPFILE                  (-103)
+#define UNZ_INTERNALERROR               (-104)
+#define UNZ_CRCERROR                    (-105)
+
+/* tm_unz contain date/time info */
+typedef struct tm_unz_s
+{
+    uInt tm_sec;            /* seconds after the minute - [0,59] */
+    uInt tm_min;            /* minutes after the hour - [0,59] */
+    uInt tm_hour;           /* hours since midnight - [0,23] */
+    uInt tm_mday;           /* day of the month - [1,31] */
+    uInt tm_mon;            /* months since January - [0,11] */
+    uInt tm_year;           /* years - [1980..2044] */
+} tm_unz;
+
+/* unz_global_info structure contain global data about the ZIPfile
+   These data comes from the end of central dir */
+typedef struct unz_global_info64_s
+{
+    ZPOS64_T number_entry;         /* total number of entries in
+                                     the central dir on this disk */
+    uLong size_comment;         /* size of the global comment of the zipfile */
+} unz_global_info64;
+
+typedef struct unz_global_info_s
+{
+    uLong number_entry;         /* total number of entries in
+                                     the central dir on this disk */
+    uLong size_comment;         /* size of the global comment of the zipfile */
+} unz_global_info;
+
+/* unz_file_info contain information about a file in the zipfile */
+typedef struct unz_file_info64_s
+{
+    uLong version;              /* version made by                 2 bytes */
+    uLong version_needed;       /* version needed to extract       2 bytes */
+    uLong flag;                 /* general purpose bit flag        2 bytes */
+    uLong compression_method;   /* compression method              2 bytes */
+    uLong dosDate;              /* last mod file date in Dos fmt   4 bytes */
+    uLong crc;                  /* crc-32                          4 bytes */
+    ZPOS64_T compressed_size;   /* compressed size                 8 bytes */
+    ZPOS64_T uncompressed_size; /* uncompressed size               8 bytes */
+    uLong size_filename;        /* filename length                 2 bytes */
+    uLong size_file_extra;      /* extra field length              2 bytes */
+    uLong size_file_comment;    /* file comment length             2 bytes */
+
+    uLong disk_num_start;       /* disk number start               2 bytes */
+    uLong internal_fa;          /* internal file attributes        2 bytes */
+    uLong external_fa;          /* external file attributes        4 bytes */
+
+    tm_unz tmu_date;
+} unz_file_info64;
+
+typedef struct unz_file_info_s
+{
+    uLong version;              /* version made by                 2 bytes */
+    uLong version_needed;       /* version needed to extract       2 bytes */
+    uLong flag;                 /* general purpose bit flag        2 bytes */
+    uLong compression_method;   /* compression method              2 bytes */
+    uLong dosDate;              /* last mod file date in Dos fmt   4 bytes */
+    uLong crc;                  /* crc-32                          4 bytes */
+    uLong compressed_size;      /* compressed size                 4 bytes */
+    uLong uncompressed_size;    /* uncompressed size               4 bytes */
+    uLong size_filename;        /* filename length                 2 bytes */
+    uLong size_file_extra;      /* extra field length              2 bytes */
+    uLong size_file_comment;    /* file comment length             2 bytes */
+
+    uLong disk_num_start;       /* disk number start               2 bytes */
+    uLong internal_fa;          /* internal file attributes        2 bytes */
+    uLong external_fa;          /* external file attributes        4 bytes */
+
+    tm_unz tmu_date;
+} unz_file_info;
+
+extern int ZEXPORT unzStringFileNameCompare OF ((const char* fileName1,
+                                                 const char* fileName2,
+                                                 int iCaseSensitivity));
+/*
+   Compare two filename (fileName1,fileName2).
+   If iCaseSenisivity = 1, comparision is case sensitivity (like strcmp)
+   If iCaseSenisivity = 2, comparision is not case sensitivity (like strcmpi
+                                or strcasecmp)
+   If iCaseSenisivity = 0, case sensitivity is defaut of your operating system
+    (like 1 on Unix, 2 on Windows)
+*/
+
+
+extern unzFile ZEXPORT unzOpen OF((const char *path));
+extern unzFile ZEXPORT unzOpen64 OF((const void *path));
+/*
+  Open a Zip file. path contain the full pathname (by example,
+     on a Windows XP computer "c:\\zlib\\zlib113.zip" or on an Unix computer
+     "zlib/zlib113.zip".
+     If the zipfile cannot be opened (file don't exist or in not valid), the
+       return value is NULL.
+     Else, the return value is a unzFile Handle, usable with other function
+       of this unzip package.
+     the "64" function take a const void* pointer, because the path is just the
+       value passed to the open64_file_func callback.
+     Under Windows, if UNICODE is defined, using fill_fopen64_filefunc, the path
+       is a pointer to a wide unicode string (LPCTSTR is LPCWSTR), so const char*
+       does not describe the reality
+*/
+
+
+extern unzFile ZEXPORT unzOpen2 OF((const char *path,
+                                    zlib_filefunc_def* pzlib_filefunc_def));
+/*
+   Open a Zip file, like unzOpen, but provide a set of file low level API
+      for read/write the zip file (see ioapi.h)
+*/
+
+extern unzFile ZEXPORT unzOpen2_64 OF((const void *path,
+                                    zlib_filefunc64_def* pzlib_filefunc_def));
+/*
+   Open a Zip file, like unz64Open, but provide a set of file low level API
+      for read/write the zip file (see ioapi.h)
+*/
+
+extern int ZEXPORT unzClose OF((unzFile file));
+/*
+  Close a ZipFile opened with unzipOpen.
+  If there is files inside the .Zip opened with unzOpenCurrentFile (see later),
+    these files MUST be closed with unzipCloseCurrentFile before call unzipClose.
+  return UNZ_OK if there is no problem. */
+
+extern int ZEXPORT unzGetGlobalInfo OF((unzFile file,
+                                        unz_global_info *pglobal_info));
+
+extern int ZEXPORT unzGetGlobalInfo64 OF((unzFile file,
+                                        unz_global_info64 *pglobal_info));
+/*
+  Write info about the ZipFile in the *pglobal_info structure.
+  No preparation of the structure is needed
+  return UNZ_OK if there is no problem. */
+
+
+extern int ZEXPORT unzGetGlobalComment OF((unzFile file,
+                                           char *szComment,
+                                           uLong uSizeBuf));
+/*
+  Get the global comment string of the ZipFile, in the szComment buffer.
+  uSizeBuf is the size of the szComment buffer.
+  return the number of byte copied or an error code <0
+*/
+
+
+/***************************************************************************/
+/* Unzip package allow you browse the directory of the zipfile */
+
+extern int ZEXPORT unzGoToFirstFile OF((unzFile file));
+/*
+  Set the current file of the zipfile to the first file.
+  return UNZ_OK if there is no problem
+*/
+
+extern int ZEXPORT unzGoToNextFile OF((unzFile file));
+/*
+  Set the current file of the zipfile to the next file.
+  return UNZ_OK if there is no problem
+  return UNZ_END_OF_LIST_OF_FILE if the actual file was the latest.
+*/
+
+extern int ZEXPORT unzLocateFile OF((unzFile file,
+                     const char *szFileName,
+                     int iCaseSensitivity));
+/*
+  Try locate the file szFileName in the zipfile.
+  For the iCaseSensitivity signification, see unzStringFileNameCompare
+
+  return value :
+  UNZ_OK if the file is found. It becomes the current file.
+  UNZ_END_OF_LIST_OF_FILE if the file is not found
+*/
+
+
+/* ****************************************** */
+/* Ryan supplied functions */
+/* unz_file_info contain information about a file in the zipfile */
+typedef struct unz_file_pos_s
+{
+    uLong pos_in_zip_directory;   /* offset in zip file directory */
+    uLong num_of_file;            /* # of file */
+} unz_file_pos;
+
+extern int ZEXPORT unzGetFilePos(
+    unzFile file,
+    unz_file_pos* file_pos);
+
+extern int ZEXPORT unzGoToFilePos(
+    unzFile file,
+    unz_file_pos* file_pos);
+
+typedef struct unz64_file_pos_s
+{
+    ZPOS64_T pos_in_zip_directory;   /* offset in zip file directory */
+    ZPOS64_T num_of_file;            /* # of file */
+} unz64_file_pos;
+
+extern int ZEXPORT unzGetFilePos64(
+    unzFile file,
+    unz64_file_pos* file_pos);
+
+extern int ZEXPORT unzGoToFilePos64(
+    unzFile file,
+    const unz64_file_pos* file_pos);
+
+/* ****************************************** */
+
+extern int ZEXPORT unzGetCurrentFileInfo64 OF((unzFile file,
+                         unz_file_info64 *pfile_info,
+                         char *szFileName,
+                         uLong fileNameBufferSize,
+                         void *extraField,
+                         uLong extraFieldBufferSize,
+                         char *szComment,
+                         uLong commentBufferSize));
+
+extern int ZEXPORT unzGetCurrentFileInfo OF((unzFile file,
+                         unz_file_info *pfile_info,
+                         char *szFileName,
+                         uLong fileNameBufferSize,
+                         void *extraField,
+                         uLong extraFieldBufferSize,
+                         char *szComment,
+                         uLong commentBufferSize));
+/*
+  Get Info about the current file
+  if pfile_info!=NULL, the *pfile_info structure will contain somes info about
+        the current file
+  if szFileName!=NULL, the filemane string will be copied in szFileName
+            (fileNameBufferSize is the size of the buffer)
+  if extraField!=NULL, the extra field information will be copied in extraField
+            (extraFieldBufferSize is the size of the buffer).
+            This is the Central-header version of the extra field
+  if szComment!=NULL, the comment string of the file will be copied in szComment
+            (commentBufferSize is the size of the buffer)
+*/
+
+
+/** Addition for GDAL : START */
+
+extern ZPOS64_T ZEXPORT unzGetCurrentFileZStreamPos64 OF((unzFile file));
+
+/** Addition for GDAL : END */
+
+
+/***************************************************************************/
+/* for reading the content of the current zipfile, you can open it, read data
+   from it, and close it (you can close it before reading all the file)
+   */
+
+extern int ZEXPORT unzOpenCurrentFile OF((unzFile file));
+/*
+  Open for reading data the current file in the zipfile.
+  If there is no error, the return value is UNZ_OK.
+*/
+
+extern int ZEXPORT unzOpenCurrentFilePassword OF((unzFile file,
+                                                  const char* password));
+/*
+  Open for reading data the current file in the zipfile.
+  password is a crypting password
+  If there is no error, the return value is UNZ_OK.
+*/
+
+extern int ZEXPORT unzOpenCurrentFile2 OF((unzFile file,
+                                           int* method,
+                                           int* level,
+                                           int raw));
+/*
+  Same than unzOpenCurrentFile, but open for read raw the file (not uncompress)
+    if raw==1
+  *method will receive method of compression, *level will receive level of
+     compression
+  note : you can set level parameter as NULL (if you did not want known level,
+         but you CANNOT set method parameter as NULL
+*/
+
+extern int ZEXPORT unzOpenCurrentFile3 OF((unzFile file,
+                                           int* method,
+                                           int* level,
+                                           int raw,
+                                           const char* password));
+/*
+  Same than unzOpenCurrentFile, but open for read raw the file (not uncompress)
+    if raw==1
+  *method will receive method of compression, *level will receive level of
+     compression
+  note : you can set level parameter as NULL (if you did not want known level,
+         but you CANNOT set method parameter as NULL
+*/
+
+
+extern int ZEXPORT unzCloseCurrentFile OF((unzFile file));
+/*
+  Close the file in zip opened with unzOpenCurrentFile
+  Return UNZ_CRCERROR if all the file was read but the CRC is not good
+*/
+
+extern int ZEXPORT unzReadCurrentFile OF((unzFile file,
+                      voidp buf,
+                      unsigned len));
+/*
+  Read bytes from the current file (opened by unzOpenCurrentFile)
+  buf contain buffer where data must be copied
+  len the size of buf.
+
+  return the number of byte copied if somes bytes are copied
+  return 0 if the end of file was reached
+  return <0 with error code if there is an error
+    (UNZ_ERRNO for IO error, or zLib error for uncompress error)
+*/
+
+extern z_off_t ZEXPORT unztell OF((unzFile file));
+
+extern ZPOS64_T ZEXPORT unztell64 OF((unzFile file));
+/*
+  Give the current position in uncompressed data
+*/
+
+extern int ZEXPORT unzeof OF((unzFile file));
+/*
+  return 1 if the end of file was reached, 0 elsewhere
+*/
+
+extern int ZEXPORT unzGetLocalExtrafield OF((unzFile file,
+                                             voidp buf,
+                                             unsigned len));
+/*
+  Read extra field from the current file (opened by unzOpenCurrentFile)
+  This is the local-header version of the extra field (sometimes, there is
+    more info in the local-header version than in the central-header)
+
+  if buf==NULL, it return the size of the local extra field
+
+  if buf!=NULL, len is the size of the buffer, the extra header is copied in
+    buf.
+  the return value is the number of bytes copied in buf, or (if <0)
+    the error code
+*/
+
+/***************************************************************************/
+
+/* Get the current file offset */
+extern ZPOS64_T ZEXPORT unzGetOffset64 (unzFile file);
+extern uLong ZEXPORT unzGetOffset (unzFile file);
+
+/* Set the current file offset */
+extern int ZEXPORT unzSetOffset64 (unzFile file, ZPOS64_T pos);
+extern int ZEXPORT unzSetOffset (unzFile file, uLong pos);
+
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _unz64_H */
diff --git a/updater/zbin/minizip/zip.c b/updater/zbin/minizip/zip.c
new file mode 100644
index 0000000..3c34fc8
--- /dev/null
+++ b/updater/zbin/minizip/zip.c
@@ -0,0 +1,2004 @@
+/* zip.c -- IO on .zip files using zlib
+   Version 1.1, February 14h, 2010
+   part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
+
+         Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
+
+         Modifications for Zip64 support
+         Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
+
+         For more info read MiniZip_info.txt
+
+         Changes
+   Oct-2009 - Mathias Svensson - Remove old C style function prototypes
+   Oct-2009 - Mathias Svensson - Added Zip64 Support when creating new file archives
+   Oct-2009 - Mathias Svensson - Did some code cleanup and refactoring to get better overview of some functions.
+   Oct-2009 - Mathias Svensson - Added zipRemoveExtraInfoBlock to strip extra field data from its ZIP64 data
+                                 It is used when recreting zip archive with RAW when deleting items from a zip.
+                                 ZIP64 data is automaticly added to items that needs it, and existing ZIP64 data need to be removed.
+   Oct-2009 - Mathias Svensson - Added support for BZIP2 as compression mode (bzip2 lib is required)
+   Jan-2010 - back to unzip and minizip 1.0 name scheme, with compatibility layer
+
+*/
+
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include "zlib.h"
+#include "zip.h"
+
+#ifdef STDC
+#  include <stddef.h>
+#  include <string.h>
+#  include <stdlib.h>
+#endif
+#ifdef NO_ERRNO_H
+    extern int errno;
+#else
+#   include <errno.h>
+#endif
+
+
+#ifndef local
+#  define local static
+#endif
+/* compile with -Dlocal if your debugger can't find static symbols */
+
+#ifndef VERSIONMADEBY
+# define VERSIONMADEBY   (0x0) /* platform depedent */
+#endif
+
+#ifndef Z_BUFSIZE
+#define Z_BUFSIZE (64*1024) //(16384)
+#endif
+
+#ifndef Z_MAXFILENAMEINZIP
+#define Z_MAXFILENAMEINZIP (256)
+#endif
+
+#ifndef ALLOC
+# define ALLOC(size) (malloc(size))
+#endif
+#ifndef TRYFREE
+# define TRYFREE(p) {if (p) free(p);}
+#endif
+
+/*
+#define SIZECENTRALDIRITEM (0x2e)
+#define SIZEZIPLOCALHEADER (0x1e)
+*/
+
+/* I've found an old Unix (a SunOS 4.1.3_U1) without all SEEK_* defined.... */
+
+
+// NOT sure that this work on ALL platform
+#define MAKEULONG64(a, b) ((ZPOS64_T)(((unsigned long)(a)) | ((ZPOS64_T)((unsigned long)(b))) << 32))
+
+#ifndef SEEK_CUR
+#define SEEK_CUR    1
+#endif
+
+#ifndef SEEK_END
+#define SEEK_END    2
+#endif
+
+#ifndef SEEK_SET
+#define SEEK_SET    0
+#endif
+
+#ifndef DEF_MEM_LEVEL
+#if MAX_MEM_LEVEL >= 8
+#  define DEF_MEM_LEVEL 8
+#else
+#  define DEF_MEM_LEVEL  MAX_MEM_LEVEL
+#endif
+#endif
+const char zip_copyright[] =" zip 1.01 Copyright 1998-2004 Gilles Vollant - http://www.winimage.com/zLibDll";
+
+
+#define SIZEDATA_INDATABLOCK (4096-(4*4))
+
+#define LOCALHEADERMAGIC    (0x04034b50)
+#define CENTRALHEADERMAGIC  (0x02014b50)
+#define ENDHEADERMAGIC      (0x06054b50)
+#define ZIP64ENDHEADERMAGIC      (0x6064b50)
+#define ZIP64ENDLOCHEADERMAGIC   (0x7064b50)
+
+#define FLAG_LOCALHEADER_OFFSET (0x06)
+#define CRC_LOCALHEADER_OFFSET  (0x0e)
+
+#define SIZECENTRALHEADER (0x2e) /* 46 */
+
+typedef struct linkedlist_datablock_internal_s
+{
+  struct linkedlist_datablock_internal_s* next_datablock;
+  uLong  avail_in_this_block;
+  uLong  filled_in_this_block;
+  uLong  unused; /* for future use and alignement */
+  unsigned char data[SIZEDATA_INDATABLOCK];
+} linkedlist_datablock_internal;
+
+typedef struct linkedlist_data_s
+{
+    linkedlist_datablock_internal* first_block;
+    linkedlist_datablock_internal* last_block;
+} linkedlist_data;
+
+
+typedef struct
+{
+    z_stream stream;            /* zLib stream structure for inflate */
+#ifdef HAVE_BZIP2
+    bz_stream bstream;          /* bzLib stream structure for bziped */
+#endif
+
+    int  stream_initialised;    /* 1 is stream is initialised */
+    uInt pos_in_buffered_data;  /* last written byte in buffered_data */
+
+    ZPOS64_T pos_local_header;     /* offset of the local header of the file
+                                     currenty writing */
+    char* central_header;       /* central header data for the current file */
+    uLong size_centralExtra;
+    uLong size_centralheader;   /* size of the central header for cur file */
+    uLong size_centralExtraFree; /* Extra bytes allocated to the centralheader but that are not used */
+    uLong flag;                 /* flag of the file currently writing */
+
+    int  method;                /* compression method of file currenty wr.*/
+    int  raw;                   /* 1 for directly writing raw data */
+    Byte buffered_data[Z_BUFSIZE];/* buffer contain compressed data to be writ*/
+    uLong dosDate;
+    uLong crc32;
+    int  encrypt;
+    int  zip64;               /* Add ZIP64 extened information in the extra field */
+    ZPOS64_T pos_zip64extrainfo;
+    ZPOS64_T totalCompressedData;
+    ZPOS64_T totalUncompressedData;
+#ifndef NOCRYPT
+    unsigned long keys[3];     /* keys defining the pseudo-random sequence */
+    const unsigned long* pcrc_32_tab;
+    int crypt_header_size;
+#endif
+} curfile64_info;
+
+typedef struct
+{
+    zlib_filefunc64_32_def z_filefunc;
+    voidpf filestream;        /* io structore of the zipfile */
+    linkedlist_data central_dir;/* datablock with central dir in construction*/
+    int  in_opened_file_inzip;  /* 1 if a file in the zip is currently writ.*/
+    curfile64_info ci;            /* info on the file curretly writing */
+
+    ZPOS64_T begin_pos;            /* position of the beginning of the zipfile */
+    ZPOS64_T add_position_when_writting_offset;
+    ZPOS64_T number_entry;
+
+#ifndef NO_ADDFILEINEXISTINGZIP
+    char *globalcomment;
+#endif
+
+} zip64_internal;
+
+
+#ifndef NOCRYPT
+#define INCLUDECRYPTINGCODE_IFCRYPTALLOWED
+#include "crypt.h"
+#endif
+
+local linkedlist_datablock_internal* allocate_new_datablock()
+{
+    linkedlist_datablock_internal* ldi;
+    ldi = (linkedlist_datablock_internal*)
+                 ALLOC(sizeof(linkedlist_datablock_internal));
+    if (ldi!=NULL)
+    {
+        ldi->next_datablock = NULL ;
+        ldi->filled_in_this_block = 0 ;
+        ldi->avail_in_this_block = SIZEDATA_INDATABLOCK ;
+    }
+    return ldi;
+}
+
+local void free_datablock(linkedlist_datablock_internal* ldi)
+{
+    while (ldi!=NULL)
+    {
+        linkedlist_datablock_internal* ldinext = ldi->next_datablock;
+        TRYFREE(ldi);
+        ldi = ldinext;
+    }
+}
+
+local void init_linkedlist(linkedlist_data* ll)
+{
+    ll->first_block = ll->last_block = NULL;
+}
+
+local void free_linkedlist(linkedlist_data* ll)
+{
+    free_datablock(ll->first_block);
+    ll->first_block = ll->last_block = NULL;
+}
+
+
+local int add_data_in_datablock(linkedlist_data* ll, const void* buf, uLong len)
+{
+    linkedlist_datablock_internal* ldi;
+    const unsigned char* from_copy;
+
+    if (ll==NULL)
+        return ZIP_INTERNALERROR;
+
+    if (ll->last_block == NULL)
+    {
+        ll->first_block = ll->last_block = allocate_new_datablock();
+        if (ll->first_block == NULL)
+            return ZIP_INTERNALERROR;
+    }
+
+    ldi = ll->last_block;
+    from_copy = (unsigned char*)buf;
+
+    while (len>0)
+    {
+        uInt copy_this;
+        uInt i;
+        unsigned char* to_copy;
+
+        if (ldi->avail_in_this_block==0)
+        {
+            ldi->next_datablock = allocate_new_datablock();
+            if (ldi->next_datablock == NULL)
+                return ZIP_INTERNALERROR;
+            ldi = ldi->next_datablock ;
+            ll->last_block = ldi;
+        }
+
+        if (ldi->avail_in_this_block < len)
+            copy_this = (uInt)ldi->avail_in_this_block;
+        else
+            copy_this = (uInt)len;
+
+        to_copy = &(ldi->data[ldi->filled_in_this_block]);
+
+        for (i=0;i<copy_this;i++)
+            *(to_copy+i)=*(from_copy+i);
+
+        ldi->filled_in_this_block += copy_this;
+        ldi->avail_in_this_block -= copy_this;
+        from_copy += copy_this ;
+        len -= copy_this;
+    }
+    return ZIP_OK;
+}
+
+
+
+/****************************************************************************/
+
+#ifndef NO_ADDFILEINEXISTINGZIP
+/* ===========================================================================
+   Inputs a long in LSB order to the given file
+   nbByte == 1, 2 ,4 or 8 (byte, short or long, ZPOS64_T)
+*/
+
+local int zip64local_putValue OF((const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, ZPOS64_T x, int nbByte));
+local int zip64local_putValue (const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, ZPOS64_T x, int nbByte)
+{
+    unsigned char buf[8];
+    int n;
+    for (n = 0; n < nbByte; n++)
+    {
+        buf[n] = (unsigned char)(x & 0xff);
+        x >>= 8;
+    }
+    if (x != 0)
+      {     /* data overflow - hack for ZIP64 (X Roche) */
+      for (n = 0; n < nbByte; n++)
+        {
+          buf[n] = 0xff;
+        }
+      }
+
+    if (ZWRITE64(*pzlib_filefunc_def,filestream,buf,nbByte)!=(uLong)nbByte)
+        return ZIP_ERRNO;
+    else
+        return ZIP_OK;
+}
+
+local void zip64local_putValue_inmemory OF((void* dest, ZPOS64_T x, int nbByte));
+local void zip64local_putValue_inmemory (void* dest, ZPOS64_T x, int nbByte)
+{
+    unsigned char* buf=(unsigned char*)dest;
+    int n;
+    for (n = 0; n < nbByte; n++) {
+        buf[n] = (unsigned char)(x & 0xff);
+        x >>= 8;
+    }
+
+    if (x != 0)
+    {     /* data overflow - hack for ZIP64 */
+       for (n = 0; n < nbByte; n++)
+       {
+          buf[n] = 0xff;
+       }
+    }
+}
+
+/****************************************************************************/
+
+
+local uLong zip64local_TmzDateToDosDate(const tm_zip* ptm)
+{
+    uLong year = (uLong)ptm->tm_year;
+    if (year>=1980)
+        year-=1980;
+    else if (year>=80)
+        year-=80;
+    return
+      (uLong) (((ptm->tm_mday) + (32 * (ptm->tm_mon+1)) + (512 * year)) << 16) |
+        ((ptm->tm_sec/2) + (32* ptm->tm_min) + (2048 * (uLong)ptm->tm_hour));
+}
+
+
+/****************************************************************************/
+
+local int zip64local_getByte OF((const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, int *pi));
+
+local int zip64local_getByte(const zlib_filefunc64_32_def* pzlib_filefunc_def,voidpf filestream,int* pi)
+{
+    unsigned char c;
+    int err = (int)ZREAD64(*pzlib_filefunc_def,filestream,&c,1);
+    if (err==1)
+    {
+        *pi = (int)c;
+        return ZIP_OK;
+    }
+    else
+    {
+        if (ZERROR64(*pzlib_filefunc_def,filestream))
+            return ZIP_ERRNO;
+        else
+            return ZIP_EOF;
+    }
+}
+
+
+/* ===========================================================================
+   Reads a long in LSB order from the given gz_stream. Sets
+*/
+local int zip64local_getShort OF((const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, uLong *pX));
+
+local int zip64local_getShort (const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, uLong* pX)
+{
+    uLong x ;
+    int i = 0;
+    int err;
+
+    err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
+    x = (uLong)i;
+
+    if (err==ZIP_OK)
+        err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
+    x += ((uLong)i)<<8;
+
+    if (err==ZIP_OK)
+        *pX = x;
+    else
+        *pX = 0;
+    return err;
+}
+
+local int zip64local_getLong OF((const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, uLong *pX));
+
+local int zip64local_getLong (const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, uLong* pX)
+{
+    uLong x ;
+    int i = 0;
+    int err;
+
+    err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
+    x = (uLong)i;
+
+    if (err==ZIP_OK)
+        err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
+    x += ((uLong)i)<<8;
+
+    if (err==ZIP_OK)
+        err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
+    x += ((uLong)i)<<16;
+
+    if (err==ZIP_OK)
+        err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
+    x += ((uLong)i)<<24;
+
+    if (err==ZIP_OK)
+        *pX = x;
+    else
+        *pX = 0;
+    return err;
+}
+
+local int zip64local_getLong64 OF((const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, ZPOS64_T *pX));
+
+
+local int zip64local_getLong64 (const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, ZPOS64_T *pX)
+{
+  ZPOS64_T x;
+  int i = 0;
+  int err;
+
+  err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
+  x = (ZPOS64_T)i;
+
+  if (err==ZIP_OK)
+    err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
+  x += ((ZPOS64_T)i)<<8;
+
+  if (err==ZIP_OK)
+    err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
+  x += ((ZPOS64_T)i)<<16;
+
+  if (err==ZIP_OK)
+    err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
+  x += ((ZPOS64_T)i)<<24;
+
+  if (err==ZIP_OK)
+    err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
+  x += ((ZPOS64_T)i)<<32;
+
+  if (err==ZIP_OK)
+    err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
+  x += ((ZPOS64_T)i)<<40;
+
+  if (err==ZIP_OK)
+    err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
+  x += ((ZPOS64_T)i)<<48;
+
+  if (err==ZIP_OK)
+    err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
+  x += ((ZPOS64_T)i)<<56;
+
+  if (err==ZIP_OK)
+    *pX = x;
+  else
+    *pX = 0;
+
+  return err;
+}
+
+#ifndef BUFREADCOMMENT
+#define BUFREADCOMMENT (0x400)
+#endif
+/*
+  Locate the Central directory of a zipfile (at the end, just before
+    the global comment)
+*/
+local ZPOS64_T zip64local_SearchCentralDir OF((const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream));
+
+local ZPOS64_T zip64local_SearchCentralDir(const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream)
+{
+  unsigned char* buf;
+  ZPOS64_T uSizeFile;
+  ZPOS64_T uBackRead;
+  ZPOS64_T uMaxBack=0xffff; /* maximum size of global comment */
+  ZPOS64_T uPosFound=0;
+
+  if (ZSEEK64(*pzlib_filefunc_def,filestream,0,ZLIB_FILEFUNC_SEEK_END) != 0)
+    return 0;
+
+
+  uSizeFile = ZTELL64(*pzlib_filefunc_def,filestream);
+
+  if (uMaxBack>uSizeFile)
+    uMaxBack = uSizeFile;
+
+  buf = (unsigned char*)ALLOC(BUFREADCOMMENT+4);
+  if (buf==NULL)
+    return 0;
+
+  uBackRead = 4;
+  while (uBackRead<uMaxBack)
+  {
+    uLong uReadSize;
+    ZPOS64_T uReadPos ;
+    int i;
+    if (uBackRead+BUFREADCOMMENT>uMaxBack)
+      uBackRead = uMaxBack;
+    else
+      uBackRead+=BUFREADCOMMENT;
+    uReadPos = uSizeFile-uBackRead ;
+
+    uReadSize = ((BUFREADCOMMENT+4) < (uSizeFile-uReadPos)) ?
+      (BUFREADCOMMENT+4) : (uLong)(uSizeFile-uReadPos);
+    if (ZSEEK64(*pzlib_filefunc_def,filestream,uReadPos,ZLIB_FILEFUNC_SEEK_SET)!=0)
+      break;
+
+    if (ZREAD64(*pzlib_filefunc_def,filestream,buf,uReadSize)!=uReadSize)
+      break;
+
+    for (i=(int)uReadSize-3; (i--)>0;)
+      if (((*(buf+i))==0x50) && ((*(buf+i+1))==0x4b) &&
+        ((*(buf+i+2))==0x05) && ((*(buf+i+3))==0x06))
+      {
+        uPosFound = uReadPos+i;
+        break;
+      }
+
+      if (uPosFound!=0)
+        break;
+  }
+  TRYFREE(buf);
+  return uPosFound;
+}
+
+/*
+Locate the End of Zip64 Central directory locator and from there find the CD of a zipfile (at the end, just before
+the global comment)
+*/
+local ZPOS64_T zip64local_SearchCentralDir64 OF((const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream));
+
+local ZPOS64_T zip64local_SearchCentralDir64(const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream)
+{
+  unsigned char* buf;
+  ZPOS64_T uSizeFile;
+  ZPOS64_T uBackRead;
+  ZPOS64_T uMaxBack=0xffff; /* maximum size of global comment */
+  ZPOS64_T uPosFound=0;
+  uLong uL;
+  ZPOS64_T relativeOffset;
+
+  if (ZSEEK64(*pzlib_filefunc_def,filestream,0,ZLIB_FILEFUNC_SEEK_END) != 0)
+    return 0;
+
+  uSizeFile = ZTELL64(*pzlib_filefunc_def,filestream);
+
+  if (uMaxBack>uSizeFile)
+    uMaxBack = uSizeFile;
+
+  buf = (unsigned char*)ALLOC(BUFREADCOMMENT+4);
+  if (buf==NULL)
+    return 0;
+
+  uBackRead = 4;
+  while (uBackRead<uMaxBack)
+  {
+    uLong uReadSize;
+    ZPOS64_T uReadPos;
+    int i;
+    if (uBackRead+BUFREADCOMMENT>uMaxBack)
+      uBackRead = uMaxBack;
+    else
+      uBackRead+=BUFREADCOMMENT;
+    uReadPos = uSizeFile-uBackRead ;
+
+    uReadSize = ((BUFREADCOMMENT+4) < (uSizeFile-uReadPos)) ?
+      (BUFREADCOMMENT+4) : (uLong)(uSizeFile-uReadPos);
+    if (ZSEEK64(*pzlib_filefunc_def,filestream,uReadPos,ZLIB_FILEFUNC_SEEK_SET)!=0)
+      break;
+
+    if (ZREAD64(*pzlib_filefunc_def,filestream,buf,uReadSize)!=uReadSize)
+      break;
+
+    for (i=(int)uReadSize-3; (i--)>0;)
+    {
+      // Signature "0x07064b50" Zip64 end of central directory locater
+      if (((*(buf+i))==0x50) && ((*(buf+i+1))==0x4b) && ((*(buf+i+2))==0x06) && ((*(buf+i+3))==0x07))
+      {
+        uPosFound = uReadPos+i;
+        break;
+      }
+    }
+
+      if (uPosFound!=0)
+        break;
+  }
+
+  TRYFREE(buf);
+  if (uPosFound == 0)
+    return 0;
+
+  /* Zip64 end of central directory locator */
+  if (ZSEEK64(*pzlib_filefunc_def,filestream, uPosFound,ZLIB_FILEFUNC_SEEK_SET)!=0)
+    return 0;
+
+  /* the signature, already checked */
+  if (zip64local_getLong(pzlib_filefunc_def,filestream,&uL)!=ZIP_OK)
+    return 0;
+
+  /* number of the disk with the start of the zip64 end of  central directory */
+  if (zip64local_getLong(pzlib_filefunc_def,filestream,&uL)!=ZIP_OK)
+    return 0;
+  if (uL != 0)
+    return 0;
+
+  /* relative offset of the zip64 end of central directory record */
+  if (zip64local_getLong64(pzlib_filefunc_def,filestream,&relativeOffset)!=ZIP_OK)
+    return 0;
+
+  /* total number of disks */
+  if (zip64local_getLong(pzlib_filefunc_def,filestream,&uL)!=ZIP_OK)
+    return 0;
+  if (uL != 1)
+    return 0;
+
+  /* Goto Zip64 end of central directory record */
+  if (ZSEEK64(*pzlib_filefunc_def,filestream, relativeOffset,ZLIB_FILEFUNC_SEEK_SET)!=0)
+    return 0;
+
+  /* the signature */
+  if (zip64local_getLong(pzlib_filefunc_def,filestream,&uL)!=ZIP_OK)
+    return 0;
+
+  if (uL != 0x06064b50) // signature of 'Zip64 end of central directory'
+    return 0;
+
+  return relativeOffset;
+}
+
+int LoadCentralDirectoryRecord(zip64_internal* pziinit)
+{
+  int err=ZIP_OK;
+  ZPOS64_T byte_before_the_zipfile;/* byte before the zipfile, (>0 for sfx)*/
+
+  ZPOS64_T size_central_dir;     /* size of the central directory  */
+  ZPOS64_T offset_central_dir;   /* offset of start of central directory */
+  ZPOS64_T central_pos;
+  uLong uL;
+
+  uLong number_disk;          /* number of the current dist, used for
+                              spaning ZIP, unsupported, always 0*/
+  uLong number_disk_with_CD;  /* number the the disk with central dir, used
+                              for spaning ZIP, unsupported, always 0*/
+  ZPOS64_T number_entry;
+  ZPOS64_T number_entry_CD;      /* total number of entries in
+                                the central dir
+                                (same than number_entry on nospan) */
+  uLong VersionMadeBy;
+  uLong VersionNeeded;
+  uLong size_comment;
+
+  int hasZIP64Record = 0;
+
+  // check first if we find a ZIP64 record
+  central_pos = zip64local_SearchCentralDir64(&pziinit->z_filefunc,pziinit->filestream);
+  if(central_pos > 0)
+  {
+    hasZIP64Record = 1;
+  }
+  else if(central_pos == 0)
+  {
+    central_pos = zip64local_SearchCentralDir(&pziinit->z_filefunc,pziinit->filestream);
+  }
+
+/* disable to allow appending to empty ZIP archive
+        if (central_pos==0)
+            err=ZIP_ERRNO;
+*/
+
+  if(hasZIP64Record)
+  {
+    ZPOS64_T sizeEndOfCentralDirectory;
+    if (ZSEEK64(pziinit->z_filefunc, pziinit->filestream, central_pos, ZLIB_FILEFUNC_SEEK_SET) != 0)
+      err=ZIP_ERRNO;
+
+    /* the signature, already checked */
+    if (zip64local_getLong(&pziinit->z_filefunc, pziinit->filestream,&uL)!=ZIP_OK)
+      err=ZIP_ERRNO;
+
+    /* size of zip64 end of central directory record */
+    if (zip64local_getLong64(&pziinit->z_filefunc, pziinit->filestream, &sizeEndOfCentralDirectory)!=ZIP_OK)
+      err=ZIP_ERRNO;
+
+    /* version made by */
+    if (zip64local_getShort(&pziinit->z_filefunc, pziinit->filestream, &VersionMadeBy)!=ZIP_OK)
+      err=ZIP_ERRNO;
+
+    /* version needed to extract */
+    if (zip64local_getShort(&pziinit->z_filefunc, pziinit->filestream, &VersionNeeded)!=ZIP_OK)
+      err=ZIP_ERRNO;
+
+    /* number of this disk */
+    if (zip64local_getLong(&pziinit->z_filefunc, pziinit->filestream,&number_disk)!=ZIP_OK)
+      err=ZIP_ERRNO;
+
+    /* number of the disk with the start of the central directory */
+    if (zip64local_getLong(&pziinit->z_filefunc, pziinit->filestream,&number_disk_with_CD)!=ZIP_OK)
+      err=ZIP_ERRNO;
+
+    /* total number of entries in the central directory on this disk */
+    if (zip64local_getLong64(&pziinit->z_filefunc, pziinit->filestream, &number_entry)!=ZIP_OK)
+      err=ZIP_ERRNO;
+
+    /* total number of entries in the central directory */
+    if (zip64local_getLong64(&pziinit->z_filefunc, pziinit->filestream,&number_entry_CD)!=ZIP_OK)
+      err=ZIP_ERRNO;
+
+    if ((number_entry_CD!=number_entry) || (number_disk_with_CD!=0) || (number_disk!=0))
+      err=ZIP_BADZIPFILE;
+
+    /* size of the central directory */
+    if (zip64local_getLong64(&pziinit->z_filefunc, pziinit->filestream,&size_central_dir)!=ZIP_OK)
+      err=ZIP_ERRNO;
+
+    /* offset of start of central directory with respect to the
+    starting disk number */
+    if (zip64local_getLong64(&pziinit->z_filefunc, pziinit->filestream,&offset_central_dir)!=ZIP_OK)
+      err=ZIP_ERRNO;
+
+    // TODO..
+    // read the comment from the standard central header.
+    size_comment = 0;
+  }
+  else
+  {
+    // Read End of central Directory info
+    if (ZSEEK64(pziinit->z_filefunc, pziinit->filestream, central_pos,ZLIB_FILEFUNC_SEEK_SET)!=0)
+      err=ZIP_ERRNO;
+
+    /* the signature, already checked */
+    if (zip64local_getLong(&pziinit->z_filefunc, pziinit->filestream,&uL)!=ZIP_OK)
+      err=ZIP_ERRNO;
+
+    /* number of this disk */
+    if (zip64local_getShort(&pziinit->z_filefunc, pziinit->filestream,&number_disk)!=ZIP_OK)
+      err=ZIP_ERRNO;
+
+    /* number of the disk with the start of the central directory */
+    if (zip64local_getShort(&pziinit->z_filefunc, pziinit->filestream,&number_disk_with_CD)!=ZIP_OK)
+      err=ZIP_ERRNO;
+
+    /* total number of entries in the central dir on this disk */
+    number_entry = 0;
+    if (zip64local_getShort(&pziinit->z_filefunc, pziinit->filestream, &uL)!=ZIP_OK)
+      err=ZIP_ERRNO;
+    else
+      number_entry = uL;
+
+    /* total number of entries in the central dir */
+    number_entry_CD = 0;
+    if (zip64local_getShort(&pziinit->z_filefunc, pziinit->filestream, &uL)!=ZIP_OK)
+      err=ZIP_ERRNO;
+    else
+      number_entry_CD = uL;
+
+    if ((number_entry_CD!=number_entry) || (number_disk_with_CD!=0) || (number_disk!=0))
+      err=ZIP_BADZIPFILE;
+
+    /* size of the central directory */
+    size_central_dir = 0;
+    if (zip64local_getLong(&pziinit->z_filefunc, pziinit->filestream, &uL)!=ZIP_OK)
+      err=ZIP_ERRNO;
+    else
+      size_central_dir = uL;
+
+    /* offset of start of central directory with respect to the starting disk number */
+    offset_central_dir = 0;
+    if (zip64local_getLong(&pziinit->z_filefunc, pziinit->filestream, &uL)!=ZIP_OK)
+      err=ZIP_ERRNO;
+    else
+      offset_central_dir = uL;
+
+
+    /* zipfile global comment length */
+    if (zip64local_getShort(&pziinit->z_filefunc, pziinit->filestream, &size_comment)!=ZIP_OK)
+      err=ZIP_ERRNO;
+  }
+
+  if ((central_pos<offset_central_dir+size_central_dir) &&
+    (err==ZIP_OK))
+    err=ZIP_BADZIPFILE;
+
+  if (err!=ZIP_OK)
+  {
+    ZCLOSE64(pziinit->z_filefunc, pziinit->filestream);
+    return ZIP_ERRNO;
+  }
+
+  if (size_comment>0)
+  {
+    pziinit->globalcomment = (char*)ALLOC(size_comment+1);
+    if (pziinit->globalcomment)
+    {
+      size_comment = ZREAD64(pziinit->z_filefunc, pziinit->filestream, pziinit->globalcomment,size_comment);
+      pziinit->globalcomment[size_comment]=0;
+    }
+  }
+
+  byte_before_the_zipfile = central_pos - (offset_central_dir+size_central_dir);
+  pziinit->add_position_when_writting_offset = byte_before_the_zipfile;
+
+  {
+    ZPOS64_T size_central_dir_to_read = size_central_dir;
+    size_t buf_size = SIZEDATA_INDATABLOCK;
+    void* buf_read = (void*)ALLOC(buf_size);
+    if (ZSEEK64(pziinit->z_filefunc, pziinit->filestream, offset_central_dir + byte_before_the_zipfile, ZLIB_FILEFUNC_SEEK_SET) != 0)
+      err=ZIP_ERRNO;
+
+    while ((size_central_dir_to_read>0) && (err==ZIP_OK))
+    {
+      ZPOS64_T read_this = SIZEDATA_INDATABLOCK;
+      if (read_this > size_central_dir_to_read)
+        read_this = size_central_dir_to_read;
+
+      if (ZREAD64(pziinit->z_filefunc, pziinit->filestream,buf_read,(uLong)read_this) != read_this)
+        err=ZIP_ERRNO;
+
+      if (err==ZIP_OK)
+        err = add_data_in_datablock(&pziinit->central_dir,buf_read, (uLong)read_this);
+
+      size_central_dir_to_read-=read_this;
+    }
+    TRYFREE(buf_read);
+  }
+  pziinit->begin_pos = byte_before_the_zipfile;
+  pziinit->number_entry = number_entry_CD;
+
+  if (ZSEEK64(pziinit->z_filefunc, pziinit->filestream, offset_central_dir+byte_before_the_zipfile,ZLIB_FILEFUNC_SEEK_SET) != 0)
+    err=ZIP_ERRNO;
+
+  return err;
+}
+
+
+#endif /* !NO_ADDFILEINEXISTINGZIP*/
+
+
+/************************************************************/
+extern zipFile ZEXPORT zipOpen3 (const void *pathname, int append, zipcharpc* globalcomment, zlib_filefunc64_32_def* pzlib_filefunc64_32_def)
+{
+    zip64_internal ziinit;
+    zip64_internal* zi;
+    int err=ZIP_OK;
+
+    ziinit.z_filefunc.zseek32_file = NULL;
+    ziinit.z_filefunc.ztell32_file = NULL;
+    if (pzlib_filefunc64_32_def==NULL)
+        fill_fopen64_filefunc(&ziinit.z_filefunc.zfile_func64);
+    else
+        ziinit.z_filefunc = *pzlib_filefunc64_32_def;
+
+    ziinit.filestream = ZOPEN64(ziinit.z_filefunc,
+                  pathname,
+                  (append == APPEND_STATUS_CREATE) ?
+                  (ZLIB_FILEFUNC_MODE_READ | ZLIB_FILEFUNC_MODE_WRITE | ZLIB_FILEFUNC_MODE_CREATE) :
+                    (ZLIB_FILEFUNC_MODE_READ | ZLIB_FILEFUNC_MODE_WRITE | ZLIB_FILEFUNC_MODE_EXISTING));
+
+    if (ziinit.filestream == NULL)
+        return NULL;
+
+    if (append == APPEND_STATUS_CREATEAFTER)
+        ZSEEK64(ziinit.z_filefunc,ziinit.filestream,0,SEEK_END);
+
+    ziinit.begin_pos = ZTELL64(ziinit.z_filefunc,ziinit.filestream);
+    ziinit.in_opened_file_inzip = 0;
+    ziinit.ci.stream_initialised = 0;
+    ziinit.number_entry = 0;
+    ziinit.add_position_when_writting_offset = 0;
+    init_linkedlist(&(ziinit.central_dir));
+
+
+
+    zi = (zip64_internal*)ALLOC(sizeof(zip64_internal));
+    if (zi==NULL)
+    {
+        ZCLOSE64(ziinit.z_filefunc,ziinit.filestream);
+        return NULL;
+    }
+
+    /* now we add file in a zipfile */
+#    ifndef NO_ADDFILEINEXISTINGZIP
+    ziinit.globalcomment = NULL;
+    if (append == APPEND_STATUS_ADDINZIP)
+    {
+      // Read and Cache Central Directory Records
+      err = LoadCentralDirectoryRecord(&ziinit);
+    }
+
+    if (globalcomment)
+    {
+      *globalcomment = ziinit.globalcomment;
+    }
+#    endif /* !NO_ADDFILEINEXISTINGZIP*/
+
+    if (err != ZIP_OK)
+    {
+#    ifndef NO_ADDFILEINEXISTINGZIP
+        TRYFREE(ziinit.globalcomment);
+#    endif /* !NO_ADDFILEINEXISTINGZIP*/
+        TRYFREE(zi);
+        return NULL;
+    }
+    else
+    {
+        *zi = ziinit;
+        return (zipFile)zi;
+    }
+}
+
+extern zipFile ZEXPORT zipOpen2 (const char *pathname, int append, zipcharpc* globalcomment, zlib_filefunc_def* pzlib_filefunc32_def)
+{
+    if (pzlib_filefunc32_def != NULL)
+    {
+        zlib_filefunc64_32_def zlib_filefunc64_32_def_fill;
+        fill_zlib_filefunc64_32_def_from_filefunc32(&zlib_filefunc64_32_def_fill,pzlib_filefunc32_def);
+        return zipOpen3(pathname, append, globalcomment, &zlib_filefunc64_32_def_fill);
+    }
+    else
+        return zipOpen3(pathname, append, globalcomment, NULL);
+}
+
+extern zipFile ZEXPORT zipOpen2_64 (const void *pathname, int append, zipcharpc* globalcomment, zlib_filefunc64_def* pzlib_filefunc_def)
+{
+    if (pzlib_filefunc_def != NULL)
+    {
+        zlib_filefunc64_32_def zlib_filefunc64_32_def_fill;
+        zlib_filefunc64_32_def_fill.zfile_func64 = *pzlib_filefunc_def;
+        zlib_filefunc64_32_def_fill.ztell32_file = NULL;
+        zlib_filefunc64_32_def_fill.zseek32_file = NULL;
+        return zipOpen3(pathname, append, globalcomment, &zlib_filefunc64_32_def_fill);
+    }
+    else
+        return zipOpen3(pathname, append, globalcomment, NULL);
+}
+
+
+
+extern zipFile ZEXPORT zipOpen (const char* pathname, int append)
+{
+    return zipOpen3((const void*)pathname,append,NULL,NULL);
+}
+
+extern zipFile ZEXPORT zipOpen64 (const void* pathname, int append)
+{
+    return zipOpen3(pathname,append,NULL,NULL);
+}
+
+int Write_LocalFileHeader(zip64_internal* zi, const char* filename, uInt size_extrafield_local, const void* extrafield_local)
+{
+  /* write the local header */
+  int err;
+  uInt size_filename = (uInt)strlen(filename);
+  uInt size_extrafield = size_extrafield_local;
+
+  err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)LOCALHEADERMAGIC, 4);
+
+  if (err==ZIP_OK)
+  {
+    if(zi->ci.zip64)
+      err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)45,2);/* version needed to extract */
+    else
+      err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)20,2);/* version needed to extract */
+  }
+
+  if (err==ZIP_OK)
+    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->ci.flag,2);
+
+  if (err==ZIP_OK)
+    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->ci.method,2);
+
+  if (err==ZIP_OK)
+    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->ci.dosDate,4);
+
+  // CRC / Compressed size / Uncompressed size will be filled in later and rewritten later
+  if (err==ZIP_OK)
+    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4); /* crc 32, unknown */
+  if (err==ZIP_OK)
+  {
+    if(zi->ci.zip64)
+      err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0xFFFFFFFF,4); /* compressed size, unknown */
+    else
+      err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4); /* compressed size, unknown */
+  }
+  if (err==ZIP_OK)
+  {
+    if(zi->ci.zip64)
+      err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0xFFFFFFFF,4); /* uncompressed size, unknown */
+    else
+      err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4); /* uncompressed size, unknown */
+  }
+
+  if (err==ZIP_OK)
+    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)size_filename,2);
+
+  if(zi->ci.zip64)
+  {
+    size_extrafield += 20;
+  }
+
+  if (err==ZIP_OK)
+    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)size_extrafield,2);
+
+  if ((err==ZIP_OK) && (size_filename > 0))
+  {
+    if (ZWRITE64(zi->z_filefunc,zi->filestream,filename,size_filename)!=size_filename)
+      err = ZIP_ERRNO;
+  }
+
+  if ((err==ZIP_OK) && (size_extrafield_local > 0))
+  {
+    if (ZWRITE64(zi->z_filefunc, zi->filestream, extrafield_local, size_extrafield_local) != size_extrafield_local)
+      err = ZIP_ERRNO;
+  }
+
+
+  if ((err==ZIP_OK) && (zi->ci.zip64))
+  {
+      // write the Zip64 extended info
+      short HeaderID = 1;
+      short DataSize = 16;
+      ZPOS64_T CompressedSize = 0;
+      ZPOS64_T UncompressedSize = 0;
+
+      // Remember position of Zip64 extended info for the local file header. (needed when we update size after done with file)
+      zi->ci.pos_zip64extrainfo = ZTELL64(zi->z_filefunc,zi->filestream);
+
+      err = zip64local_putValue(&zi->z_filefunc, zi->filestream, (short)HeaderID,2);
+      err = zip64local_putValue(&zi->z_filefunc, zi->filestream, (short)DataSize,2);
+
+      err = zip64local_putValue(&zi->z_filefunc, zi->filestream, (ZPOS64_T)UncompressedSize,8);
+      err = zip64local_putValue(&zi->z_filefunc, zi->filestream, (ZPOS64_T)CompressedSize,8);
+  }
+
+  return err;
+}
+
+/*
+ NOTE.
+ When writing RAW the ZIP64 extended information in extrafield_local and extrafield_global needs to be stripped
+ before calling this function it can be done with zipRemoveExtraInfoBlock
+
+ It is not done here because then we need to realloc a new buffer since parameters are 'const' and I want to minimize
+ unnecessary allocations.
+ */
+extern int ZEXPORT zipOpenNewFileInZip4_64 (zipFile file, const char* filename, const zip_fileinfo* zipfi,
+                                         const void* extrafield_local, uInt size_extrafield_local,
+                                         const void* extrafield_global, uInt size_extrafield_global,
+                                         const char* comment, int method, int level, int raw,
+                                         int windowBits,int memLevel, int strategy,
+                                         const char* password, uLong crcForCrypting,
+                                         uLong versionMadeBy, uLong flagBase, int zip64)
+{
+    zip64_internal* zi;
+    uInt size_filename;
+    uInt size_comment;
+    uInt i;
+    int err = ZIP_OK;
+
+#    ifdef NOCRYPT
+    if (password != NULL)
+        return ZIP_PARAMERROR;
+#    endif
+
+    if (file == NULL)
+        return ZIP_PARAMERROR;
+
+#ifdef HAVE_BZIP2
+    if ((method!=0) && (method!=Z_DEFLATED) && (method!=Z_BZIP2ED))
+      return ZIP_PARAMERROR;
+#else
+    if ((method!=0) && (method!=Z_DEFLATED))
+      return ZIP_PARAMERROR;
+#endif
+
+    zi = (zip64_internal*)file;
+
+    if (zi->in_opened_file_inzip == 1)
+    {
+        err = zipCloseFileInZip (file);
+        if (err != ZIP_OK)
+            return err;
+    }
+
+    if (filename==NULL)
+        filename="-";
+
+    if (comment==NULL)
+        size_comment = 0;
+    else
+        size_comment = (uInt)strlen(comment);
+
+    size_filename = (uInt)strlen(filename);
+
+    if (zipfi == NULL)
+        zi->ci.dosDate = 0;
+    else
+    {
+        if (zipfi->dosDate != 0)
+            zi->ci.dosDate = zipfi->dosDate;
+        else
+          zi->ci.dosDate = zip64local_TmzDateToDosDate(&zipfi->tmz_date);
+    }
+
+    zi->ci.flag = flagBase;
+    if ((level==8) || (level==9))
+      zi->ci.flag |= 2;
+    if ((level==2))
+      zi->ci.flag |= 4;
+    if ((level==1))
+      zi->ci.flag |= 6;
+    if (password != NULL)
+      zi->ci.flag |= 1;
+
+    zi->ci.crc32 = 0;
+    zi->ci.method = method;
+    zi->ci.encrypt = 0;
+    zi->ci.stream_initialised = 0;
+    zi->ci.pos_in_buffered_data = 0;
+    zi->ci.raw = raw;
+    zi->ci.pos_local_header = ZTELL64(zi->z_filefunc,zi->filestream);
+
+    zi->ci.size_centralheader = SIZECENTRALHEADER + size_filename + size_extrafield_global + size_comment;
+    zi->ci.size_centralExtraFree = 32; // Extra space we have reserved in case we need to add ZIP64 extra info data
+
+    zi->ci.central_header = (char*)ALLOC((uInt)zi->ci.size_centralheader + zi->ci.size_centralExtraFree);
+
+    zi->ci.size_centralExtra = size_extrafield_global;
+    zip64local_putValue_inmemory(zi->ci.central_header,(uLong)CENTRALHEADERMAGIC,4);
+    /* version info */
+    zip64local_putValue_inmemory(zi->ci.central_header+4,(uLong)versionMadeBy,2);
+    zip64local_putValue_inmemory(zi->ci.central_header+6,(uLong)20,2);
+    zip64local_putValue_inmemory(zi->ci.central_header+8,(uLong)zi->ci.flag,2);
+    zip64local_putValue_inmemory(zi->ci.central_header+10,(uLong)zi->ci.method,2);
+    zip64local_putValue_inmemory(zi->ci.central_header+12,(uLong)zi->ci.dosDate,4);
+    zip64local_putValue_inmemory(zi->ci.central_header+16,(uLong)0,4); /*crc*/
+    zip64local_putValue_inmemory(zi->ci.central_header+20,(uLong)0,4); /*compr size*/
+    zip64local_putValue_inmemory(zi->ci.central_header+24,(uLong)0,4); /*uncompr size*/
+    zip64local_putValue_inmemory(zi->ci.central_header+28,(uLong)size_filename,2);
+    zip64local_putValue_inmemory(zi->ci.central_header+30,(uLong)size_extrafield_global,2);
+    zip64local_putValue_inmemory(zi->ci.central_header+32,(uLong)size_comment,2);
+    zip64local_putValue_inmemory(zi->ci.central_header+34,(uLong)0,2); /*disk nm start*/
+
+    if (zipfi==NULL)
+        zip64local_putValue_inmemory(zi->ci.central_header+36,(uLong)0,2);
+    else
+        zip64local_putValue_inmemory(zi->ci.central_header+36,(uLong)zipfi->internal_fa,2);
+
+    if (zipfi==NULL)
+        zip64local_putValue_inmemory(zi->ci.central_header+38,(uLong)0,4);
+    else
+        zip64local_putValue_inmemory(zi->ci.central_header+38,(uLong)zipfi->external_fa,4);
+
+    if(zi->ci.pos_local_header >= 0xffffffff)
+      zip64local_putValue_inmemory(zi->ci.central_header+42,(uLong)0xffffffff,4);
+    else
+      zip64local_putValue_inmemory(zi->ci.central_header+42,(uLong)zi->ci.pos_local_header - zi->add_position_when_writting_offset,4);
+
+    for (i=0;i<size_filename;i++)
+        *(zi->ci.central_header+SIZECENTRALHEADER+i) = *(filename+i);
+
+    for (i=0;i<size_extrafield_global;i++)
+        *(zi->ci.central_header+SIZECENTRALHEADER+size_filename+i) =
+              *(((const char*)extrafield_global)+i);
+
+    for (i=0;i<size_comment;i++)
+        *(zi->ci.central_header+SIZECENTRALHEADER+size_filename+
+              size_extrafield_global+i) = *(comment+i);
+    if (zi->ci.central_header == NULL)
+        return ZIP_INTERNALERROR;
+
+    zi->ci.zip64 = zip64;
+    zi->ci.totalCompressedData = 0;
+    zi->ci.totalUncompressedData = 0;
+    zi->ci.pos_zip64extrainfo = 0;
+
+    err = Write_LocalFileHeader(zi, filename, size_extrafield_local, extrafield_local);
+
+#ifdef HAVE_BZIP2
+    zi->ci.bstream.avail_in = (uInt)0;
+    zi->ci.bstream.avail_out = (uInt)Z_BUFSIZE;
+    zi->ci.bstream.next_out = (char*)zi->ci.buffered_data;
+    zi->ci.bstream.total_in_hi32 = 0;
+    zi->ci.bstream.total_in_lo32 = 0;
+    zi->ci.bstream.total_out_hi32 = 0;
+    zi->ci.bstream.total_out_lo32 = 0;
+#endif
+
+    zi->ci.stream.avail_in = (uInt)0;
+    zi->ci.stream.avail_out = (uInt)Z_BUFSIZE;
+    zi->ci.stream.next_out = zi->ci.buffered_data;
+    zi->ci.stream.total_in = 0;
+    zi->ci.stream.total_out = 0;
+    zi->ci.stream.data_type = Z_BINARY;
+
+#ifdef HAVE_BZIP2
+    if ((err==ZIP_OK) && (zi->ci.method == Z_DEFLATED || zi->ci.method == Z_BZIP2ED) && (!zi->ci.raw))
+#else
+    if ((err==ZIP_OK) && (zi->ci.method == Z_DEFLATED) && (!zi->ci.raw))
+#endif
+    {
+        if(zi->ci.method == Z_DEFLATED)
+        {
+          zi->ci.stream.zalloc = (alloc_func)0;
+          zi->ci.stream.zfree = (free_func)0;
+          zi->ci.stream.opaque = (voidpf)0;
+
+          if (windowBits>0)
+              windowBits = -windowBits;
+
+          err = deflateInit2(&zi->ci.stream, level, Z_DEFLATED, windowBits, memLevel, strategy);
+
+          if (err==Z_OK)
+              zi->ci.stream_initialised = Z_DEFLATED;
+        }
+        else if(zi->ci.method == Z_BZIP2ED)
+        {
+#ifdef HAVE_BZIP2
+            // Init BZip stuff here
+          zi->ci.bstream.bzalloc = 0;
+          zi->ci.bstream.bzfree = 0;
+          zi->ci.bstream.opaque = (voidpf)0;
+
+          err = BZ2_bzCompressInit(&zi->ci.bstream, level, 0,35);
+          if(err == BZ_OK)
+            zi->ci.stream_initialised = Z_BZIP2ED;
+#endif
+        }
+
+    }
+
+#    ifndef NOCRYPT
+    zi->ci.crypt_header_size = 0;
+    if ((err==Z_OK) && (password != NULL))
+    {
+        unsigned char bufHead[RAND_HEAD_LEN];
+        unsigned int sizeHead;
+        zi->ci.encrypt = 1;
+        zi->ci.pcrc_32_tab = get_crc_table();
+        /*init_keys(password,zi->ci.keys,zi->ci.pcrc_32_tab);*/
+
+        sizeHead=crypthead(password,bufHead,RAND_HEAD_LEN,zi->ci.keys,zi->ci.pcrc_32_tab,crcForCrypting);
+        zi->ci.crypt_header_size = sizeHead;
+
+        if (ZWRITE64(zi->z_filefunc,zi->filestream,bufHead,sizeHead) != sizeHead)
+                err = ZIP_ERRNO;
+    }
+#    endif
+
+    if (err==Z_OK)
+        zi->in_opened_file_inzip = 1;
+    return err;
+}
+
+extern int ZEXPORT zipOpenNewFileInZip4 (zipFile file, const char* filename, const zip_fileinfo* zipfi,
+                                         const void* extrafield_local, uInt size_extrafield_local,
+                                         const void* extrafield_global, uInt size_extrafield_global,
+                                         const char* comment, int method, int level, int raw,
+                                         int windowBits,int memLevel, int strategy,
+                                         const char* password, uLong crcForCrypting,
+                                         uLong versionMadeBy, uLong flagBase)
+{
+    return zipOpenNewFileInZip4_64 (file, filename, zipfi,
+                                 extrafield_local, size_extrafield_local,
+                                 extrafield_global, size_extrafield_global,
+                                 comment, method, level, raw,
+                                 windowBits, memLevel, strategy,
+                                 password, crcForCrypting, versionMadeBy, flagBase, 0);
+}
+
+extern int ZEXPORT zipOpenNewFileInZip3 (zipFile file, const char* filename, const zip_fileinfo* zipfi,
+                                         const void* extrafield_local, uInt size_extrafield_local,
+                                         const void* extrafield_global, uInt size_extrafield_global,
+                                         const char* comment, int method, int level, int raw,
+                                         int windowBits,int memLevel, int strategy,
+                                         const char* password, uLong crcForCrypting)
+{
+    return zipOpenNewFileInZip4_64 (file, filename, zipfi,
+                                 extrafield_local, size_extrafield_local,
+                                 extrafield_global, size_extrafield_global,
+                                 comment, method, level, raw,
+                                 windowBits, memLevel, strategy,
+                                 password, crcForCrypting, VERSIONMADEBY, 0, 0);
+}
+
+extern int ZEXPORT zipOpenNewFileInZip3_64(zipFile file, const char* filename, const zip_fileinfo* zipfi,
+                                         const void* extrafield_local, uInt size_extrafield_local,
+                                         const void* extrafield_global, uInt size_extrafield_global,
+                                         const char* comment, int method, int level, int raw,
+                                         int windowBits,int memLevel, int strategy,
+                                         const char* password, uLong crcForCrypting, int zip64)
+{
+    return zipOpenNewFileInZip4_64 (file, filename, zipfi,
+                                 extrafield_local, size_extrafield_local,
+                                 extrafield_global, size_extrafield_global,
+                                 comment, method, level, raw,
+                                 windowBits, memLevel, strategy,
+                                 password, crcForCrypting, VERSIONMADEBY, 0, zip64);
+}
+
+extern int ZEXPORT zipOpenNewFileInZip2(zipFile file, const char* filename, const zip_fileinfo* zipfi,
+                                        const void* extrafield_local, uInt size_extrafield_local,
+                                        const void* extrafield_global, uInt size_extrafield_global,
+                                        const char* comment, int method, int level, int raw)
+{
+    return zipOpenNewFileInZip4_64 (file, filename, zipfi,
+                                 extrafield_local, size_extrafield_local,
+                                 extrafield_global, size_extrafield_global,
+                                 comment, method, level, raw,
+                                 -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY,
+                                 NULL, 0, VERSIONMADEBY, 0, 0);
+}
+
+extern int ZEXPORT zipOpenNewFileInZip2_64(zipFile file, const char* filename, const zip_fileinfo* zipfi,
+                                        const void* extrafield_local, uInt size_extrafield_local,
+                                        const void* extrafield_global, uInt size_extrafield_global,
+                                        const char* comment, int method, int level, int raw, int zip64)
+{
+    return zipOpenNewFileInZip4_64 (file, filename, zipfi,
+                                 extrafield_local, size_extrafield_local,
+                                 extrafield_global, size_extrafield_global,
+                                 comment, method, level, raw,
+                                 -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY,
+                                 NULL, 0, VERSIONMADEBY, 0, zip64);
+}
+
+extern int ZEXPORT zipOpenNewFileInZip64 (zipFile file, const char* filename, const zip_fileinfo* zipfi,
+                                        const void* extrafield_local, uInt size_extrafield_local,
+                                        const void*extrafield_global, uInt size_extrafield_global,
+                                        const char* comment, int method, int level, int zip64)
+{
+    return zipOpenNewFileInZip4_64 (file, filename, zipfi,
+                                 extrafield_local, size_extrafield_local,
+                                 extrafield_global, size_extrafield_global,
+                                 comment, method, level, 0,
+                                 -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY,
+                                 NULL, 0, VERSIONMADEBY, 0, zip64);
+}
+
+extern int ZEXPORT zipOpenNewFileInZip (zipFile file, const char* filename, const zip_fileinfo* zipfi,
+                                        const void* extrafield_local, uInt size_extrafield_local,
+                                        const void*extrafield_global, uInt size_extrafield_global,
+                                        const char* comment, int method, int level)
+{
+    return zipOpenNewFileInZip4_64 (file, filename, zipfi,
+                                 extrafield_local, size_extrafield_local,
+                                 extrafield_global, size_extrafield_global,
+                                 comment, method, level, 0,
+                                 -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY,
+                                 NULL, 0, VERSIONMADEBY, 0, 0);
+}
+
+local int zip64FlushWriteBuffer(zip64_internal* zi)
+{
+    int err=ZIP_OK;
+
+    if (zi->ci.encrypt != 0)
+    {
+#ifndef NOCRYPT
+        uInt i;
+        int t;
+        for (i=0;i<zi->ci.pos_in_buffered_data;i++)
+            zi->ci.buffered_data[i] = zencode(zi->ci.keys, zi->ci.pcrc_32_tab, zi->ci.buffered_data[i],t);
+#endif
+    }
+
+    if (ZWRITE64(zi->z_filefunc,zi->filestream,zi->ci.buffered_data,zi->ci.pos_in_buffered_data) != zi->ci.pos_in_buffered_data)
+      err = ZIP_ERRNO;
+
+    zi->ci.totalCompressedData += zi->ci.pos_in_buffered_data;
+
+#ifdef HAVE_BZIP2
+    if(zi->ci.method == Z_BZIP2ED)
+    {
+      zi->ci.totalUncompressedData += zi->ci.bstream.total_in_lo32;
+      zi->ci.bstream.total_in_lo32 = 0;
+      zi->ci.bstream.total_in_hi32 = 0;
+    }
+    else
+#endif
+    {
+      zi->ci.totalUncompressedData += zi->ci.stream.total_in;
+      zi->ci.stream.total_in = 0;
+    }
+
+
+    zi->ci.pos_in_buffered_data = 0;
+
+    return err;
+}
+
+extern int ZEXPORT zipWriteInFileInZip (zipFile file,const void* buf,unsigned int len)
+{
+    zip64_internal* zi;
+    int err=ZIP_OK;
+
+    if (file == NULL)
+        return ZIP_PARAMERROR;
+    zi = (zip64_internal*)file;
+
+    if (zi->in_opened_file_inzip == 0)
+        return ZIP_PARAMERROR;
+
+    zi->ci.crc32 = crc32(zi->ci.crc32,buf,(uInt)len);
+
+#ifdef HAVE_BZIP2
+    if(zi->ci.method == Z_BZIP2ED && (!zi->ci.raw))
+    {
+      zi->ci.bstream.next_in = (void*)buf;
+      zi->ci.bstream.avail_in = len;
+      err = BZ_RUN_OK;
+
+      while ((err==BZ_RUN_OK) && (zi->ci.bstream.avail_in>0))
+      {
+        if (zi->ci.bstream.avail_out == 0)
+        {
+          if (zip64FlushWriteBuffer(zi) == ZIP_ERRNO)
+            err = ZIP_ERRNO;
+          zi->ci.bstream.avail_out = (uInt)Z_BUFSIZE;
+          zi->ci.bstream.next_out = (char*)zi->ci.buffered_data;
+        }
+
+
+        if(err != BZ_RUN_OK)
+          break;
+
+        if ((zi->ci.method == Z_BZIP2ED) && (!zi->ci.raw))
+        {
+          uLong uTotalOutBefore_lo = zi->ci.bstream.total_out_lo32;
+//          uLong uTotalOutBefore_hi = zi->ci.bstream.total_out_hi32;
+          err=BZ2_bzCompress(&zi->ci.bstream,  BZ_RUN);
+
+          zi->ci.pos_in_buffered_data += (uInt)(zi->ci.bstream.total_out_lo32 - uTotalOutBefore_lo) ;
+        }
+      }
+
+      if(err == BZ_RUN_OK)
+        err = ZIP_OK;
+    }
+    else
+#endif
+    {
+      zi->ci.stream.next_in = (Bytef*)buf;
+      zi->ci.stream.avail_in = len;
+
+      while ((err==ZIP_OK) && (zi->ci.stream.avail_in>0))
+      {
+          if (zi->ci.stream.avail_out == 0)
+          {
+              if (zip64FlushWriteBuffer(zi) == ZIP_ERRNO)
+                  err = ZIP_ERRNO;
+              zi->ci.stream.avail_out = (uInt)Z_BUFSIZE;
+              zi->ci.stream.next_out = zi->ci.buffered_data;
+          }
+
+
+          if(err != ZIP_OK)
+              break;
+
+          if ((zi->ci.method == Z_DEFLATED) && (!zi->ci.raw))
+          {
+              uLong uTotalOutBefore = zi->ci.stream.total_out;
+              err=deflate(&zi->ci.stream,  Z_NO_FLUSH);
+              if(uTotalOutBefore > zi->ci.stream.total_out)
+              {
+                int bBreak = 0;
+                bBreak++;
+              }
+
+              zi->ci.pos_in_buffered_data += (uInt)(zi->ci.stream.total_out - uTotalOutBefore) ;
+          }
+          else
+          {
+              uInt copy_this,i;
+              if (zi->ci.stream.avail_in < zi->ci.stream.avail_out)
+                  copy_this = zi->ci.stream.avail_in;
+              else
+                  copy_this = zi->ci.stream.avail_out;
+
+              for (i = 0; i < copy_this; i++)
+                  *(((char*)zi->ci.stream.next_out)+i) =
+                      *(((const char*)zi->ci.stream.next_in)+i);
+              {
+                  zi->ci.stream.avail_in -= copy_this;
+                  zi->ci.stream.avail_out-= copy_this;
+                  zi->ci.stream.next_in+= copy_this;
+                  zi->ci.stream.next_out+= copy_this;
+                  zi->ci.stream.total_in+= copy_this;
+                  zi->ci.stream.total_out+= copy_this;
+                  zi->ci.pos_in_buffered_data += copy_this;
+              }
+          }
+      }// while(...)
+    }
+
+    return err;
+}
+
+extern int ZEXPORT zipCloseFileInZipRaw (zipFile file, uLong uncompressed_size, uLong crc32)
+{
+    return zipCloseFileInZipRaw64 (file, uncompressed_size, crc32);
+}
+
+extern int ZEXPORT zipCloseFileInZipRaw64 (zipFile file, ZPOS64_T uncompressed_size, uLong crc32)
+{
+    zip64_internal* zi;
+    ZPOS64_T compressed_size;
+    uLong invalidValue = 0xffffffff;
+    short datasize = 0;
+    int err=ZIP_OK;
+
+    if (file == NULL)
+        return ZIP_PARAMERROR;
+    zi = (zip64_internal*)file;
+
+    if (zi->in_opened_file_inzip == 0)
+        return ZIP_PARAMERROR;
+    zi->ci.stream.avail_in = 0;
+
+    if ((zi->ci.method == Z_DEFLATED) && (!zi->ci.raw))
+                {
+                        while (err==ZIP_OK)
+                        {
+                                uLong uTotalOutBefore;
+                                if (zi->ci.stream.avail_out == 0)
+                                {
+                                        if (zip64FlushWriteBuffer(zi) == ZIP_ERRNO)
+                                                err = ZIP_ERRNO;
+                                        zi->ci.stream.avail_out = (uInt)Z_BUFSIZE;
+                                        zi->ci.stream.next_out = zi->ci.buffered_data;
+                                }
+                                uTotalOutBefore = zi->ci.stream.total_out;
+                                err=deflate(&zi->ci.stream,  Z_FINISH);
+                                zi->ci.pos_in_buffered_data += (uInt)(zi->ci.stream.total_out - uTotalOutBefore) ;
+                        }
+                }
+    else if ((zi->ci.method == Z_BZIP2ED) && (!zi->ci.raw))
+    {
+#ifdef HAVE_BZIP2
+      err = BZ_FINISH_OK;
+      while (err==BZ_FINISH_OK)
+      {
+        uLong uTotalOutBefore;
+        if (zi->ci.bstream.avail_out == 0)
+        {
+          if (zip64FlushWriteBuffer(zi) == ZIP_ERRNO)
+            err = ZIP_ERRNO;
+          zi->ci.bstream.avail_out = (uInt)Z_BUFSIZE;
+          zi->ci.bstream.next_out = (char*)zi->ci.buffered_data;
+        }
+        uTotalOutBefore = zi->ci.bstream.total_out_lo32;
+        err=BZ2_bzCompress(&zi->ci.bstream,  BZ_FINISH);
+        if(err == BZ_STREAM_END)
+          err = Z_STREAM_END;
+
+        zi->ci.pos_in_buffered_data += (uInt)(zi->ci.bstream.total_out_lo32 - uTotalOutBefore);
+      }
+
+      if(err == BZ_FINISH_OK)
+        err = ZIP_OK;
+#endif
+    }
+
+    if (err==Z_STREAM_END)
+        err=ZIP_OK; /* this is normal */
+
+    if ((zi->ci.pos_in_buffered_data>0) && (err==ZIP_OK))
+                {
+        if (zip64FlushWriteBuffer(zi)==ZIP_ERRNO)
+            err = ZIP_ERRNO;
+                }
+
+    if ((zi->ci.method == Z_DEFLATED) && (!zi->ci.raw))
+    {
+        int tmp_err = deflateEnd(&zi->ci.stream);
+        if (err == ZIP_OK)
+            err = tmp_err;
+        zi->ci.stream_initialised = 0;
+    }
+#ifdef HAVE_BZIP2
+    else if((zi->ci.method == Z_BZIP2ED) && (!zi->ci.raw))
+    {
+      int tmperr = BZ2_bzCompressEnd(&zi->ci.bstream);
+                        if (err==ZIP_OK)
+                                err = tmperr;
+                        zi->ci.stream_initialised = 0;
+    }
+#endif
+
+    if (!zi->ci.raw)
+    {
+        crc32 = (uLong)zi->ci.crc32;
+        uncompressed_size = zi->ci.totalUncompressedData;
+    }
+    compressed_size = zi->ci.totalCompressedData;
+
+#    ifndef NOCRYPT
+    compressed_size += zi->ci.crypt_header_size;
+#    endif
+
+    // update Current Item crc and sizes,
+    if(compressed_size >= 0xffffffff || uncompressed_size >= 0xffffffff || zi->ci.pos_local_header >= 0xffffffff)
+    {
+      /*version Made by*/
+      zip64local_putValue_inmemory(zi->ci.central_header+4,(uLong)45,2);
+      /*version needed*/
+      zip64local_putValue_inmemory(zi->ci.central_header+6,(uLong)45,2);
+
+    }
+
+    zip64local_putValue_inmemory(zi->ci.central_header+16,crc32,4); /*crc*/
+
+
+    if(compressed_size >= 0xffffffff)
+      zip64local_putValue_inmemory(zi->ci.central_header+20, invalidValue,4); /*compr size*/
+    else
+      zip64local_putValue_inmemory(zi->ci.central_header+20, compressed_size,4); /*compr size*/
+
+    /// set internal file attributes field
+    if (zi->ci.stream.data_type == Z_ASCII)
+        zip64local_putValue_inmemory(zi->ci.central_header+36,(uLong)Z_ASCII,2);
+
+    if(uncompressed_size >= 0xffffffff)
+      zip64local_putValue_inmemory(zi->ci.central_header+24, invalidValue,4); /*uncompr size*/
+    else
+      zip64local_putValue_inmemory(zi->ci.central_header+24, uncompressed_size,4); /*uncompr size*/
+
+    // Add ZIP64 extra info field for uncompressed size
+    if(uncompressed_size >= 0xffffffff)
+      datasize += 8;
+
+    // Add ZIP64 extra info field for compressed size
+    if(compressed_size >= 0xffffffff)
+      datasize += 8;
+
+    // Add ZIP64 extra info field for relative offset to local file header of current file
+    if(zi->ci.pos_local_header >= 0xffffffff)
+      datasize += 8;
+
+    if(datasize > 0)
+    {
+      char* p = NULL;
+
+      if((uLong)(datasize + 4) > zi->ci.size_centralExtraFree)
+      {
+        // we can not write more data to the buffer that we have room for.
+        return ZIP_BADZIPFILE;
+      }
+
+      p = zi->ci.central_header + zi->ci.size_centralheader;
+
+      // Add Extra Information Header for 'ZIP64 information'
+      zip64local_putValue_inmemory(p, 0x0001, 2); // HeaderID
+      p += 2;
+      zip64local_putValue_inmemory(p, datasize, 2); // DataSize
+      p += 2;
+
+      if(uncompressed_size >= 0xffffffff)
+      {
+        zip64local_putValue_inmemory(p, uncompressed_size, 8);
+        p += 8;
+      }
+
+      if(compressed_size >= 0xffffffff)
+      {
+        zip64local_putValue_inmemory(p, compressed_size, 8);
+        p += 8;
+      }
+
+      if(zi->ci.pos_local_header >= 0xffffffff)
+      {
+        zip64local_putValue_inmemory(p, zi->ci.pos_local_header, 8);
+        p += 8;
+      }
+
+      // Update how much extra free space we got in the memory buffer
+      // and increase the centralheader size so the new ZIP64 fields are included
+      // ( 4 below is the size of HeaderID and DataSize field )
+      zi->ci.size_centralExtraFree -= datasize + 4;
+      zi->ci.size_centralheader += datasize + 4;
+
+      // Update the extra info size field
+      zi->ci.size_centralExtra += datasize + 4;
+      zip64local_putValue_inmemory(zi->ci.central_header+30,(uLong)zi->ci.size_centralExtra,2);
+    }
+
+    if (err==ZIP_OK)
+        err = add_data_in_datablock(&zi->central_dir, zi->ci.central_header, (uLong)zi->ci.size_centralheader);
+
+    free(zi->ci.central_header);
+
+    if (err==ZIP_OK)
+    {
+        // Update the LocalFileHeader with the new values.
+
+        ZPOS64_T cur_pos_inzip = ZTELL64(zi->z_filefunc,zi->filestream);
+
+        if (ZSEEK64(zi->z_filefunc,zi->filestream, zi->ci.pos_local_header + 14,ZLIB_FILEFUNC_SEEK_SET)!=0)
+            err = ZIP_ERRNO;
+
+        if (err==ZIP_OK)
+            err = zip64local_putValue(&zi->z_filefunc,zi->filestream,crc32,4); /* crc 32, unknown */
+
+        if(uncompressed_size >= 0xffffffff)
+        {
+          if(zi->ci.pos_zip64extrainfo > 0)
+          {
+            // Update the size in the ZIP64 extended field.
+            if (ZSEEK64(zi->z_filefunc,zi->filestream, zi->ci.pos_zip64extrainfo + 4,ZLIB_FILEFUNC_SEEK_SET)!=0)
+              err = ZIP_ERRNO;
+
+            if (err==ZIP_OK) /* compressed size, unknown */
+              err = zip64local_putValue(&zi->z_filefunc, zi->filestream, uncompressed_size, 8);
+
+            if (err==ZIP_OK) /* uncompressed size, unknown */
+              err = zip64local_putValue(&zi->z_filefunc, zi->filestream, compressed_size, 8);
+          }
+        }
+        else
+        {
+          if (err==ZIP_OK) /* compressed size, unknown */
+              err = zip64local_putValue(&zi->z_filefunc,zi->filestream,compressed_size,4);
+
+          if (err==ZIP_OK) /* uncompressed size, unknown */
+              err = zip64local_putValue(&zi->z_filefunc,zi->filestream,uncompressed_size,4);
+        }
+
+        if (ZSEEK64(zi->z_filefunc,zi->filestream, cur_pos_inzip,ZLIB_FILEFUNC_SEEK_SET)!=0)
+            err = ZIP_ERRNO;
+    }
+
+    zi->number_entry ++;
+    zi->in_opened_file_inzip = 0;
+
+    return err;
+}
+
+extern int ZEXPORT zipCloseFileInZip (zipFile file)
+{
+    return zipCloseFileInZipRaw (file,0,0);
+}
+
+int Write_Zip64EndOfCentralDirectoryLocator(zip64_internal* zi, ZPOS64_T zip64eocd_pos_inzip)
+{
+  int err = ZIP_OK;
+  ZPOS64_T pos = zip64eocd_pos_inzip - zi->add_position_when_writting_offset;
+
+  err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)ZIP64ENDLOCHEADERMAGIC,4);
+
+  /*num disks*/
+    if (err==ZIP_OK) /* number of the disk with the start of the central directory */
+      err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4);
+
+  /*relative offset*/
+    if (err==ZIP_OK) /* Relative offset to the Zip64EndOfCentralDirectory */
+      err = zip64local_putValue(&zi->z_filefunc,zi->filestream, pos,8);
+
+  /*total disks*/ /* Do not support spawning of disk so always say 1 here*/
+    if (err==ZIP_OK) /* number of the disk with the start of the central directory */
+      err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)1,4);
+
+    return err;
+}
+
+int Write_Zip64EndOfCentralDirectoryRecord(zip64_internal* zi, uLong size_centraldir, ZPOS64_T centraldir_pos_inzip)
+{
+  int err = ZIP_OK;
+
+  uLong Zip64DataSize = 44;
+
+  err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)ZIP64ENDHEADERMAGIC,4);
+
+  if (err==ZIP_OK) /* size of this 'zip64 end of central directory' */
+    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(ZPOS64_T)Zip64DataSize,8); // why ZPOS64_T of this ?
+
+  if (err==ZIP_OK) /* version made by */
+    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)45,2);
+
+  if (err==ZIP_OK) /* version needed */
+    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)45,2);
+
+  if (err==ZIP_OK) /* number of this disk */
+    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4);
+
+  if (err==ZIP_OK) /* number of the disk with the start of the central directory */
+    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4);
+
+  if (err==ZIP_OK) /* total number of entries in the central dir on this disk */
+    err = zip64local_putValue(&zi->z_filefunc, zi->filestream, zi->number_entry, 8);
+
+  if (err==ZIP_OK) /* total number of entries in the central dir */
+    err = zip64local_putValue(&zi->z_filefunc, zi->filestream, zi->number_entry, 8);
+
+  if (err==ZIP_OK) /* size of the central directory */
+    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(ZPOS64_T)size_centraldir,8);
+
+  if (err==ZIP_OK) /* offset of start of central directory with respect to the starting disk number */
+  {
+    ZPOS64_T pos = centraldir_pos_inzip - zi->add_position_when_writting_offset;
+    err = zip64local_putValue(&zi->z_filefunc,zi->filestream, (ZPOS64_T)pos,8);
+  }
+  return err;
+}
+int Write_EndOfCentralDirectoryRecord(zip64_internal* zi, uLong size_centraldir, ZPOS64_T centraldir_pos_inzip)
+{
+  int err = ZIP_OK;
+
+  /*signature*/
+  err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)ENDHEADERMAGIC,4);
+
+  if (err==ZIP_OK) /* number of this disk */
+    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,2);
+
+  if (err==ZIP_OK) /* number of the disk with the start of the central directory */
+    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,2);
+
+  if (err==ZIP_OK) /* total number of entries in the central dir on this disk */
+  {
+    {
+      if(zi->number_entry >= 0xFFFF)
+        err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0xffff,2); // use value in ZIP64 record
+      else
+        err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->number_entry,2);
+    }
+  }
+
+  if (err==ZIP_OK) /* total number of entries in the central dir */
+  {
+    if(zi->number_entry >= 0xFFFF)
+      err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0xffff,2); // use value in ZIP64 record
+    else
+      err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->number_entry,2);
+  }
+
+  if (err==ZIP_OK) /* size of the central directory */
+    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)size_centraldir,4);
+
+  if (err==ZIP_OK) /* offset of start of central directory with respect to the starting disk number */
+  {
+    ZPOS64_T pos = centraldir_pos_inzip - zi->add_position_when_writting_offset;
+    if(pos >= 0xffffffff)
+    {
+      err = zip64local_putValue(&zi->z_filefunc,zi->filestream, (uLong)0xffffffff,4);
+    }
+    else
+                  err = zip64local_putValue(&zi->z_filefunc,zi->filestream, (uLong)(centraldir_pos_inzip - zi->add_position_when_writting_offset),4);
+  }
+
+   return err;
+}
+
+int Write_GlobalComment(zip64_internal* zi, const char* global_comment)
+{
+  int err = ZIP_OK;
+  uInt size_global_comment = 0;
+
+  if(global_comment != NULL)
+    size_global_comment = (uInt)strlen(global_comment);
+
+  err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)size_global_comment,2);
+
+  if (err == ZIP_OK && size_global_comment > 0)
+  {
+    if (ZWRITE64(zi->z_filefunc,zi->filestream, global_comment, size_global_comment) != size_global_comment)
+      err = ZIP_ERRNO;
+  }
+  return err;
+}
+
+extern int ZEXPORT zipClose (zipFile file, const char* global_comment)
+{
+    zip64_internal* zi;
+    int err = 0;
+    uLong size_centraldir = 0;
+    ZPOS64_T centraldir_pos_inzip;
+    ZPOS64_T pos;
+
+    if (file == NULL)
+        return ZIP_PARAMERROR;
+
+    zi = (zip64_internal*)file;
+
+    if (zi->in_opened_file_inzip == 1)
+    {
+        err = zipCloseFileInZip (file);
+    }
+
+#ifndef NO_ADDFILEINEXISTINGZIP
+    if (global_comment==NULL)
+        global_comment = zi->globalcomment;
+#endif
+
+    centraldir_pos_inzip = ZTELL64(zi->z_filefunc,zi->filestream);
+
+    if (err==ZIP_OK)
+    {
+        linkedlist_datablock_internal* ldi = zi->central_dir.first_block;
+        while (ldi!=NULL)
+        {
+            if ((err==ZIP_OK) && (ldi->filled_in_this_block>0))
+            {
+                if (ZWRITE64(zi->z_filefunc,zi->filestream, ldi->data, ldi->filled_in_this_block) != ldi->filled_in_this_block)
+                    err = ZIP_ERRNO;
+            }
+
+            size_centraldir += ldi->filled_in_this_block;
+            ldi = ldi->next_datablock;
+        }
+    }
+    free_linkedlist(&(zi->central_dir));
+
+    pos = centraldir_pos_inzip - zi->add_position_when_writting_offset;
+    if(pos >= 0xffffffff)
+    {
+      ZPOS64_T Zip64EOCDpos = ZTELL64(zi->z_filefunc,zi->filestream);
+      Write_Zip64EndOfCentralDirectoryRecord(zi, size_centraldir, centraldir_pos_inzip);
+
+      Write_Zip64EndOfCentralDirectoryLocator(zi, Zip64EOCDpos);
+    }
+
+    if (err==ZIP_OK)
+      err = Write_EndOfCentralDirectoryRecord(zi, size_centraldir, centraldir_pos_inzip);
+
+    if(err == ZIP_OK)
+      err = Write_GlobalComment(zi, global_comment);
+
+    if (ZCLOSE64(zi->z_filefunc,zi->filestream) != 0)
+        if (err == ZIP_OK)
+            err = ZIP_ERRNO;
+
+#ifndef NO_ADDFILEINEXISTINGZIP
+    TRYFREE(zi->globalcomment);
+#endif
+    TRYFREE(zi);
+
+    return err;
+}
+
+extern int ZEXPORT zipRemoveExtraInfoBlock (char* pData, int* dataLen, short sHeader)
+{
+  char* p = pData;
+  int size = 0;
+  char* pNewHeader;
+  char* pTmp;
+  short header;
+  short dataSize;
+
+  int retVal = ZIP_OK;
+
+  if(pData == NULL || *dataLen < 4)
+    return ZIP_PARAMERROR;
+
+  pNewHeader = (char*)ALLOC(*dataLen);
+  pTmp = pNewHeader;
+
+  while(p < (pData + *dataLen))
+  {
+    header = *(short*)p;
+    dataSize = *(((short*)p)+1);
+
+    if( header == sHeader ) // Header found.
+    {
+      p += dataSize + 4; // skip it. do not copy to temp buffer
+    }
+    else
+    {
+      // Extra Info block should not be removed, So copy it to the temp buffer.
+      memcpy(pTmp, p, dataSize + 4);
+      p += dataSize + 4;
+      size += dataSize + 4;
+    }
+
+  }
+
+  if(size < *dataLen)
+  {
+    // clean old extra info block.
+    memset(pData,0, *dataLen);
+
+    // copy the new extra info block over the old
+    if(size > 0)
+      memcpy(pData, pNewHeader, size);
+
+    // set the new extra info size
+    *dataLen = size;
+
+    retVal = ZIP_OK;
+  }
+  else
+    retVal = ZIP_ERRNO;
+
+  TRYFREE(pNewHeader);
+
+  return retVal;
+}
diff --git a/updater/zbin/minizip/mzip.h b/updater/zbin/minizip/zip.h
index cd38b67..8aaebb6 100644
--- a/updater/zbin/minizip/mzip.h
+++ b/updater/zbin/minizip/zip.h
@@ -1,235 +1,362 @@
-/* zip.h -- IO for compress .zip files using zlib

-   Version 1.01e, February 12th, 2005

-

-   Copyright (C) 1998-2005 Gilles Vollant

-

-   This unzip package allow creates .ZIP file, compatible with PKZip 2.04g

-     WinZip, InfoZip tools and compatible.

-   Multi volume ZipFile (span) are not supported.

-   Encryption compatible with pkzip 2.04g only supported

-   Old compressions used by old PKZip 1.x are not supported

-

-  For uncompress .zip file, look at unzip.h

-

-

-   I WAIT FEEDBACK at mail info@winimage.com

-   Visit also http://www.winimage.com/zLibDll/unzip.html for evolution

-

-   Condition of use and distribution are the same than zlib :

-

-  This software is provided 'as-is', without any express or implied

-  warranty.  In no event will the authors be held liable for any damages

-  arising from the use of this software.

-

-  Permission is granted to anyone to use this software for any purpose,

-  including commercial applications, and to alter it and redistribute it

-  freely, subject to the following restrictions:

-

-  1. The origin of this software must not be misrepresented; you must not

-     claim that you wrote the original software. If you use this software

-     in a product, an acknowledgment in the product documentation would be

-     appreciated but is not required.

-  2. Altered source versions must be plainly marked as such, and must not be

-     misrepresented as being the original software.

-  3. This notice may not be removed or altered from any source distribution.

-

-

-*/

-

-/* for more info about .ZIP format, see

-      http://www.info-zip.org/pub/infozip/doc/appnote-981119-iz.zip

-      http://www.info-zip.org/pub/infozip/doc/

-   PkWare has also a specification at :

-      ftp://ftp.pkware.com/probdesc.zip

-*/

-

-#ifndef _zip_H

-#define _zip_H

-

-#ifdef __cplusplus

-extern "C" {

-#endif

-

-#ifndef _ZLIB_H

-#include "zlib.h"

-#endif

-

-#ifndef _ZLIBIOAPI_H

-#include "ioapi.h"

-#endif

-

-#if defined(STRICTZIP) || defined(STRICTZIPUNZIP)

-/* like the STRICT of WIN32, we define a pointer that cannot be converted

-    from (void*) without cast */

-typedef struct TagzipFile__ { int unused; } zipFile__;

-typedef zipFile__ *zipFile;

-#else

-typedef voidp zipFile;

-#endif

-

-#define ZIP_OK                          (0)

-#define ZIP_EOF                         (0)

-#define ZIP_ERRNO                       (Z_ERRNO)

-#define ZIP_PARAMERROR                  (-102)

-#define ZIP_BADZIPFILE                  (-103)

-#define ZIP_INTERNALERROR               (-104)

-

-#ifndef DEF_MEM_LEVEL

-#  if MAX_MEM_LEVEL >= 8

-#    define DEF_MEM_LEVEL 8

-#  else

-#    define DEF_MEM_LEVEL  MAX_MEM_LEVEL

-#  endif

-#endif

-/* default memLevel */

-

-/* tm_zip contain date/time info */

-typedef struct tm_zip_s

-{

-    uInt tm_sec;            /* seconds after the minute - [0,59] */

-    uInt tm_min;            /* minutes after the hour - [0,59] */

-    uInt tm_hour;           /* hours since midnight - [0,23] */

-    uInt tm_mday;           /* day of the month - [1,31] */

-    uInt tm_mon;            /* months since January - [0,11] */

-    uInt tm_year;           /* years - [1980..2044] */

-} tm_zip;

-

-typedef struct

-{

-    tm_zip      tmz_date;       /* date in understandable format           */

-    uLong       dosDate;       /* if dos_date == 0, tmu_date is used      */

-/*    uLong       flag;        */   /* general purpose bit flag        2 bytes */

-

-    uLong       internal_fa;    /* internal file attributes        2 bytes */

-    uLong       external_fa;    /* external file attributes        4 bytes */

-} zip_fileinfo;

-

-typedef const char* zipcharpc;

-

-

-#define APPEND_STATUS_CREATE        (0)

-#define APPEND_STATUS_CREATEAFTER   (1)

-#define APPEND_STATUS_ADDINZIP      (2)

-

-extern zipFile ZEXPORT zipOpen OF((const char *pathname, int append));

-/*

-  Create a zipfile.

-     pathname contain on Windows XP a filename like "c:\\zlib\\zlib113.zip" or on

-       an Unix computer "zlib/zlib113.zip".

-     if the file pathname exist and append==APPEND_STATUS_CREATEAFTER, the zip

-       will be created at the end of the file.

-         (useful if the file contain a self extractor code)

-     if the file pathname exist and append==APPEND_STATUS_ADDINZIP, we will

-       add files in existing zip (be sure you don't add file that doesn't exist)

-     If the zipfile cannot be opened, the return value is NULL.

-     Else, the return value is a zipFile Handle, usable with other function

-       of this zip package.

-*/

-

-/* Note : there is no delete function into a zipfile.

-   If you want delete file into a zipfile, you must open a zipfile, and create another

-   Of couse, you can use RAW reading and writing to copy the file you did not want delte

-*/

-

-extern zipFile ZEXPORT zipOpen2 OF((const char *pathname,

-                                   int append,

-                                   zipcharpc* globalcomment,

-                                   zlib_filefunc_def* pzlib_filefunc_def));

-

-extern int ZEXPORT zipOpenNewFileInZip OF((zipFile file,

-                       const char* filename,

-                       const zip_fileinfo* zipfi,

-                       const void* extrafield_local,

-                       uInt size_extrafield_local,

-                       const void* extrafield_global,

-                       uInt size_extrafield_global,

-                       const char* comment,

-                       int method,

-                       int level));

-/*

-  Open a file in the ZIP for writing.

-  filename : the filename in zip (if NULL, '-' without quote will be used

-  *zipfi contain supplemental information

-  if extrafield_local!=NULL and size_extrafield_local>0, extrafield_local

-    contains the extrafield data the the local header

-  if extrafield_global!=NULL and size_extrafield_global>0, extrafield_global

-    contains the extrafield data the the local header

-  if comment != NULL, comment contain the comment string

-  method contain the compression method (0 for store, Z_DEFLATED for deflate)

-  level contain the level of compression (can be Z_DEFAULT_COMPRESSION)

-*/

-

-

-extern int ZEXPORT zipOpenNewFileInZip2 OF((zipFile file,

-                                            const char* filename,

-                                            const zip_fileinfo* zipfi,

-                                            const void* extrafield_local,

-                                            uInt size_extrafield_local,

-                                            const void* extrafield_global,

-                                            uInt size_extrafield_global,

-                                            const char* comment,

-                                            int method,

-                                            int level,

-                                            int raw));

-

-/*

-  Same than zipOpenNewFileInZip, except if raw=1, we write raw file

- */

-

-extern int ZEXPORT zipOpenNewFileInZip3 OF((zipFile file,

-                                            const char* filename,

-                                            const zip_fileinfo* zipfi,

-                                            const void* extrafield_local,

-                                            uInt size_extrafield_local,

-                                            const void* extrafield_global,

-                                            uInt size_extrafield_global,

-                                            const char* comment,

-                                            int method,

-                                            int level,

-                                            int raw,

-                                            int windowBits,

-                                            int memLevel,

-                                            int strategy,

-                                            const char* password,

-                                            uLong crcForCtypting));

-

-/*

-  Same than zipOpenNewFileInZip2, except

-    windowBits,memLevel,,strategy : see parameter strategy in deflateInit2

-    password : crypting password (NULL for no crypting)

-    crcForCtypting : crc of file to compress (needed for crypting)

- */

-

-

-extern int ZEXPORT zipWriteInFileInZip OF((zipFile file,

-                       const void* buf,

-                       unsigned len));

-/*

-  Write data in the zipfile

-*/

-

-extern int ZEXPORT zipCloseFileInZip OF((zipFile file));

-/*

-  Close the current file in the zipfile

-*/

-

-extern int ZEXPORT zipCloseFileInZipRaw OF((zipFile file,

-                                            uLong uncompressed_size,

-                                            uLong crc32));

-/*

-  Close the current file in the zipfile, for fiel opened with

-    parameter raw=1 in zipOpenNewFileInZip2

-  uncompressed_size and crc32 are value for the uncompressed size

-*/

-

-extern int ZEXPORT zipClose OF((zipFile file,

-                const char* global_comment));

-/*

-  Close the zipfile

-*/

-

-#ifdef __cplusplus

-}

-#endif

-

-#endif /* _zip_H */

+/* zip.h -- IO on .zip files using zlib
+   Version 1.1, February 14h, 2010
+   part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
+
+         Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
+
+         Modifications for Zip64 support
+         Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
+
+         For more info read MiniZip_info.txt
+
+         ---------------------------------------------------------------------------
+
+   Condition of use and distribution are the same than zlib :
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+        ---------------------------------------------------------------------------
+
+        Changes
+
+        See header of zip.h
+
+*/
+
+#ifndef _zip12_H
+#define _zip12_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+//#define HAVE_BZIP2
+
+#ifndef _ZLIB_H
+#include "zlib.h"
+#endif
+
+#ifndef _ZLIBIOAPI_H
+#include "ioapi.h"
+#endif
+
+#ifdef HAVE_BZIP2
+#include "bzlib.h"
+#endif
+
+#define Z_BZIP2ED 12
+
+#if defined(STRICTZIP) || defined(STRICTZIPUNZIP)
+/* like the STRICT of WIN32, we define a pointer that cannot be converted
+    from (void*) without cast */
+typedef struct TagzipFile__ { int unused; } zipFile__;
+typedef zipFile__ *zipFile;
+#else
+typedef voidp zipFile;
+#endif
+
+#define ZIP_OK                          (0)
+#define ZIP_EOF                         (0)
+#define ZIP_ERRNO                       (Z_ERRNO)
+#define ZIP_PARAMERROR                  (-102)
+#define ZIP_BADZIPFILE                  (-103)
+#define ZIP_INTERNALERROR               (-104)
+
+#ifndef DEF_MEM_LEVEL
+#  if MAX_MEM_LEVEL >= 8
+#    define DEF_MEM_LEVEL 8
+#  else
+#    define DEF_MEM_LEVEL  MAX_MEM_LEVEL
+#  endif
+#endif
+/* default memLevel */
+
+/* tm_zip contain date/time info */
+typedef struct tm_zip_s
+{
+    uInt tm_sec;            /* seconds after the minute - [0,59] */
+    uInt tm_min;            /* minutes after the hour - [0,59] */
+    uInt tm_hour;           /* hours since midnight - [0,23] */
+    uInt tm_mday;           /* day of the month - [1,31] */
+    uInt tm_mon;            /* months since January - [0,11] */
+    uInt tm_year;           /* years - [1980..2044] */
+} tm_zip;
+
+typedef struct
+{
+    tm_zip      tmz_date;       /* date in understandable format           */
+    uLong       dosDate;       /* if dos_date == 0, tmu_date is used      */
+/*    uLong       flag;        */   /* general purpose bit flag        2 bytes */
+
+    uLong       internal_fa;    /* internal file attributes        2 bytes */
+    uLong       external_fa;    /* external file attributes        4 bytes */
+} zip_fileinfo;
+
+typedef const char* zipcharpc;
+
+
+#define APPEND_STATUS_CREATE        (0)
+#define APPEND_STATUS_CREATEAFTER   (1)
+#define APPEND_STATUS_ADDINZIP      (2)
+
+extern zipFile ZEXPORT zipOpen OF((const char *pathname, int append));
+extern zipFile ZEXPORT zipOpen64 OF((const void *pathname, int append));
+/*
+  Create a zipfile.
+     pathname contain on Windows XP a filename like "c:\\zlib\\zlib113.zip" or on
+       an Unix computer "zlib/zlib113.zip".
+     if the file pathname exist and append==APPEND_STATUS_CREATEAFTER, the zip
+       will be created at the end of the file.
+         (useful if the file contain a self extractor code)
+     if the file pathname exist and append==APPEND_STATUS_ADDINZIP, we will
+       add files in existing zip (be sure you don't add file that doesn't exist)
+     If the zipfile cannot be opened, the return value is NULL.
+     Else, the return value is a zipFile Handle, usable with other function
+       of this zip package.
+*/
+
+/* Note : there is no delete function into a zipfile.
+   If you want delete file into a zipfile, you must open a zipfile, and create another
+   Of couse, you can use RAW reading and writing to copy the file you did not want delte
+*/
+
+extern zipFile ZEXPORT zipOpen2 OF((const char *pathname,
+                                   int append,
+                                   zipcharpc* globalcomment,
+                                   zlib_filefunc_def* pzlib_filefunc_def));
+
+extern zipFile ZEXPORT zipOpen2_64 OF((const void *pathname,
+                                   int append,
+                                   zipcharpc* globalcomment,
+                                   zlib_filefunc64_def* pzlib_filefunc_def));
+
+extern int ZEXPORT zipOpenNewFileInZip OF((zipFile file,
+                       const char* filename,
+                       const zip_fileinfo* zipfi,
+                       const void* extrafield_local,
+                       uInt size_extrafield_local,
+                       const void* extrafield_global,
+                       uInt size_extrafield_global,
+                       const char* comment,
+                       int method,
+                       int level));
+
+extern int ZEXPORT zipOpenNewFileInZip64 OF((zipFile file,
+                       const char* filename,
+                       const zip_fileinfo* zipfi,
+                       const void* extrafield_local,
+                       uInt size_extrafield_local,
+                       const void* extrafield_global,
+                       uInt size_extrafield_global,
+                       const char* comment,
+                       int method,
+                       int level,
+                       int zip64));
+
+/*
+  Open a file in the ZIP for writing.
+  filename : the filename in zip (if NULL, '-' without quote will be used
+  *zipfi contain supplemental information
+  if extrafield_local!=NULL and size_extrafield_local>0, extrafield_local
+    contains the extrafield data the the local header
+  if extrafield_global!=NULL and size_extrafield_global>0, extrafield_global
+    contains the extrafield data the the local header
+  if comment != NULL, comment contain the comment string
+  method contain the compression method (0 for store, Z_DEFLATED for deflate)
+  level contain the level of compression (can be Z_DEFAULT_COMPRESSION)
+  zip64 is set to 1 if a zip64 extended information block should be added to the local file header.
+                    this MUST be '1' if the uncompressed size is >= 0xffffffff.
+
+*/
+
+
+extern int ZEXPORT zipOpenNewFileInZip2 OF((zipFile file,
+                                            const char* filename,
+                                            const zip_fileinfo* zipfi,
+                                            const void* extrafield_local,
+                                            uInt size_extrafield_local,
+                                            const void* extrafield_global,
+                                            uInt size_extrafield_global,
+                                            const char* comment,
+                                            int method,
+                                            int level,
+                                            int raw));
+
+
+extern int ZEXPORT zipOpenNewFileInZip2_64 OF((zipFile file,
+                                            const char* filename,
+                                            const zip_fileinfo* zipfi,
+                                            const void* extrafield_local,
+                                            uInt size_extrafield_local,
+                                            const void* extrafield_global,
+                                            uInt size_extrafield_global,
+                                            const char* comment,
+                                            int method,
+                                            int level,
+                                            int raw,
+                                            int zip64));
+/*
+  Same than zipOpenNewFileInZip, except if raw=1, we write raw file
+ */
+
+extern int ZEXPORT zipOpenNewFileInZip3 OF((zipFile file,
+                                            const char* filename,
+                                            const zip_fileinfo* zipfi,
+                                            const void* extrafield_local,
+                                            uInt size_extrafield_local,
+                                            const void* extrafield_global,
+                                            uInt size_extrafield_global,
+                                            const char* comment,
+                                            int method,
+                                            int level,
+                                            int raw,
+                                            int windowBits,
+                                            int memLevel,
+                                            int strategy,
+                                            const char* password,
+                                            uLong crcForCrypting));
+
+extern int ZEXPORT zipOpenNewFileInZip3_64 OF((zipFile file,
+                                            const char* filename,
+                                            const zip_fileinfo* zipfi,
+                                            const void* extrafield_local,
+                                            uInt size_extrafield_local,
+                                            const void* extrafield_global,
+                                            uInt size_extrafield_global,
+                                            const char* comment,
+                                            int method,
+                                            int level,
+                                            int raw,
+                                            int windowBits,
+                                            int memLevel,
+                                            int strategy,
+                                            const char* password,
+                                            uLong crcForCrypting,
+                                            int zip64
+                                            ));
+
+/*
+  Same than zipOpenNewFileInZip2, except
+    windowBits,memLevel,,strategy : see parameter strategy in deflateInit2
+    password : crypting password (NULL for no crypting)
+    crcForCrypting : crc of file to compress (needed for crypting)
+ */
+
+extern int ZEXPORT zipOpenNewFileInZip4 OF((zipFile file,
+                                            const char* filename,
+                                            const zip_fileinfo* zipfi,
+                                            const void* extrafield_local,
+                                            uInt size_extrafield_local,
+                                            const void* extrafield_global,
+                                            uInt size_extrafield_global,
+                                            const char* comment,
+                                            int method,
+                                            int level,
+                                            int raw,
+                                            int windowBits,
+                                            int memLevel,
+                                            int strategy,
+                                            const char* password,
+                                            uLong crcForCrypting,
+                                            uLong versionMadeBy,
+                                            uLong flagBase
+                                            ));
+
+
+extern int ZEXPORT zipOpenNewFileInZip4_64 OF((zipFile file,
+                                            const char* filename,
+                                            const zip_fileinfo* zipfi,
+                                            const void* extrafield_local,
+                                            uInt size_extrafield_local,
+                                            const void* extrafield_global,
+                                            uInt size_extrafield_global,
+                                            const char* comment,
+                                            int method,
+                                            int level,
+                                            int raw,
+                                            int windowBits,
+                                            int memLevel,
+                                            int strategy,
+                                            const char* password,
+                                            uLong crcForCrypting,
+                                            uLong versionMadeBy,
+                                            uLong flagBase,
+                                            int zip64
+                                            ));
+/*
+  Same than zipOpenNewFileInZip4, except
+    versionMadeBy : value for Version made by field
+    flag : value for flag field (compression level info will be added)
+ */
+
+
+extern int ZEXPORT zipWriteInFileInZip OF((zipFile file,
+                       const void* buf,
+                       unsigned len));
+/*
+  Write data in the zipfile
+*/
+
+extern int ZEXPORT zipCloseFileInZip OF((zipFile file));
+/*
+  Close the current file in the zipfile
+*/
+
+extern int ZEXPORT zipCloseFileInZipRaw OF((zipFile file,
+                                            uLong uncompressed_size,
+                                            uLong crc32));
+
+extern int ZEXPORT zipCloseFileInZipRaw64 OF((zipFile file,
+                                            ZPOS64_T uncompressed_size,
+                                            uLong crc32));
+
+/*
+  Close the current file in the zipfile, for file opened with
+    parameter raw=1 in zipOpenNewFileInZip2
+  uncompressed_size and crc32 are value for the uncompressed size
+*/
+
+extern int ZEXPORT zipClose OF((zipFile file,
+                const char* global_comment));
+/*
+  Close the zipfile
+*/
+
+
+extern int ZEXPORT zipRemoveExtraInfoBlock OF((char* pData, int* dataLen, short sHeader));
+/*
+  zipRemoveExtraInfoBlock -  Added by Mathias Svensson
+
+  Remove extra information block from a extra information data for the local file header or central directory header
+
+  It is needed to remove ZIP64 extra information blocks when before data is written if using RAW mode.
+
+  0x0001 is the signature header for the ZIP64 extra information blocks
+
+  usage.
+                        Remove ZIP64 Extra information from a central director extra field data
+              zipRemoveExtraInfoBlock(pCenDirExtraFieldData, &nCenDirExtraFieldDataLen, 0x0001);
+
+                        Remove ZIP64 Extra information from a Local File Header extra field data
+        zipRemoveExtraInfoBlock(pLocalHeaderExtraFieldData, &nLocalHeaderExtraFieldDataLen, 0x0001);
+*/
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _zip64_H */