yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2025-02-16 09:01:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update "unzip" to version 1.01h

Browse source 
This update brings some minor bugfixes, especially for big endian
platforms and LLP64 systems like 64 bit Windows. The support for
encrypted ZIP archives was removed. This is a no-op change, since
there was no way to pass the password to uncrypt. Without the
uncrypt code Yamagi Quake II can be distributed in some countries
with special laws for cryptographic software. The LICENSE was
updated to the most recent version of the INFO-ZIP license.
This commit is contained in:
Yamagi Burmeister 2012-07-21 12:02:39 +02:00
parent e3d6aa31a8
commit b1ddebf552
7 changed files with 1830 additions and 1961 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
LICENSE
View file

@ -371,13 +371,13 @@ Public License instead of this License.
===============================================================================
This is version 2007-Mar-4 of the Info-ZIP license.
This is version 2009-Jan-02 of the Info-ZIP license.
The definitive version of this document should be available at
ftp://ftp.info-zip.org/pub/infozip/license.html indefinitely and
a copy at http://www.info-zip.org/pub/infozip/license.html.
Copyright (c) 1990-2007 Info-ZIP. All rights reserved.
Copyright (c) 1990-2010 Info-ZIP. All rights reserved.
For the purposes of this copyright and license, "Info-ZIP" is defined as
the following set of individuals:
@ -407,11 +407,13 @@ freely, subject to the above disclaimer and the following restrictions:
2. Redistributions in binary form (compiled executables and libraries)
must reproduce the above copyright notice, definition, disclaimer,
and this list of conditions in documentation and/or other materials
provided with the distribution. The sole exception to this condition
is redistribution of a standard UnZipSFX binary (including SFXWiz) as
part of a self-extracting archive; that is permitted without inclusion
of this license, as long as the normal SFX banner has not been removed
from the binary or disabled.
provided with the distribution. Additional documentation is not needed
for executables where a command line license option provides these and
a note regarding this option is in the executable's startup banner. The
sole exception to this condition is redistribution of a standard
UnZipSFX binary (including SFXWiz) as part of a self-extracting archive;
that is permitted without inclusion of this license, as long as the
normal SFX banner has not been removed from the binary or disabled.
3. Altered versions--including, but not limited to, ports to new operating
systems, existing ports with new graphical interfaces, versions with

8
Makefile
View file

@ -245,7 +245,7 @@ release/quake2.exe : CFLAGS += -DUSE_OPENAL -DDEFAULT_OPENAL_DRIVER='"openal32.d
endif
ifeq ($(WITH_ZIP),yes)
release/quake2.exe : CFLAGS += -DZIP
release/quake2.exe : CFLAGS += -DZIP -DNOUNCRYPT
release/quake2.exe : LDFLAGS += -lz
endif
@ -275,7 +275,7 @@ release/quake2 : CFLAGS += -DUSE_OPENAL -DDEFAULT_OPENAL_DRIVER='"libopenal.so.1
endif
ifeq ($(WITH_ZIP),yes)
release/quake2 : CFLAGS += -DZIP
release/quake2 : CFLAGS += -DZIP -DNOUNCRYPT
release/quake2 : LDFLAGS += -lz
endif
endif
@ -298,7 +298,7 @@ release/q2ded.exe : CFLAGS += -DDEDICATED_ONLY
release/q2ded.exe : LDFLAGS += -lz
ifeq ($(WITH_ZIP),yes)
release/q2ded.exe : CFLAGS += -DZIP
release/q2ded.exe : CFLAGS += -DZIP -DNOUNCRYPT
release/q2ded.exe : LDFLAGS += -lz
endif
else
@ -316,7 +316,7 @@ release/q2ded : CFLAGS += -DDEDICATED_ONLY
release/q2ded : LDFLAGS += -lz
ifeq ($(WITH_ZIP),yes)
release/q2ded : CFLAGS += -DZIP
release/q2ded : CFLAGS += -DZIP -DNOUNCRYPT
release/q2ded : LDFLAGS += -lz
endif
endif

