afeica
/
cocos-engine-external
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upgrade minizip to 1.2.0(sync cocos2d-x) (#150)

This commit is contained in:
Wenhai Lin 2021-07-01 16:15:45 +08:00 committed by GitHub
parent abf3616c12
commit 16ad300367
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 2429 additions and 2735 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

244
sources/unzip/crypt.h
View File

@ -1,130 +1,168 @@
/* crypt.h -- base code for traditional PKWARE encryption /* crypt.h -- base code for traditional PKWARE encryption
Version 1.01e, February 12th, 2005 Version 1.2.0, September 16th, 2017
Copyright (C) 2012-2017 Nathan Moinvaziri
https://github.com/nmoinvaz/minizip
Copyright (C) 1998-2005 Gilles Vollant Copyright (C) 1998-2005 Gilles Vollant
Modifications for Info-ZIP crypting Modifications for Info-ZIP crypting
Copyright (C) 2003 Terry Thorsen http://www.winimage.com/zLibDll/minizip.html
Copyright (C) 2003 Terry Thorsen
This code is a modified version of crypting code in Info-ZIP distribution This code is a modified version of crypting code in Info-ZIP distribution
Copyright (C) 1990-2000 Info-ZIP. All rights reserved. Copyright (C) 1990-2000 Info-ZIP. All rights reserved.
See the Info-ZIP LICENSE file version 2000-Apr-09 or later for terms of use This program is distributed under the terms of the same license as zlib.
which also may be found at: ftp://ftp.info-zip.org/pub/infozip/license.html See the accompanying LICENSE file for the full text of the license.
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.
*/ */
#define CRC32(c, b) ((*(pcrc_32_tab+(((int)(c) ^ (b)) & 0xff))) ^ ((c) >> 8)) #ifndef _MINICRYPT_H
#define _MINICRYPT_H
/*********************************************************************** #include <stdint.h>
* Return the next byte in the pseudo-random sequence #include <stdlib.h>
*/ #include <time.h>
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 # ifndef ZCR_SEED2
# define ZCR_SEED2 3141592654UL /* use PI as default pattern */ # define ZCR_SEED2 3141592654UL /* use PI as default pattern */
# endif # endif
static int crypthead(const char* passwd, /* password string */ #if ZLIB_VERNUM < 0x1270
unsigned char* buf, /* where to write header */ typedef unsigned long z_crc_t;
int bufSize, #endif
unsigned long* pkeys,
const unsigned long* pcrc_32_tab, #define RAND_HEAD_LEN 12
unsigned long crcForCrypting)
/***************************************************************************/
#define CRC32(c, b) ((*(pcrc_32_tab+(((uint32_t)(c) ^ (b)) & 0xff))) ^ ((c) >> 8))
/***************************************************************************/
#define zdecode(pkeys,pcrc_32_tab,c) \
(update_keys(pkeys,pcrc_32_tab, c ^= decrypt_byte(pkeys)))
#define zencode(pkeys,pcrc_32_tab,c,t) \
(t = decrypt_byte(pkeys), update_keys(pkeys,pcrc_32_tab,c), t^(c))
/***************************************************************************/
/* Return the next byte in the pseudo-random sequence */
static uint8_t decrypt_byte(uint32_t *pkeys)
{ {
int n; /* index in random header */ unsigned temp; /* POTENTIAL BUG: temp*(temp^1) may overflow in an
int t; /* temporary */ * unpredictable manner on 16-bit systems; not a problem
int c; /* random byte */ * with any known compiler so far, though */
unsigned char header[RAND_HEAD_LEN-2]; /* random header */
temp = ((uint32_t)(*(pkeys + 2)) & 0xffff) | 2;
return (uint8_t)(((temp * (temp ^ 1)) >> 8) & 0xff);
}
/* Update the encryption keys with the next byte of plain text */
static uint8_t update_keys(uint32_t *pkeys, const z_crc_t *pcrc_32_tab, int32_t c)
{
(*(pkeys + 0)) = (uint32_t)CRC32((*(pkeys + 0)), c);
(*(pkeys + 1)) += (*(pkeys + 0)) & 0xff;
(*(pkeys + 1)) = (*(pkeys + 1)) * 134775813L + 1;
{
int32_t keyshift = (int32_t)((*(pkeys + 1)) >> 24);
(*(pkeys + 2)) = (uint32_t)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, uint32_t *pkeys, const z_crc_t *pcrc_32_tab)
{
*(pkeys + 0) = 305419896L;
*(pkeys + 1) = 591751049L;
*(pkeys + 2) = 878082192L;
while (*passwd != 0)
{
update_keys(pkeys, pcrc_32_tab, *passwd);
passwd += 1;
}
}
#ifndef NOCRYPT
/* Generate cryptographically secure random numbers */
static int cryptrand(unsigned char *buf, unsigned int len)
{
/*
Important This API is deprecated. New and existing software should
start using Cryptography Next Generation APIs.
Microsoft may remove this API in future releases.
see: https://docs.microsoft.com/zh-cn/windows/desktop/api/wincrypt/nf-wincrypt-cryptgenrandom
*/
#define CRYPTGENRANDOM_DEPRECATED 1
#if defined(_WIN32) && !defined(CRYPTGENRANDOM_DEPRECATED)
HCRYPTPROV provider;
unsigned __int64 pentium_tsc[1];
int rlen = 0;
int result = 0;
if (CryptAcquireContext(&provider, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT | CRYPT_SILENT))
{
result = CryptGenRandom(provider, len, buf);
CryptReleaseContext(provider, 0);
if (result)
return len;
}
for (rlen = 0; rlen < (int)len; ++rlen)
{
if (rlen % 8 == 0)
QueryPerformanceCounter((LARGE_INTEGER *)pentium_tsc);
buf[rlen] = ((unsigned char*)pentium_tsc)[rlen % 8];
}
return rlen;
#else
static unsigned calls = 0; /* ensure different random header each time */ 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 /* First generate RAND_HEAD_LEN-2 random bytes. We encrypt the
* output of rand() to get less predictability, since rand() is * output of rand() to get less predictability, since rand() is
* often poorly implemented. * often poorly implemented.
*/ */
if (++calls == 1) if (++calls == 1)
{ {
srand((unsigned)(time(NULL) ^ ZCR_SEED2)); srand((unsigned)(time(NULL) ^ ZCR_SEED2));
} }
init_keys(passwd, pkeys, pcrc_32_tab); for(unsigned int i = 0; i < len; ++i){
for (n = 0; n < RAND_HEAD_LEN-2; n++) buf[i] = rand() % 256;
{
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) */ return len;
init_keys(passwd, pkeys, pcrc_32_tab); #endif
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;
} }
/* Create encryption header */
static int crypthead(const char *passwd, uint8_t *buf, int buf_size, uint32_t *pkeys,
const z_crc_t *pcrc_32_tab, uint8_t verify1, uint8_t verify2)
{
uint8_t n = 0; /* index in random header */
uint8_t header[RAND_HEAD_LEN - 2]; /* random header */
uint16_t t = 0; /* temporary */
if (buf_size < RAND_HEAD_LEN)
return 0;
init_keys(passwd, pkeys, pcrc_32_tab);
/* First generate RAND_HEAD_LEN-2 random bytes. */
cryptrand(header, RAND_HEAD_LEN - 2);
/* 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] = (uint8_t)zencode(pkeys, pcrc_32_tab, header[n], t);
buf[n++] = (uint8_t)zencode(pkeys, pcrc_32_tab, verify1, t);
buf[n++] = (uint8_t)zencode(pkeys, pcrc_32_tab, verify2, t);
return n;
}
#endif
/***************************************************************************/
#endif #endif

380
sources/unzip/ioapi.cpp
View File

@ -1,61 +1,74 @@
/* ioapi.h -- IO base function header for compress/uncompress .zip /* ioapi.c -- IO base function header for compress/uncompress .zip
part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html ) part of the MiniZip project
Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html ) Copyright (C) 2012-2017 Nathan Moinvaziri
https://github.com/nmoinvaz/minizip
Modifications for Zip64 support Modifications for Zip64 support
Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com ) Copyright (C) 2009-2010 Mathias Svensson
http://result42.com
For more info read MiniZip_info.txt Copyright (C) 1998-2010 Gilles Vollant
http://www.winimage.com/zLibDll/minizip.html
This program is distributed under the terms of the same license as zlib.
See the accompanying LICENSE file for the full text of the license.
*/ */
#include <stdlib.h>
#include <string.h>
#if defined unix || defined __APPLE__
#include <sys/types.h>
#include <unistd.h>
#endif
#include "ioapi.h" #include "ioapi.h"
namespace cc { #if defined(_WIN32)
# define snprintf _snprintf
#endif
voidpf call_zopen64 (const zlib_filefunc64_32_def* pfilefunc,const void*filename,int mode) voidpf call_zopen64(const zlib_filefunc64_32_def *pfilefunc, const void *filename, int mode)
{ {
if (pfilefunc->zfile_func64.zopen64_file != NULL) if (pfilefunc->zfile_func64.zopen64_file != NULL)
return (*(pfilefunc->zfile_func64.zopen64_file)) (pfilefunc->zfile_func64.opaque,filename,mode); 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);
{
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) voidpf call_zopendisk64(const zlib_filefunc64_32_def *pfilefunc, voidpf filestream, uint32_t number_disk, int mode)
{ {
if (pfilefunc->zfile_func64.zopendisk64_file != NULL)
return (*(pfilefunc->zfile_func64.zopendisk64_file)) (pfilefunc->zfile_func64.opaque, filestream, number_disk, mode);
return (*(pfilefunc->zopendisk32_file))(pfilefunc->zfile_func64.opaque, filestream, number_disk, mode);
}
long call_zseek64(const zlib_filefunc64_32_def *pfilefunc, voidpf filestream, uint64_t offset, int origin)
{
uint32_t offset_truncated = 0;
if (pfilefunc->zfile_func64.zseek64_file != NULL) if (pfilefunc->zfile_func64.zseek64_file != NULL)
return (*(pfilefunc->zfile_func64.zseek64_file)) (pfilefunc->zfile_func64.opaque,filestream,offset,origin); return (*(pfilefunc->zfile_func64.zseek64_file)) (pfilefunc->zfile_func64.opaque,filestream,offset,origin);
else offset_truncated = (uint32_t)offset;
{ if (offset_truncated != offset)
uLong offsetTruncated = (uLong)offset; return -1;
if (offsetTruncated != offset) return (*(pfilefunc->zseek32_file))(pfilefunc->zfile_func64.opaque,filestream, offset_truncated, origin);
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) uint64_t call_ztell64(const zlib_filefunc64_32_def *pfilefunc, voidpf filestream)
{ {
uint64_t position;
if (pfilefunc->zfile_func64.zseek64_file != NULL) if (pfilefunc->zfile_func64.zseek64_file != NULL)
return (*(pfilefunc->zfile_func64.ztell64_file)) (pfilefunc->zfile_func64.opaque,filestream); return (*(pfilefunc->zfile_func64.ztell64_file)) (pfilefunc->zfile_func64.opaque, filestream);
else position = (*(pfilefunc->ztell32_file))(pfilefunc->zfile_func64.opaque, filestream);
{ if ((position) == UINT32_MAX)
uLong tell_uLong = (*(pfilefunc->ztell32_file))(pfilefunc->zfile_func64.opaque,filestream); return (uint64_t)-1;
if ((tell_uLong) == ((uLong)-1)) return position;
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) 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->zfile_func64.zopen64_file = NULL;
p_filefunc64_32->zfile_func64.zopendisk64_file = NULL;
p_filefunc64_32->zopen32_file = p_filefunc32->zopen_file; p_filefunc64_32->zopen32_file = p_filefunc32->zopen_file;
p_filefunc64_32->zopendisk32_file = p_filefunc32->zopendisk_file;
p_filefunc64_32->zfile_func64.zerror_file = p_filefunc32->zerror_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.zread_file = p_filefunc32->zread_file;
p_filefunc64_32->zfile_func64.zwrite_file = p_filefunc32->zwrite_file; p_filefunc64_32->zfile_func64.zwrite_file = p_filefunc32->zwrite_file;
@ -68,159 +81,255 @@ void fill_zlib_filefunc64_32_def_from_filefunc32(zlib_filefunc64_32_def* p_filef
p_filefunc64_32->ztell32_file = p_filefunc32->ztell_file; p_filefunc64_32->ztell32_file = p_filefunc32->ztell_file;
} }
static voidpf ZCALLBACK fopen_file_func(ZIP_UNUSED voidpf opaque, const char *filename, int mode);
static uint32_t ZCALLBACK fread_file_func(voidpf opaque, voidpf stream, void* buf, uint32_t size);
static uint32_t ZCALLBACK fwrite_file_func(voidpf opaque, voidpf stream, const void *buf, uint32_t size);
static uint64_t ZCALLBACK ftell64_file_func(voidpf opaque, voidpf stream);
static long ZCALLBACK fseek64_file_func(voidpf opaque, voidpf stream, uint64_t offset, int origin);
static int ZCALLBACK fclose_file_func(voidpf opaque, voidpf stream);
static int ZCALLBACK ferror_file_func(voidpf opaque, voidpf stream);
typedef struct
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; FILE *file;
const char* mode_fopen = NULL; int filenameLength;
if ((mode & ZLIB_FILEFUNC_MODE_READWRITEFILTER)==ZLIB_FILEFUNC_MODE_READ) void *filename;
mode_fopen = "rb"; } FILE_IOPOSIX;
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)) static voidpf file_build_ioposix(FILE *file, const char *filename)
file = fopen(filename, mode_fopen); {
return file; FILE_IOPOSIX *ioposix = NULL;
if (file == NULL)
return NULL;
ioposix = (FILE_IOPOSIX*)malloc(sizeof(FILE_IOPOSIX));
ioposix->file = file;
ioposix->filenameLength = (int)strlen(filename) + 1;
ioposix->filename = (char*)malloc(ioposix->filenameLength * sizeof(char));
strncpy((char*)ioposix->filename, filename, ioposix->filenameLength);
return (voidpf)ioposix;
} }
static voidpf ZCALLBACK fopen64_file_func (voidpf opaque, const void* filename, int mode) static voidpf ZCALLBACK fopen_file_func(ZIP_UNUSED voidpf opaque, const char *filename, int mode)
{ {
FILE* file = NULL; FILE* file = NULL;
const char* mode_fopen = NULL; const char *mode_fopen = NULL;
if ((mode & ZLIB_FILEFUNC_MODE_READWRITEFILTER)==ZLIB_FILEFUNC_MODE_READ) if ((mode & ZLIB_FILEFUNC_MODE_READWRITEFILTER) == ZLIB_FILEFUNC_MODE_READ)
mode_fopen = "rb"; mode_fopen = "rb";
else else if (mode & ZLIB_FILEFUNC_MODE_EXISTING)
if (mode & ZLIB_FILEFUNC_MODE_EXISTING)
mode_fopen = "r+b"; mode_fopen = "r+b";
else else if (mode & ZLIB_FILEFUNC_MODE_CREATE)
if (mode & ZLIB_FILEFUNC_MODE_CREATE)
mode_fopen = "wb"; mode_fopen = "wb";
if ((filename!=NULL) && (mode_fopen != NULL)) if ((filename != NULL) && (mode_fopen != NULL))
{ {
#if (CC_TARGET_PLATFORM == CC_PLATFORM_MARMALADE || CC_TARGET_PLATFORM == CC_PLATFORM_BADA || CC_TARGET_PLATFORM == CC_PLATFORM_BLACKBERRY || CC_TARGET_PLATFORM == CC_PLATFORM_NACL || CC_TARGET_PLATFORM == CC_PLATFORM_EMSCRIPTEN) file = fopen(filename, mode_fopen);
file = NULL; return file_build_ioposix(file, filename);
#else
file = fopen64((const char*)filename, mode_fopen);
#endif
} }
return file; return file;
} }
static voidpf ZCALLBACK fopen64_file_func(ZIP_UNUSED voidpf opaque, const void *filename, int mode)
static uLong ZCALLBACK fread_file_func (voidpf opaque, voidpf stream, void* buf, uLong size)
{ {
uLong ret; FILE* file = NULL;
ret = (uLong)fread(buf, 1, (size_t)size, (FILE *)stream); 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_build_ioposix(file, (const char*)filename);
}
return file;
}
static voidpf ZCALLBACK fopendisk64_file_func(voidpf opaque, voidpf stream, uint32_t number_disk, int mode)
{
FILE_IOPOSIX *ioposix = NULL;
char *diskFilename = NULL;
voidpf ret = NULL;
int i = 0;
if (stream == NULL)
return NULL;
ioposix = (FILE_IOPOSIX*)stream;
diskFilename = (char*)malloc(ioposix->filenameLength * sizeof(char));
strncpy(diskFilename, (const char*)ioposix->filename, ioposix->filenameLength);
for (i = ioposix->filenameLength - 1; i >= 0; i -= 1)
{
if (diskFilename[i] != '.')
continue;
snprintf(&diskFilename[i], ioposix->filenameLength - i, ".z%02u", number_disk + 1);
break;
}
if (i >= 0)
ret = fopen64_file_func(opaque, diskFilename, mode);
free(diskFilename);
return ret; return ret;
} }
static uLong ZCALLBACK fwrite_file_func (voidpf opaque, voidpf stream, const void* buf, uLong size) static voidpf ZCALLBACK fopendisk_file_func(voidpf opaque, voidpf stream, uint32_t number_disk, int mode)
{ {
uLong ret; FILE_IOPOSIX *ioposix = NULL;
ret = (uLong)fwrite(buf, 1, (size_t)size, (FILE *)stream); char *diskFilename = NULL;
voidpf ret = NULL;
int i = 0;
if (stream == NULL)
return NULL;
ioposix = (FILE_IOPOSIX*)stream;
diskFilename = (char*)malloc(ioposix->filenameLength * sizeof(char));
strncpy(diskFilename, (const char*)ioposix->filename, ioposix->filenameLength);
for (i = ioposix->filenameLength - 1; i >= 0; i -= 1)
{
if (diskFilename[i] != '.')
continue;
snprintf(&diskFilename[i], ioposix->filenameLength - i, ".z%02u", number_disk + 1);
break;
}
if (i >= 0)
ret = fopen_file_func(opaque, diskFilename, mode);
free(diskFilename);
return ret; return ret;
} }
static long ZCALLBACK ftell_file_func (voidpf opaque, voidpf stream) static uint32_t ZCALLBACK fread_file_func(ZIP_UNUSED voidpf opaque, voidpf stream, void* buf, uint32_t size)
{ {
long ret; FILE_IOPOSIX *ioposix = NULL;
ret = ftell((FILE *)stream); uint32_t read = (uint32_t)-1;
if (stream == NULL)
return read;
ioposix = (FILE_IOPOSIX*)stream;
read = (uint32_t)fread(buf, 1, (size_t)size, ioposix->file);
return read;
}
static uint32_t ZCALLBACK fwrite_file_func(ZIP_UNUSED voidpf opaque, voidpf stream, const void *buf, uint32_t size)
{
FILE_IOPOSIX *ioposix = NULL;
uint32_t written = (uint32_t)-1;
if (stream == NULL)
return written;
ioposix = (FILE_IOPOSIX*)stream;
written = (uint32_t)fwrite(buf, 1, (size_t)size, ioposix->file);
return written;
}
static long ZCALLBACK ftell_file_func(ZIP_UNUSED voidpf opaque, voidpf stream)
{
FILE_IOPOSIX *ioposix = NULL;
long ret = -1;
if (stream == NULL)
return ret;
ioposix = (FILE_IOPOSIX*)stream;
ret = ftell(ioposix->file);
return ret; return ret;
} }
static uint64_t ZCALLBACK ftell64_file_func(ZIP_UNUSED voidpf opaque, voidpf stream)
static ZPOS64_T ZCALLBACK ftell64_file_func (voidpf opaque, voidpf stream)
{ {
ZPOS64_T ret; FILE_IOPOSIX *ioposix = NULL;
#if (CC_TARGET_PLATFORM == CC_PLATFORM_MARMALADE || CC_TARGET_PLATFORM == CC_PLATFORM_BADA || CC_TARGET_PLATFORM == CC_PLATFORM_BLACKBERRY || CC_TARGET_PLATFORM == CC_PLATFORM_NACL || CC_TARGET_PLATFORM == CC_PLATFORM_EMSCRIPTEN) uint64_t ret = (uint64_t)-1;
ret = 0; if (stream == NULL)
#else return ret;
ret = ftello64((FILE *)stream); ioposix = (FILE_IOPOSIX*)stream;
#endif ret = ftello64(ioposix->file);
return ret; return ret;
} }
static long ZCALLBACK fseek_file_func (voidpf opaque, voidpf stream, uLong offset, int origin) static long ZCALLBACK fseek_file_func(ZIP_UNUSED voidpf opaque, voidpf stream, uint32_t offset, int origin)
{ {
int fseek_origin=0; FILE_IOPOSIX *ioposix = NULL;
long ret; int fseek_origin = 0;
long ret = 0;
if (stream == NULL)
return -1;
ioposix = (FILE_IOPOSIX*)stream;
switch (origin) switch (origin)
{ {
case ZLIB_FILEFUNC_SEEK_CUR : case ZLIB_FILEFUNC_SEEK_CUR:
fseek_origin = SEEK_CUR; fseek_origin = SEEK_CUR;
break; break;
case ZLIB_FILEFUNC_SEEK_END : case ZLIB_FILEFUNC_SEEK_END:
fseek_origin = SEEK_END; fseek_origin = SEEK_END;
break; break;
case ZLIB_FILEFUNC_SEEK_SET : case ZLIB_FILEFUNC_SEEK_SET:
fseek_origin = SEEK_SET; fseek_origin = SEEK_SET;
break; break;
default: return -1; default:
return -1;
} }
ret = 0; if (fseek(ioposix->file, offset, fseek_origin) != 0)
if (fseek((FILE *)stream, offset, fseek_origin) != 0)
ret = -1; ret = -1;
return ret; return ret;
} }
static long ZCALLBACK fseek64_file_func (voidpf opaque, voidpf stream, ZPOS64_T offset, int origin) static long ZCALLBACK fseek64_file_func(ZIP_UNUSED voidpf opaque, voidpf stream, uint64_t offset, int origin)
{ {
#if (CC_TARGET_PLATFORM == CC_PLATFORM_MARMALADE || CC_TARGET_PLATFORM == CC_PLATFORM_BADA || CC_TARGET_PLATFORM == CC_PLATFORM_BLACKBERRY || CC_TARGET_PLATFORM == CC_PLATFORM_NACL || CC_TARGET_PLATFORM == CC_PLATFORM_EMSCRIPTEN) FILE_IOPOSIX *ioposix = NULL;
return -1; int fseek_origin = 0;
#else long ret = 0;
int fseek_origin=0;
if (stream == NULL)
return -1;
ioposix = (FILE_IOPOSIX*)stream;
switch (origin) switch (origin)
{ {
case ZLIB_FILEFUNC_SEEK_CUR : case ZLIB_FILEFUNC_SEEK_CUR:
fseek_origin = SEEK_CUR; fseek_origin = SEEK_CUR;
break; break;
case ZLIB_FILEFUNC_SEEK_END : case ZLIB_FILEFUNC_SEEK_END:
fseek_origin = SEEK_END; fseek_origin = SEEK_END;
break; break;
case ZLIB_FILEFUNC_SEEK_SET : case ZLIB_FILEFUNC_SEEK_SET:
fseek_origin = SEEK_SET; fseek_origin = SEEK_SET;
break; break;
default: return -1; default:
return -1;
} }
if(fseeko64((FILE *)stream, offset, fseek_origin) != 0)
return -1;
return 0;
#endif
}
if (fseeko64(ioposix->file, offset, fseek_origin) != 0)
ret = -1;
static int ZCALLBACK fclose_file_func (voidpf opaque, voidpf stream)
{
int ret;
ret = fclose((FILE *)stream);
return ret; return ret;
} }
static int ZCALLBACK ferror_file_func (voidpf opaque, voidpf stream) static int ZCALLBACK fclose_file_func(ZIP_UNUSED voidpf opaque, voidpf stream)
{ {
int ret; FILE_IOPOSIX *ioposix = NULL;
ret = ferror((FILE *)stream); int ret = -1;
if (stream == NULL)
return ret;
ioposix = (FILE_IOPOSIX*)stream;
if (ioposix->filename != NULL)
free(ioposix->filename);
ret = fclose(ioposix->file);
free(ioposix);
return ret; return ret;
} }
void fill_fopen_filefunc (zlib_filefunc_def* pzlib_filefunc_def) static int ZCALLBACK ferror_file_func(ZIP_UNUSED voidpf opaque, voidpf stream)
{
FILE_IOPOSIX *ioposix = NULL;
int ret = -1;
if (stream == NULL)
return ret;
ioposix = (FILE_IOPOSIX*)stream;
ret = ferror(ioposix->file);
return ret;
}
void fill_fopen_filefunc(zlib_filefunc_def *pzlib_filefunc_def)
{ {
pzlib_filefunc_def->zopen_file = fopen_file_func; pzlib_filefunc_def->zopen_file = fopen_file_func;
pzlib_filefunc_def->zopendisk_file = fopendisk_file_func;
pzlib_filefunc_def->zread_file = fread_file_func; pzlib_filefunc_def->zread_file = fread_file_func;
pzlib_filefunc_def->zwrite_file = fwrite_file_func; pzlib_filefunc_def->zwrite_file = fwrite_file_func;
pzlib_filefunc_def->ztell_file = ftell_file_func; pzlib_filefunc_def->ztell_file = ftell_file_func;
@ -230,9 +339,10 @@ void fill_fopen_filefunc (zlib_filefunc_def* pzlib_filefunc_def)
pzlib_filefunc_def->opaque = NULL; pzlib_filefunc_def->opaque = NULL;
} }
void fill_fopen64_filefunc (zlib_filefunc64_def* pzlib_filefunc_def) void fill_fopen64_filefunc(zlib_filefunc64_def *pzlib_filefunc_def)
{ {
pzlib_filefunc_def->zopen64_file = fopen64_file_func; pzlib_filefunc_def->zopen64_file = fopen64_file_func;
pzlib_filefunc_def->zopendisk64_file = fopendisk64_file_func;
pzlib_filefunc_def->zread_file = fread_file_func; pzlib_filefunc_def->zread_file = fread_file_func;
pzlib_filefunc_def->zwrite_file = fwrite_file_func; pzlib_filefunc_def->zwrite_file = fwrite_file_func;
pzlib_filefunc_def->ztell64_file = ftell64_file_func; pzlib_filefunc_def->ztell64_file = ftell64_file_func;
@ -241,5 +351,3 @@ void fill_fopen64_filefunc (zlib_filefunc64_def* pzlib_filefunc_def)
pzlib_filefunc_def->zerror_file = ferror_file_func; pzlib_filefunc_def->zerror_file = ferror_file_func;
pzlib_filefunc_def->opaque = NULL; pzlib_filefunc_def->opaque = NULL;
} }
} // end of namespace cc

226
sources/unzip/ioapi.h
View File

@ -1,199 +1,153 @@
/* ioapi.h -- IO base function header for compress/uncompress .zip /* ioapi.h -- IO base function header for compress/uncompress .zip
part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html ) part of the MiniZip project
Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html ) Copyright (C) 2012-2017 Nathan Moinvaziri
https://github.com/nmoinvaz/minizip
Modifications for Zip64 support Copyright (C) 2009-2010 Mathias Svensson
Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com ) Modifications for Zip64 support
http://result42.com
For more info read MiniZip_info.txt Copyright (C) 1998-2010 Gilles Vollant
http://www.winimage.com/zLibDll/minizip.html
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)
This program is distributed under the terms of the same license as zlib.
See the accompanying LICENSE file for the full text of the license.
*/ */
#ifndef _ZLIBIOAPI64_H #ifndef _ZLIBIOAPI64_H
#define _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 <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdint.h>
#include "zlib.h" #include "zlib.h"
namespace cc { #ifdef __GNUC__
# define ZIP_UNUSED __attribute__((__unused__))
#ifndef OF #else
#define OF _Z_OF # define ZIP_UNUSED
#endif #endif
#if defined(USE_FILE32API) #if defined(USE_FILE32API)
#define fopen64 fopen # define fopen64 fopen
#define ftello64 ftell # define ftello64 ftell
#define fseeko64 fseek # define fseeko64 fseek
#else #else
#ifdef _MSC_VER # if defined(_MSC_VER)
#define fopen64 fopen # define fopen64 fopen
#if (_MSC_VER >= 1400) && (!(defined(NO_MSCVER_FILE64_FUNC))) # if (_MSC_VER >= 1400) && (!(defined(NO_MSCVER_FILE64_FUNC)))
#define ftello64 _ftelli64 # define ftello64 _ftelli64
#define fseeko64 _fseeki64 # define fseeko64 _fseeki64
#else // old MSC # else /* old MSC */
#define ftello64 ftell # define ftello64 ftell
#define fseeko64 fseek # define fseeko64 fseek
#endif # endif
#endif # else
# define fopen64 fopen
# define ftello64 ftello
# define fseeko64 fseeko
# endif
#endif #endif
/* #ifdef __cplusplus
#ifndef ZPOS64_T extern "C" {
#ifdef _WIN32
#define ZPOS64_T fpos_t
#else
#include <stdint.h>
#define ZPOS64_T uint64_t
#endif
#endif #endif
*/
#ifdef HAVE_MINIZIP64_CONF_H
#include "mz64conf.h"
#endif
/* a type chosen 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
#define ZLIB_FILEFUNC_SEEK_CUR (1) #define ZLIB_FILEFUNC_SEEK_CUR (1)
#define ZLIB_FILEFUNC_SEEK_END (2) #define ZLIB_FILEFUNC_SEEK_END (2)
#define ZLIB_FILEFUNC_SEEK_SET (0) #define ZLIB_FILEFUNC_SEEK_SET (0)
#define ZLIB_FILEFUNC_MODE_READ (1) #define ZLIB_FILEFUNC_MODE_READ (1)
#define ZLIB_FILEFUNC_MODE_WRITE (2) #define ZLIB_FILEFUNC_MODE_WRITE (2)
#define ZLIB_FILEFUNC_MODE_READWRITEFILTER (3) #define ZLIB_FILEFUNC_MODE_READWRITEFILTER (3)
#define ZLIB_FILEFUNC_MODE_EXISTING (4)
#define ZLIB_FILEFUNC_MODE_EXISTING (4) #define ZLIB_FILEFUNC_MODE_CREATE (8)
#define ZLIB_FILEFUNC_MODE_CREATE (8)
#ifndef ZCALLBACK #ifndef ZCALLBACK
#if (defined(WIN32) || defined(_WIN32) || defined (WINDOWS) || defined (_WINDOWS)) && defined(CALLBACK) && defined (USEWINDOWS_CALLBACK) # if (defined(WIN32) || defined(_WIN32) || defined (WINDOWS) || \
#define ZCALLBACK CALLBACK defined (_WINDOWS)) && defined(CALLBACK) && defined (USEWINDOWS_CALLBACK)
#else # define ZCALLBACK CALLBACK
#define ZCALLBACK # else
#endif # define ZCALLBACK
# endif
#endif #endif
typedef voidpf (ZCALLBACK *open_file_func) (voidpf opaque, const char *filename, int mode);
typedef voidpf (ZCALLBACK *opendisk_file_func) (voidpf opaque, voidpf stream, uint32_t number_disk, int mode);
typedef uint32_t (ZCALLBACK *read_file_func) (voidpf opaque, voidpf stream, void* buf, uint32_t size);
typedef uint32_t (ZCALLBACK *write_file_func) (voidpf opaque, voidpf stream, const void *buf, uint32_t size);
typedef int (ZCALLBACK *close_file_func) (voidpf opaque, voidpf stream);
typedef int (ZCALLBACK *error_file_func) (voidpf opaque, voidpf stream);
typedef long (ZCALLBACK *tell_file_func) (voidpf opaque, voidpf stream);
typedef long (ZCALLBACK *seek_file_func) (voidpf opaque, voidpf stream, uint32_t offset, int origin);
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 */ /* here is the "old" 32 bits structure structure */
typedef struct zlib_filefunc_def_s typedef struct zlib_filefunc_def_s
{ {
open_file_func zopen_file; open_file_func zopen_file;
opendisk_file_func zopendisk_file;
read_file_func zread_file; read_file_func zread_file;
write_file_func zwrite_file; write_file_func zwrite_file;
tell_file_func ztell_file; tell_file_func ztell_file;
seek_file_func zseek_file; seek_file_func zseek_file;
close_file_func zclose_file; close_file_func zclose_file;
testerror_file_func zerror_file; error_file_func zerror_file;
voidpf opaque; voidpf opaque;
} zlib_filefunc_def; } zlib_filefunc_def;
typedef ZPOS64_T (ZCALLBACK *tell64_file_func) OF((voidpf opaque, voidpf stream)); typedef uint64_t (ZCALLBACK *tell64_file_func) (voidpf opaque, voidpf stream);
typedef long (ZCALLBACK *seek64_file_func) OF((voidpf opaque, voidpf stream, ZPOS64_T offset, int origin)); typedef long (ZCALLBACK *seek64_file_func) (voidpf opaque, voidpf stream, uint64_t offset, int origin);
typedef voidpf (ZCALLBACK *open64_file_func) OF((voidpf opaque, const void* filename, int mode)); typedef voidpf (ZCALLBACK *open64_file_func) (voidpf opaque, const void *filename, int mode);
typedef voidpf (ZCALLBACK *opendisk64_file_func)(voidpf opaque, voidpf stream, uint32_t number_disk, int mode);
typedef struct zlib_filefunc64_def_s typedef struct zlib_filefunc64_def_s
{ {
open64_file_func zopen64_file; open64_file_func zopen64_file;
read_file_func zread_file; opendisk64_file_func zopendisk64_file;
write_file_func zwrite_file; read_file_func zread_file;
tell64_file_func ztell64_file; write_file_func zwrite_file;
seek64_file_func zseek64_file; tell64_file_func ztell64_file;
close_file_func zclose_file; seek64_file_func zseek64_file;
testerror_file_func zerror_file; close_file_func zclose_file;
voidpf opaque; error_file_func zerror_file;
voidpf opaque;
} zlib_filefunc64_def; } zlib_filefunc64_def;
void fill_fopen64_filefunc OF((zlib_filefunc64_def* pzlib_filefunc_def)); void fill_fopen_filefunc(zlib_filefunc_def *pzlib_filefunc_def);
void fill_fopen_filefunc OF((zlib_filefunc_def* pzlib_filefunc_def)); void fill_fopen64_filefunc(zlib_filefunc64_def *pzlib_filefunc_def);
/* now internal definition, only for zip.c and unzip.h */ /* now internal definition, only for zip.c and unzip.h */
typedef struct zlib_filefunc64_32_def_s typedef struct zlib_filefunc64_32_def_s
{ {
zlib_filefunc64_def zfile_func64; zlib_filefunc64_def zfile_func64;
open_file_func zopen32_file; open_file_func zopen32_file;
opendisk_file_func zopendisk32_file;
tell_file_func ztell32_file; tell_file_func ztell32_file;
seek_file_func zseek32_file; seek_file_func zseek32_file;
} zlib_filefunc64_32_def; } 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))
#define ZREAD64(filefunc,filestream,buf,size) ((*((filefunc).zfile_func64.zread_file)) ((filefunc).zfile_func64.opaque,filestream,buf,size)) voidpf call_zopen64(const zlib_filefunc64_32_def *pfilefunc,const void*filename, int mode);
#define ZWRITE64(filefunc,filestream,buf,size) ((*((filefunc).zfile_func64.zwrite_file)) ((filefunc).zfile_func64.opaque,filestream,buf,size)) voidpf call_zopendisk64(const zlib_filefunc64_32_def *pfilefunc, voidpf filestream, uint32_t number_disk, int mode);
//#define ZTELL64(filefunc,filestream) ((*((filefunc).ztell64_file)) ((filefunc).opaque,filestream)) long call_zseek64(const zlib_filefunc64_32_def *pfilefunc, voidpf filestream, uint64_t offset, int origin);
//#define ZSEEK64(filefunc,filestream,pos,mode) ((*((filefunc).zseek64_file)) ((filefunc).opaque,filestream,pos,mode)) uint64_t call_ztell64(const zlib_filefunc64_32_def *pfilefunc, voidpf filestream);
#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)); void fill_zlib_filefunc64_32_def_from_filefunc32(zlib_filefunc64_32_def *p_filefunc64_32, const zlib_filefunc_def *p_filefunc32);
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 ZOPENDISK64(filefunc,filestream,diskn,mode) (call_zopendisk64((&(filefunc)),(filestream),(diskn),(mode)))
#define ZTELL64(filefunc,filestream) (call_ztell64((&(filefunc)),(filestream)))
#define ZSEEK64(filefunc,filestream,pos,mode) (call_zseek64((&(filefunc)),(filestream),(pos),(mode)))
#define ZOPEN64(filefunc,filename,mode) (call_zopen64((&(filefunc)),(filename),(mode))) #ifdef __cplusplus
#define ZTELL64(filefunc,filestream) (call_ztell64((&(filefunc)),(filestream))) }
#define ZSEEK64(filefunc,filestream,pos,mode) (call_zseek64((&(filefunc)),(filestream),(pos),(mode))) #endif
} // end of namespace cc
#endif #endif

332
sources/unzip/ioapi_mem.cpp
View File

@ -1,22 +1,25 @@
/* ioapi_mem.c -- IO base function header for compress/uncompress .zip /* ioapi_mem.c -- IO base function header for compress/uncompress .zip
files using zlib + zip or unzip API files using zlib + zip or unzip API
This version of ioapi is designed to access memory rather than files. This version of ioapi is designed to access memory rather than files.
We do use a region of memory to put data in to and take it out of. We do We do use a region of memory to put data in to and take it out of. We do
not have auto-extending buffers and do not inform anyone else that the not have auto-extending buffers and do not inform anyone else that the
data has been written. It is really intended for accessing a zip archive data has been written. It is really intended for accessing a zip archive
embedded in an application such that I can write an installer with no embedded in an application such that I can write an installer with no
external files. Creation of archives has not been attempted, although external files. Creation of archives has not been attempted, although
parts of the framework are present. parts of the framework are present.
Based on Unzip ioapi.c version 0.22, May 19th, 2003 Based on Unzip ioapi.c version 0.22, May 19th, 2003
Copyright (C) 1998-2003 Gilles Vollant Copyright (C) 2012-2017 Nathan Moinvaziri
(C) 2003 Justin Fletcher https://github.com/nmoinvaz/minizip
Copyright (C) 2003 Justin Fletcher
Copyright (C) 1998-2003 Gilles Vollant
http://www.winimage.com/zLibDll/minizip.html
This file is under the same license as the Unzip tool it is distributed This file is under the same license as the Unzip tool it is distributed
with. with.
*/ */
#include <stdio.h> #include <stdio.h>
@ -24,208 +27,141 @@
#include <string.h> #include <string.h>
#include "zlib.h" #include "zlib.h"
#include "ioapi.h"
#include "ioapi_mem.h" #include "ioapi_mem.h"
#ifdef _MSC_VER #ifndef IOMEM_BUFFERSIZE
# define IOMEM_BUFFERSIZE (UINT16_MAX)
#define strtoull _strtoui64
#endif #endif
namespace cc { voidpf ZCALLBACK fopen_mem_func(voidpf opaque, ZIP_UNUSED const char *filename, int mode)
{
ourmemory_t *mem = (ourmemory_t *)opaque;
if (mem == NULL)
return NULL; /* Mem structure passed in was null */
voidpf ZCALLBACK fopen_mem_func (voidpf opaque, if (mode & ZLIB_FILEFUNC_MODE_CREATE)
const char* filename,
int mode)
{ {
ourmemory_t *mem = (ourmemory_t*)malloc(sizeof(ourmemory_t)); if (mem->grow)
{
if (mem==NULL) return NULL; /* Can't allocate space, so failed */ mem->size = IOMEM_BUFFERSIZE;
mem->base = (char *)malloc(mem->size);
/* Filenames are specified in the form :
* <hex base of zip file>+<hex size of zip file>
* This may not work where memory addresses are longer than the
* size of an int and therefore may need addressing for 64bit
* architectures
*/
memset(mem, 0, sizeof(ourmemory_t));
char *pEnd = NULL;
void *base = NULL;
unsigned long size = 0;
base = (void*)strtoull(filename, &pEnd, 16);
if (!base) return NULL;
size = strtoul(pEnd, &pEnd, 16);
if (!size) return NULL;
mem->base = base;
mem->size = size;
if (mode & ZLIB_FILEFUNC_MODE_CREATE) {
mem->limit = 0; /* When writing we start with 0 bytes written */
} else {
mem->limit = mem->size;
}
mem->cur_offset = 0;
return mem;
}
voidpf ZCALLBACK fopen_mem_func64_32 (voidpf opaque,
const void* filename,
int mode)
{
ourmemory_t *mem = (ourmemory_t*)malloc(sizeof(ourmemory_t));
if (mem==NULL) return NULL; /* Can't allocate space, so failed */
/* Filenames are specified in the form :
* <hex base of zip file>+<hex size of zip file>
* This may not work where memory addresses are longer than the
* size of an int and therefore may need addressing for 64bit
* architectures
*/
memset(mem, 0, sizeof(ourmemory_t));
char *pEnd = NULL;
void *base = NULL;
unsigned long size = 0;
base = (void*)strtoull((const char*)filename, &pEnd, 16);
if (!base) return NULL;
size = strtoul(pEnd, &pEnd, 16);
if (!size) return NULL;
mem->base = base;
mem->size = size;
if (mode & ZLIB_FILEFUNC_MODE_CREATE) {
mem->limit=0; /* When writing we start with 0 bytes written */
} else {
mem->limit=mem->size;
} }
mem->cur_offset = 0; mem->limit = 0; /* When writing we start with 0 bytes written */
return mem;
} }
else
mem->limit = mem->size;
uLong ZCALLBACK fread_mem_func (voidpf opaque, voidpf stream, void* buf, uLong size) mem->cur_offset = 0;
return mem;
}
voidpf ZCALLBACK fopendisk_mem_func(ZIP_UNUSED voidpf opaque, ZIP_UNUSED voidpf stream, ZIP_UNUSED uint32_t number_disk, ZIP_UNUSED int mode)
{
/* Not used */
return NULL;
}
uint32_t ZCALLBACK fread_mem_func(ZIP_UNUSED voidpf opaque, voidpf stream, void *buf, uint32_t size)
{
ourmemory_t *mem = (ourmemory_t *)stream;
if (size > mem->size - mem->cur_offset)
size = mem->size - mem->cur_offset;
memcpy(buf, mem->base + mem->cur_offset, size);
mem->cur_offset += size;
return size;
}
uint32_t ZCALLBACK fwrite_mem_func(ZIP_UNUSED voidpf opaque, voidpf stream, const void *buf, uint32_t size)
{
ourmemory_t *mem = (ourmemory_t *)stream;
uint32_t newmemsize = 0;
char *newbase = NULL;
if (size > mem->size - mem->cur_offset)
{ {
ourmemory_t *mem = (ourmemory_t *)stream; if (mem->grow)
{
if (size > mem->size - mem->cur_offset) { newmemsize = mem->size;
if (size < IOMEM_BUFFERSIZE)
newmemsize += IOMEM_BUFFERSIZE;
else
newmemsize += size;
newbase = (char *)malloc(newmemsize);
memcpy(newbase, mem->base, mem->size);
free(mem->base);
mem->base = newbase;
mem->size = newmemsize;
}
else
size = mem->size - mem->cur_offset; size = mem->size - mem->cur_offset;
}
memcpy(buf, (char*)mem->base + mem->cur_offset, size);
mem->cur_offset+=size;
return size;
} }
memcpy(mem->base + mem->cur_offset, buf, size);
mem->cur_offset += size;
if (mem->cur_offset > mem->limit)
mem->limit = mem->cur_offset;
return size;
}
uLong ZCALLBACK fwrite_mem_func (voidpf opaque, voidpf stream, const void* buf, uLong size) long ZCALLBACK ftell_mem_func(ZIP_UNUSED voidpf opaque, voidpf stream)
{
ourmemory_t *mem = (ourmemory_t *)stream;
return mem->cur_offset;
}
long ZCALLBACK fseek_mem_func(ZIP_UNUSED voidpf opaque, voidpf stream, uint32_t offset, int origin)
{
ourmemory_t *mem = (ourmemory_t *)stream;
uint32_t new_pos = 0;
switch (origin)
{ {
ourmemory_t *mem = (ourmemory_t *)stream; case ZLIB_FILEFUNC_SEEK_CUR:
new_pos = mem->cur_offset + offset;
if (size > mem->size - mem->cur_offset) { break;
size = mem->size - mem->cur_offset; case ZLIB_FILEFUNC_SEEK_END:
} new_pos = mem->limit + offset;
break;
memcpy((char*)mem->base + mem->cur_offset, buf, size); case ZLIB_FILEFUNC_SEEK_SET:
mem->cur_offset+=size; new_pos = offset;
if (mem->cur_offset > mem->limit) { break;
mem->limit = mem->cur_offset; default:
} return -1;
return size;
} }
long ZCALLBACK ftell_mem_func (voidpf opaque, voidpf stream) if (new_pos > mem->size)
{ return 1; /* Failed to seek that far */
ourmemory_t *mem = (ourmemory_t *)stream; mem->cur_offset = new_pos;
return 0;
}
return mem->cur_offset; int ZCALLBACK fclose_mem_func(ZIP_UNUSED voidpf opaque, ZIP_UNUSED voidpf stream)
} {
/* Even with grow = 1, caller must always free() memory */
return 0;
}
long ZCALLBACK fseek_mem_func (voidpf opaque, voidpf stream, uLong offset, int origin) int ZCALLBACK ferror_mem_func(ZIP_UNUSED voidpf opaque, ZIP_UNUSED voidpf stream)
{ {
ourmemory_t *mem = (ourmemory_t *)stream; /* We never return errors */
uLong new_pos; return 0;
switch (origin) { }
case ZLIB_FILEFUNC_SEEK_CUR : {
new_pos = mem->cur_offset + offset;
break;
}
case ZLIB_FILEFUNC_SEEK_END : {
new_pos = mem->limit + offset;
break;
}
case ZLIB_FILEFUNC_SEEK_SET : {
new_pos = offset;
break;
}
default: {
return -1;
}
}
if (new_pos > mem->size) return 1; /* Failed to seek that far */ void fill_memory_filefunc(zlib_filefunc_def *pzlib_filefunc_def, ourmemory_t *ourmem)
{
if (new_pos > mem->limit) { pzlib_filefunc_def->zopen_file = fopen_mem_func;
memset((char*)mem->base + mem->limit, 0, new_pos - mem->limit); pzlib_filefunc_def->zopendisk_file = fopendisk_mem_func;
} pzlib_filefunc_def->zread_file = fread_mem_func;
pzlib_filefunc_def->zwrite_file = fwrite_mem_func;
mem->cur_offset = new_pos; pzlib_filefunc_def->ztell_file = ftell_mem_func;
return 0; pzlib_filefunc_def->zseek_file = fseek_mem_func;
} pzlib_filefunc_def->zclose_file = fclose_mem_func;
pzlib_filefunc_def->zerror_file = ferror_mem_func;
int ZCALLBACK fclose_mem_func (voidpf opaque, voidpf stream) pzlib_filefunc_def->opaque = ourmem;
{ }
ourmemory_t *mem = (ourmemory_t *)stream;
/* Note that once we've written to the buffer we don't tell anyone
about it here. Probably the opaque handle could be used to inform
some other component of how much data was written.
This, and other aspects of writing through this interface, has
not been tested.
*/
free (mem);
return 0;
}
int ZCALLBACK ferror_mem_func (voidpf opaque, voidpf stream)
{
/* We never return errors */
return 0;
}
void fill_memory_filefunc (zlib_filefunc_def* pzlib_filefunc_def)
{
pzlib_filefunc_def->zopen_file = fopen_mem_func;
pzlib_filefunc_def->zread_file = fread_mem_func;
pzlib_filefunc_def->zwrite_file = fwrite_mem_func;
pzlib_filefunc_def->ztell_file = ftell_mem_func;
pzlib_filefunc_def->zseek_file = fseek_mem_func;
pzlib_filefunc_def->zclose_file = fclose_mem_func;
pzlib_filefunc_def->zerror_file = ferror_mem_func;
pzlib_filefunc_def->opaque = NULL;
}
void fill_memory_filefunc64_32 (zlib_filefunc64_32_def* pzlib_filefunc_def)
{
pzlib_filefunc_def->zopen32_file = fopen_mem_func;
pzlib_filefunc_def->zfile_func64.zopen64_file = fopen_mem_func64_32;
pzlib_filefunc_def->zfile_func64.zread_file = fread_mem_func;
pzlib_filefunc_def->zfile_func64.zwrite_file = fwrite_mem_func;
pzlib_filefunc_def->ztell32_file = ftell_mem_func;
pzlib_filefunc_def->zseek32_file = fseek_mem_func;
pzlib_filefunc_def->zfile_func64.zseek64_file = NULL;
pzlib_filefunc_def->zfile_func64.zclose_file = fclose_mem_func;
pzlib_filefunc_def->zfile_func64.zerror_file = ferror_mem_func;
pzlib_filefunc_def->zfile_func64.opaque = NULL;
}
}; // namespace cc

91
sources/unzip/ioapi_mem.h
View File

@ -1,61 +1,52 @@
/* ioapi_mem.h -- IO base function header for compress/uncompress .zip
files using zlib + zip or unzip API
#ifndef quickcocos2dx_ioapi_mem_h This version of ioapi is designed to access memory rather than files.
#define quickcocos2dx_ioapi_mem_h We do use a region of memory to put data in to and take it out of.
Copyright (C) 2012-2017 Nathan Moinvaziri (https://github.com/nmoinvaz/minizip)
(C) 2003 Justin Fletcher
(C) 1998-2003 Gilles Vollant
This program is distributed under the terms of the same license as zlib.
See the accompanying LICENSE file for the full text of the license.
*/
#ifndef _IOAPI_MEM_H
#define _IOAPI_MEM_H
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "zlib.h"
#include "ioapi.h" #include "ioapi.h"
#ifdef __cplusplus
extern "C" {
#endif
namespace cc { voidpf ZCALLBACK fopen_mem_func(voidpf opaque, const char* filename, int mode);
voidpf ZCALLBACK fopen_mem_func OF(( voidpf ZCALLBACK fopendisk_mem_func(voidpf opaque, voidpf stream, uint32_t number_disk, int mode);
voidpf opaque, uint32_t ZCALLBACK fread_mem_func(voidpf opaque, voidpf stream, void* buf, uint32_t size);
const char* filename, uint32_t ZCALLBACK fwrite_mem_func(voidpf opaque, voidpf stream, const void* buf, uint32_t size);
int mode)); long ZCALLBACK ftell_mem_func(voidpf opaque, voidpf stream);
long ZCALLBACK fseek_mem_func(voidpf opaque, voidpf stream, uint32_t offset, int origin);
int ZCALLBACK fclose_mem_func(voidpf opaque, voidpf stream);
int ZCALLBACK ferror_mem_func(voidpf opaque, voidpf stream);
voidpf ZCALLBACK fopen_mem_func64_32 OF(( typedef struct ourmemory_s {
voidpf opaque, char *base; /* Base of the region of memory we're using */
const void* filename, uint32_t size; /* Size of the region of memory we're using */
int mode)); uint32_t limit; /* Furthest we've written */
uint32_t cur_offset; /* Current offset in the area */
int grow; /* Growable memory buffer */
} ourmemory_t;
uLong ZCALLBACK fread_mem_func OF(( void fill_memory_filefunc(zlib_filefunc_def* pzlib_filefunc_def, ourmemory_t *ourmem);
voidpf opaque,
voidpf stream,
void* buf,
uLong size));
uLong ZCALLBACK fwrite_mem_func OF(( #ifdef __cplusplus
voidpf opaque,
voidpf stream,
const void* buf,
uLong size));
long ZCALLBACK ftell_mem_func OF((
voidpf opaque,
voidpf stream));
long ZCALLBACK fseek_mem_func OF((
voidpf opaque,
voidpf stream,
uLong offset,
int origin));
int ZCALLBACK fclose_mem_func OF((
voidpf opaque,
voidpf stream));
int ZCALLBACK ferror_mem_func OF((
voidpf opaque,
voidpf stream));
void fill_memory_filefunc64_32 (zlib_filefunc64_32_def* pzlib_filefunc_def);
typedef struct ourmemory_s {
void *base; /* Base of the region of memory we're using */
uLong size; /* Size of the region of memory we're using */
uLong limit; /* Furthest we've written */
uLong cur_offset; /* Current offset in the area */
} ourmemory_t;
} }
#endif
#endif #endif

3321
sources/unzip/unzip.cpp
View File

File diff suppressed because it is too large Load Diff

570
sources/unzip/unzip.h
View File

@ -1,55 +1,29 @@
/* unzip.h -- IO for uncompress .zip files using zlib /* unzip.h -- IO for uncompress .zip files using zlib
Version 1.1, February 14h, 2010 Version 1.2.0, September 16th, 2017
part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html ) part of the MiniZip project
Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html ) Copyright (C) 2012-2017 Nathan Moinvaziri
https://github.com/nmoinvaz/minizip
Modifications of Unzip for Zip64 Copyright (C) 2009-2010 Mathias Svensson
Copyright (C) 2007-2008 Even Rouault Modifications for Zip64 support on both zip and unzip
http://result42.com
Modifications for Zip64 support on both zip and unzip Copyright (C) 2007-2008 Even Rouault
Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com ) Modifications of Unzip for Zip64
Copyright (C) 1998-2010 Gilles Vollant
For more info read MiniZip_info.txt http://www.winimage.com/zLibDll/minizip.html
---------------------------------------------------------------------------------
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
This program is distributed under the terms of the same license as zlib.
See the accompanying LICENSE file for the full text of the license.
*/ */
#ifndef _unz64_H #ifndef _UNZ_H
#define _unz64_H #define _UNZ_H
#include "base/Macros.h"
#ifndef _ZLIB_H #ifndef _ZLIB_H
#include "zlib.h" #include "zlib.h"
#endif #endif
#ifndef _ZLIBIOAPI_H #ifndef _ZLIBIOAPI_H
#include "ioapi.h" #include "ioapi.h"
#endif #endif
@ -62,13 +36,12 @@
#if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP) #if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP)
/* like the STRICT of WIN32, we define a pointer that cannot be converted /* like the STRICT of WIN32, we define a pointer that cannot be converted
from (void*) without cast */ from (void*) without cast */
typedef struct TagunzFile__ { int unused; } unzFile__; typedef struct TagunzFile__ { int unused; } unz_file__;
typedef unzFile__ *unzFile; typedef unz_file__ *unzFile;
#else #else
typedef voidp unzFile; typedef voidp unzFile;
#endif #endif
#define UNZ_OK (0) #define UNZ_OK (0)
#define UNZ_END_OF_LIST_OF_FILE (-100) #define UNZ_END_OF_LIST_OF_FILE (-100)
#define UNZ_ERRNO (Z_ERRNO) #define UNZ_ERRNO (Z_ERRNO)
@ -77,380 +50,255 @@ typedef voidp unzFile;
#define UNZ_BADZIPFILE (-103) #define UNZ_BADZIPFILE (-103)
#define UNZ_INTERNALERROR (-104) #define UNZ_INTERNALERROR (-104)
#define UNZ_CRCERROR (-105) #define UNZ_CRCERROR (-105)
#define UNZ_BADPASSWORD (-106)
namespace cc { namespace cc {
/* 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 /* unz_global_info structure contain global data about the ZIPfile
These data comes from the end of central dir */ These data comes from the end of central dir */
typedef struct unz_global_info64_s typedef struct unz_global_info64_s
{ {
ZPOS64_T number_entry; /* total number of entries in uint64_t number_entry; /* total number of entries in the central dir on this disk */
the central dir on this disk */ uint32_t number_disk_with_CD; /* number the the disk with central dir, used for spanning ZIP*/
uLong size_comment; /* size of the global comment of the zipfile */ uint16_t size_comment; /* size of the global comment of the zipfile */
} unz_global_info64; } unz_global_info64;
typedef struct unz_global_info_s typedef struct unz_global_info_s
{ {
uLong number_entry; /* total number of entries in uint32_t number_entry; /* total number of entries in the central dir on this disk */
the central dir on this disk */ uint32_t number_disk_with_CD; /* number the the disk with central dir, used for spanning ZIP*/
uLong size_comment; /* size of the global comment of the zipfile */ uint16_t size_comment; /* size of the global comment of the zipfile */
} unz_global_info; } unz_global_info;
/* unz_file_info contain information about a file in the zipfile */ /* unz_file_info contain information about a file in the zipfile */
typedef struct unz_file_info64_s typedef struct unz_file_info64_s
{ {
uLong version; /* version made by 2 bytes */ uint16_t version; /* version made by 2 bytes */
uLong version_needed; /* version needed to extract 2 bytes */ uint16_t version_needed; /* version needed to extract 2 bytes */
uLong flag; /* general purpose bit flag 2 bytes */ uint16_t flag; /* general purpose bit flag 2 bytes */
uLong compression_method; /* compression method 2 bytes */ uint16_t compression_method; /* compression method 2 bytes */
uLong dosDate; /* last mod file date in Dos fmt 4 bytes */ uint32_t dos_date; /* last mod file date in Dos fmt 4 bytes */
uLong crc; /* crc-32 4 bytes */ uint32_t crc; /* crc-32 4 bytes */
ZPOS64_T compressed_size; /* compressed size 8 bytes */ uint64_t compressed_size; /* compressed size 8 bytes */
ZPOS64_T uncompressed_size; /* uncompressed size 8 bytes */ uint64_t uncompressed_size; /* uncompressed size 8 bytes */
uLong size_filename; /* filename length 2 bytes */ uint16_t size_filename; /* filename length 2 bytes */
uLong size_file_extra; /* extra field length 2 bytes */ uint16_t size_file_extra; /* extra field length 2 bytes */
uLong size_file_comment; /* file comment length 2 bytes */ uint16_t size_file_comment; /* file comment length 2 bytes */
uLong disk_num_start; /* disk number start 2 bytes */ uint32_t disk_num_start; /* disk number start 4 bytes */
uLong internal_fa; /* internal file attributes 2 bytes */ uint16_t internal_fa; /* internal file attributes 2 bytes */
uLong external_fa; /* external file attributes 4 bytes */ uint32_t external_fa; /* external file attributes 4 bytes */
tm_unz tmu_date; uint64_t disk_offset;
uint16_t size_file_extra_internal;
} unz_file_info64; } unz_file_info64;
typedef struct unz_file_info_s typedef struct unz_file_info_s
{ {
uLong version; /* version made by 2 bytes */ uint16_t version; /* version made by 2 bytes */
uLong version_needed; /* version needed to extract 2 bytes */ uint16_t version_needed; /* version needed to extract 2 bytes */
uLong flag; /* general purpose bit flag 2 bytes */ uint16_t flag; /* general purpose bit flag 2 bytes */
uLong compression_method; /* compression method 2 bytes */ uint16_t compression_method; /* compression method 2 bytes */
uLong dosDate; /* last mod file date in Dos fmt 4 bytes */ uint32_t dos_date; /* last mod file date in Dos fmt 4 bytes */
uLong crc; /* crc-32 4 bytes */ uint32_t crc; /* crc-32 4 bytes */
uLong compressed_size; /* compressed size 4 bytes */ uint32_t compressed_size; /* compressed size 4 bytes */
uLong uncompressed_size; /* uncompressed size 4 bytes */ uint32_t uncompressed_size; /* uncompressed size 4 bytes */
uLong size_filename; /* filename length 2 bytes */ uint16_t size_filename; /* filename length 2 bytes */
uLong size_file_extra; /* extra field length 2 bytes */ uint16_t size_file_extra; /* extra field length 2 bytes */
uLong size_file_comment; /* file comment length 2 bytes */ uint16_t size_file_comment; /* file comment length 2 bytes */
uLong disk_num_start; /* disk number start 2 bytes */ uint16_t disk_num_start; /* disk number start 2 bytes */
uLong internal_fa; /* internal file attributes 2 bytes */ uint16_t internal_fa; /* internal file attributes 2 bytes */
uLong external_fa; /* external file attributes 4 bytes */ uint32_t external_fa; /* external file attributes 4 bytes */
tm_unz tmu_date; uint64_t disk_offset;
} unz_file_info; } unz_file_info;
int CC_DLL unzStringFileNameCompare OF ((const char* fileName1, /***************************************************************************/
const char* fileName2, /* Opening and close a zip file */
int iCaseSensitivity));
/*
Compare two filename (fileName1,fileName2).
If iCaseSenisivity = 1, comparison is case sensitivity (like strcmp)
If iCaseSenisivity = 2, comparison is not case sensitivity (like strcmpi
or strcasecmp)
If iCaseSenisivity = 0, case sensitivity is default of your operating system
(like 1 on Unix, 2 on Windows)
*/
ZEXTERN unzFile ZEXPORT unzOpen(const char *path);
ZEXTERN unzFile ZEXPORT unzOpen64(const void *path);
/* Open a Zip file.
unzFile CC_DLL unzOpen OF((const char *path)); path should contain the full path (by example, on a Windows XP computer
unzFile CC_DLL unzOpen64 OF((const void *path)); "c:\\zlib\\zlib113.zip" or on an Unix computer "zlib/zlib113.zip".
/* return NULL if zipfile cannot be opened or doesn't exist
Open a Zip file. path contain the full pathname (by example, return unzFile handle if no error
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
*/
unzFile CC_DLL unzOpenBuffer OF((const void* buffer, uLong size)); NOTE: 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 */
unzFile CC_DLL unzOpen2 OF((const char *path, ZEXTERN unzFile ZEXPORT unzOpen2(const char *path, zlib_filefunc_def *pzlib_filefunc_def);
zlib_filefunc_def* pzlib_filefunc_def)); /* Open a Zip file, like unzOpen, but provide a set of file low level API for read/write operations */
/* ZEXTERN unzFile ZEXPORT unzOpen2_64(const void *path, zlib_filefunc64_def *pzlib_filefunc_def);
Open a Zip file, like unzOpen, but provide a set of file low level API /* Open a Zip file, like unz64Open, but provide a set of file low level API for read/write 64-bit operations */
for read/write the zip file (see ioapi.h)
*/
unzFile CC_DLL unzOpen2_64 OF((const void *path, ZEXTERN int ZEXPORT unzClose(unzFile file);
zlib_filefunc64_def* pzlib_filefunc_def)); /* Close a ZipFile opened with unzOpen. If there is files inside the .Zip opened with unzOpenCurrentFile,
/* these files MUST be closed with unzipCloseCurrentFile before call unzipClose.
Open a Zip file, like unz64Open, but provide a set of file low level API
for read/write the zip file (see ioapi.h)
*/
int CC_DLL unzClose OF((unzFile file)); return UNZ_OK if there is no error */
/*
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. */
int CC_DLL unzGetGlobalInfo OF((unzFile file, ZEXTERN int ZEXPORT unzGetGlobalInfo(unzFile file, unz_global_info *pglobal_info);
unz_global_info *pglobal_info)); ZEXTERN int ZEXPORT unzGetGlobalInfo64(unzFile file, unz_global_info64 *pglobal_info);
/* Write info about the ZipFile in the *pglobal_info structure.
int CC_DLL unzGetGlobalInfo64 OF((unzFile file, return UNZ_OK if no error */
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. */
ZEXTERN int ZEXPORT unzGetGlobalComment(unzFile file, char *comment, uint16_t comment_size);
/* Get the global comment string of the ZipFile, in the comment buffer.
int CC_DLL unzGetGlobalComment OF((unzFile file, uSizeBuf is the size of the szComment buffer.
char *szComment, return the number of byte copied or an error code <0 */
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 */ /* 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) */
int CC_DLL unzGoToFirstFile OF((unzFile file)); ZEXTERN int ZEXPORT unzOpenCurrentFile(unzFile file);
/* Open for reading data the current file in the zipfile.
/* return UNZ_OK if no error */
Set the current file of the zipfile to the first file.
return UNZ_OK if there is no problem
*/
int CC_DLL unzGoToFirstFile64 OF((unzFile file, ZEXTERN int ZEXPORT unzOpenCurrentFilePassword(unzFile file, const char *password);
unz_file_info64 *pfile_info, /* Open for reading data the current file in the zipfile.
char *szFileName, password is a crypting password
uLong fileNameBufferSize));
/*
Set the current file of the zipfile to the first file
with retrieving an information about the file.
return UNZ_OK if there is no problem
*/
int CC_DLL unzGoToNextFile OF((unzFile file)); return UNZ_OK if no error */
/*
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.
*/
int CC_DLL unzGoToNextFile64 OF((unzFile file, ZEXTERN int ZEXPORT unzOpenCurrentFile2(unzFile file, int *method, int *level, int raw);
unz_file_info64 *pfile_info, /* Same as unzOpenCurrentFile, but open for read raw the file (not uncompress)
char *szFileName, if raw==1 *method will receive method of compression, *level will receive level of compression
uLong fileNameBufferSize));
/*
Set the current file of the zipfile to the next file
with retrieving an information about the file.
return UNZ_OK if there is no problem
return UNZ_END_OF_LIST_OF_FILE if the actual file was the latest.
*/
int CC_DLL unzLocateFile OF((unzFile file, NOTE: you can set level parameter as NULL (if you did not want known level,
const char *szFileName, but you CANNOT set method parameter as NULL */
int iCaseSensitivity));
/*
Try locate the file szFileName in the zipfile.
For the iCaseSensitivity signification, see unzStringFileNameCompare
return value : ZEXTERN int ZEXPORT unzOpenCurrentFile3(unzFile file, int *method, int *level, int raw, const char *password);
UNZ_OK if the file is found. It becomes the current file. /* Same as unzOpenCurrentFile, but takes extra parameter password for encrypted files */
UNZ_END_OF_LIST_OF_FILE if the file is not found
*/
ZEXTERN int ZEXPORT unzReadCurrentFile(unzFile file, voidp buf, uint32_t 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) */
ZEXTERN int ZEXPORT unzGetCurrentFileInfo(unzFile file, unz_file_info *pfile_info, char *filename,
uint16_t filename_size, void *extrafield, uint16_t extrafield_size, char *comment, uint16_t comment_size);
ZEXTERN int ZEXPORT unzGetCurrentFileInfo64(unzFile file, unz_file_info64 *pfile_info, char *filename,
uint16_t filename_size, void *extrafield, uint16_t extrafield_size, char *comment, uint16_t comment_size);
/* Get Info about the current file
pfile_info if != NULL, the *pfile_info structure will contain somes info about the current file
filename if != NULL, the file name string will be copied in filename
filename_size is the size of the filename buffer
extrafield if != NULL, the extra field information from the central header will be copied in to
extrafield_size is the size of the extraField buffer
comment if != NULL, the comment string of the file will be copied in to
comment_size is the size of the comment buffer */
ZEXTERN int ZEXPORT unzGetLocalExtrafield(unzFile file, voidp buf, uint32_t 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.
return number of bytes copied in buf, or (if <0) the error code */
ZEXTERN int ZEXPORT unzCloseCurrentFile(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 */
/***************************************************************************/
/* Browse the directory of the zipfile */
typedef int (*unzFileNameComparer)(unzFile file, const char *filename1, const char *filename2);
typedef int (*unzIteratorFunction)(unzFile file);
typedef int (*unzIteratorFunction2)(unzFile file, unz_file_info64 *pfile_info, char *filename,
uint16_t filename_size, void *extrafield, uint16_t extrafield_size, char *comment, uint16_t comment_size);
ZEXTERN int ZEXPORT unzGoToFirstFile(unzFile file);
/* Set the current file of the zipfile to the first file.
return UNZ_OK if no error */
ZEXTERN int ZEXPORT unzGoToFirstFile2(unzFile file, unz_file_info64 *pfile_info, char *filename,
uint16_t filename_size, void *extrafield, uint16_t extrafield_size, char *comment, uint16_t comment_size);
/* Set the current file of the zipfile to the first file and retrieves the current info on success.
Not as seek intensive as unzGoToFirstFile + unzGetCurrentFileInfo.
return UNZ_OK if no error */
ZEXTERN int ZEXPORT unzGoToNextFile(unzFile file);
/* Set the current file of the zipfile to the next file.
return UNZ_OK if no error
return UNZ_END_OF_LIST_OF_FILE if the actual file was the latest */
ZEXTERN int ZEXPORT unzGoToNextFile2(unzFile file, unz_file_info64 *pfile_info, char *filename,
uint16_t filename_size, void *extrafield, uint16_t extrafield_size, char *comment, uint16_t comment_size);
/* Set the current file of the zipfile to the next file and retrieves the current
info on success. Does less seeking around than unzGotoNextFile + unzGetCurrentFileInfo.
return UNZ_OK if no error
return UNZ_END_OF_LIST_OF_FILE if the actual file was the latest */
ZEXTERN int ZEXPORT unzLocateFile(unzFile file, const char *filename, unzFileNameComparer filename_compare_func);
/* Try locate the file szFileName in the zipfile. For custom filename comparison pass in comparison function.
return UNZ_OK if the file is found (it becomes the current file)
return UNZ_END_OF_LIST_OF_FILE if the file is not found */
/***************************************************************************/
/* Raw access to zip file */
/* ****************************************** */
/* Ryan supplied functions */
/* unz_file_info contain information about a file in the zipfile */
typedef struct unz_file_pos_s typedef struct unz_file_pos_s
{ {
uLong pos_in_zip_directory; /* offset in zip file directory */ uint32_t pos_in_zip_directory; /* offset in zip file directory */
uLong num_of_file; /* # of file */ uint32_t num_of_file; /* # of file */
} unz_file_pos; } unz_file_pos;
int CC_DLL unzGetFilePos( ZEXTERN int ZEXPORT unzGetFilePos(unzFile file, unz_file_pos *file_pos);
unzFile file, ZEXTERN int ZEXPORT unzGoToFilePos(unzFile file, unz_file_pos *file_pos);
unz_file_pos* file_pos);
int CC_DLL unzGoToFilePos(
unzFile file,
unz_file_pos* file_pos);
typedef struct unz64_file_pos_s typedef struct unz64_file_pos_s
{ {
ZPOS64_T pos_in_zip_directory; /* offset in zip file directory */ uint64_t pos_in_zip_directory; /* offset in zip file directory */
ZPOS64_T num_of_file; /* # of file */ uint64_t num_of_file; /* # of file */
} unz64_file_pos; } unz64_file_pos;
int CC_DLL unzGetFilePos64( ZEXTERN int ZEXPORT unzGetFilePos64(unzFile file, unz64_file_pos *file_pos);
unzFile file, ZEXTERN int ZEXPORT unzGoToFilePos64(unzFile file, const unz64_file_pos *file_pos);
unz64_file_pos* file_pos);
int CC_DLL unzGoToFilePos64(
unzFile file,
const unz64_file_pos* file_pos);
/* ****************************************** */
int CC_DLL unzGetCurrentFileInfo64 OF((unzFile file,
unz_file_info64 *pfile_info,
char *szFileName,
uLong fileNameBufferSize,
void *extraField,
uLong extraFieldBufferSize,
char *szComment,
uLong commentBufferSize));
int CC_DLL 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 some info about
the current file
if szFileName!=NULL, the filename 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 */
ZPOS64_T CC_DLL 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)
*/
int CC_DLL 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.
*/
int CC_DLL 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.
*/
int CC_DLL 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
*/
int CC_DLL 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
*/
int CC_DLL 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
*/
int CC_DLL 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 some 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)
*/
z_off_t CC_DLL unztell OF((unzFile file));
ZPOS64_T CC_DLL unztell64 OF((unzFile file));
/*
Give the current position in uncompressed data
*/
int CC_DLL unzeof OF((unzFile file));
/*
return 1 if the end of file was reached, 0 elsewhere
*/
int CC_DLL 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
*/
/***************************************************************************/
ZEXTERN int32_t ZEXPORT unzGetOffset(unzFile file);
ZEXTERN int64_t ZEXPORT unzGetOffset64(unzFile file);
/* Get the current file offset */ /* Get the current file offset */
ZPOS64_T CC_DLL unzGetOffset64 (unzFile file);
uLong CC_DLL unzGetOffset (unzFile file);
ZEXTERN int ZEXPORT unzSetOffset(unzFile file, uint32_t pos);
ZEXTERN int ZEXPORT unzSetOffset64(unzFile file, uint64_t pos);
/* Set the current file offset */ /* Set the current file offset */
int CC_DLL unzSetOffset64 (unzFile file, ZPOS64_T pos);
int CC_DLL unzSetOffset (unzFile file, uLong pos);
} ZEXTERN int32_t ZEXPORT unzTell(unzFile file);
ZEXTERN int64_t ZEXPORT unzTell64(unzFile file);
/* return current position in uncompressed data */
#endif /* _unz64_H */ ZEXTERN int ZEXPORT unzSeek(unzFile file, uint32_t offset, int origin);
ZEXTERN int ZEXPORT unzSeek64(unzFile file, uint64_t offset, int origin);
/* Seek within the uncompressed data if compression method is storage */
ZEXTERN int ZEXPORT unzEndOfFile(unzFile file);
/* return 1 if the end of file was reached, 0 elsewhere */
/***************************************************************************/
} // end of namespace cc
#endif /* _UNZ_H */