138
src/common/unzip/crypt.h
View file

@ -1,138 +0,0 @@
/*
* 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

253
src/common/unzip/ioapi.c
View file

@ -1,11 +1,10 @@
/*
* 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
*/
/* ioapi.c -- IO base function header for compress/uncompress .zip
files using zlib + zip or unzip API
Version 1.01h, December 28th, 2009
Copyright (C) 1998-2009 Gilles Vollant
*/
#include <stdio.h>
#include <stdlib.h>
@ -30,162 +29,150 @@
#define SEEK_SET 0
#endif
voidpf ZCALLBACK fopen_file_func
OF((
voidpf opaque,
const char *filename,
int mode));
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 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));
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 ftell_file_func OF((
voidpf opaque,
voidpf stream));
long ZCALLBACK fseek_file_func OF((
voidpf opaque,
voidpf stream,
uLong offset,
int origin));
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 fclose_file_func OF((
voidpf opaque,
voidpf stream));
int ZCALLBACK ferror_file_func OF((
voidpf opaque,
voidpf stream));
int ZCALLBACK ferror_file_func OF((
voidpf opaque,
voidpf stream));
voidpf ZCALLBACK fopen_file_func(opaque, filename, mode)
voidpf opaque;
const char *filename;
int mode;
voidpf ZCALLBACK fopen_file_func (opaque, filename, mode)
voidpf opaque;
const char* filename;
int mode;
{
FILE *file = NULL;
const char *mode_fopen = NULL;
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 ((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;
if ((filename!=NULL) && (mode_fopen != NULL))
file = fopen(filename, mode_fopen);
return file;
}
uLong ZCALLBACK
fread_file_func(opaque, stream, buf, size)
voidpf opaque;
voidpf stream;
void *buf;
uLong size;
uLong ZCALLBACK fread_file_func (opaque, stream, buf, size)
voidpf opaque;
voidpf stream;
void* buf;
uLong size;
{
uLong ret;
ret = (uLong) fread(buf, 1, (size_t) size, (FILE *) stream);
return ret;
uLong ret;
ret = (uLong)fread(buf, 1, (size_t)size, (FILE *)stream);
return ret;
}
uLong ZCALLBACK
fwrite_file_func(opaque, stream, buf, size)
voidpf opaque;
voidpf stream;
const void *buf;
uLong size;
uLong ZCALLBACK fwrite_file_func (opaque, stream, buf, size)
voidpf opaque;
voidpf stream;
const void* buf;
uLong size;
{
uLong ret;
ret = (uLong) fwrite(buf, 1, (size_t) size, (FILE *) stream);
return ret;
uLong ret;
ret = (uLong)fwrite(buf, 1, (size_t)size, (FILE *)stream);
return ret;
}
long ZCALLBACK
ftell_file_func(opaque, stream)
voidpf opaque;
voidpf stream;
long ZCALLBACK ftell_file_func (opaque, stream)
voidpf opaque;
voidpf stream;
{
long ret;
ret = ftell((FILE *) stream);
return ret;
long ret;
ret = ftell((FILE *)stream);
return ret;
}
long ZCALLBACK
fseek_file_func(opaque, stream, offset, origin)
voidpf opaque;
voidpf stream;
uLong offset;
int origin;
long ZCALLBACK fseek_file_func (opaque, stream, offset, origin)
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 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;
}
int ZCALLBACK
fclose_file_func(opaque, stream)
voidpf opaque;
voidpf stream;
int ZCALLBACK fclose_file_func (opaque, stream)
voidpf opaque;
voidpf stream;
{
int ret;
ret = fclose((FILE *) stream);
return ret;
int ret;
ret = fclose((FILE *)stream);
return ret;
}
int ZCALLBACK
ferror_file_func(opaque, stream)
voidpf opaque;
voidpf stream;
int ZCALLBACK ferror_file_func (opaque, stream)
voidpf opaque;
voidpf stream;
{
int ret;
ret = ferror((FILE *) stream);
return ret;
int ret;
ret = ferror((FILE *)stream);
return ret;
}
void
fill_fopen_filefunc(pzlib_filefunc_def)
zlib_filefunc_def *pzlib_filefunc_def;
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;
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;
}

56
src/common/unzip/ioapi.h
View file

@ -1,11 +1,10 @@
/*
* 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
*/
/* ioapi.h -- IO base function header for compress/uncompress .zip
files using zlib + zip or unzip API
Version 1.01h, December 28th, 2009
Copyright (C) 1998-2009 Gilles Vollant
*/
#ifndef _ZLIBIOAPI_H
#define _ZLIBIOAPI_H
@ -33,31 +32,32 @@
#endif
#ifdef __cplusplus
extern "C" {
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 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;
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));
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))
@ -69,7 +69,7 @@ extern "C" {
#ifdef __cplusplus
}
#endif
#endif

2732
src/common/unzip/unzip.c
View file

File diff suppressed because it is too large Load diff

588
src/common/unzip/unzip.h
View file

@ -1,57 +1,52 @@
/*
* 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:
/* unzip.h -- IO for uncompress .zip files using zlib
Version 1.01h, December 28th, 2009
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.
Copyright (C) 1998-2009 Gilles Vollant
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:
This unzip package allow extract file from .ZIP file, compatible with PKZip 2.04g
WinZip, InfoZip tools and compatible.
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.
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
*/
/* 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" {
extern "C" {
#endif
#ifndef _ZLIB_H
@ -62,18 +57,19 @@ extern "C" {
#include "ioapi.h"
#endif
#if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP)
#ifdef HAVE_BZIP2
#include "bzlib.h"
#endif
/*
* 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;
#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;
typedef voidp unzFile;
#endif
@ -86,313 +82,279 @@ extern "C" {
#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;
/* 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_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 */
/* 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 */
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;
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 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 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.
*/
/*
* 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 unzFile ZEXPORT unzOpen2 OF((const char *path,
zlib_filefunc_def * pzlib_filefunc_def));
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. */
/*
* 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 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
*/
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 */
/***************************************************************************/
/* Unzip package allow you browse the directory of the zipfile */
extern int ZEXPORT unzGoToFirstFile OF((unzFile file));
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
*/
/*
* 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 unzGoToNextFile OF((unzFile file));
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
/*
* 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
*/
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;
/* ****************************************** */
/* 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 unzGetFilePos(
unzFile file,
unz_file_pos* file_pos);
extern int ZEXPORT unzGoToFilePos(
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));
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)
*/
/*
* 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.
*/
/*
* 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 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 unzOpenCurrentFile OF((unzFile file));
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
*/
/*
* 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 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));
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
*/
/*
* 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.
extern int ZEXPORT unzReadCurrentFile OF((unzFile file,
voidp buf ,
unsigned len));
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)
*/
/*
* 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 z_off_t ZEXPORT unztell OF((unzFile file));
extern int ZEXPORT unzeof OF((unzFile file));
/*
return 1 if the end of file was reached, 0 elsewhere
*/
/*
* Give the current position in uncompressed data
*/
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)
extern int ZEXPORT unzeof OF((unzFile file));
if buf==NULL, it return the size of the local extra field
/*
* return 1 if the end of file was reached, 0 elsewhere
*/
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 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);
/***************************************************************************/
/* Get the current file offset */
extern uLong ZEXPORT unzGetOffset(unzFile file);
/* Set the current file offset */
extern int ZEXPORT unzSetOffset(unzFile file, uLong pos);
/* Set the current file offset */
extern int ZEXPORT unzSetOffset (unzFile file, uLong pos);
#ifdef __cplusplus
}
#endif
#endif /* _unz_H */
#endif /* _unz_H */