merge unzip 0.21

git-svn-id: http://svn.code.sf.net/p/xqf/code/trunk@442 d2ac09be-c843-0410-8b1f-f8a84130e0ec
This commit is contained in:
Ludwig Nussel 2003-03-20 11:46:10 +00:00 committed by l-n
parent 742fb09556
commit 0c114ec133
4 changed files with 22 additions and 9 deletions

View File

@ -1,9 +1,9 @@
/* ioapi.c -- IO base function header for compress/uncompress .zip
files using zlib + zip or unzip API
Version 0.20, September 01th, 2002
Version 0.21, March 10th, 2003
Copyright (C) 1998-2002 Gilles Vollant
Copyright (C) 1998-2003 Gilles Vollant
*/
#include <stdio.h>

View File

@ -1,9 +1,9 @@
/* ioapi.h -- IO base function header for compress/uncompress .zip
files using zlib + zip or unzip API
Version 0.20, September 01th, 2002
Version 0.21, March 10th, 2003
Copyright (C) 1998-2002 Gilles Vollant
Copyright (C) 1998-2003 Gilles Vollant
*/
#ifndef _ZLIBIOAPI_H
@ -31,6 +31,10 @@
#endif
#endif
#ifdef __cplusplus
extern "C" {
#endif
typedef voidpf (ZCALLBACK *open_file_func) OF((voidpf opaque, const char* filename, int mode));
typedef uLong (ZCALLBACK *read_file_func) OF((voidpf opaque, voidpf stream, void* buf, uLong size));
typedef uLong (ZCALLBACK *write_file_func) OF((voidpf opaque, voidpf stream, const void* buf, uLong size));
@ -61,4 +65,11 @@ void fill_fopen_filefunc OF((zlib_filefunc_def* pzlib_filefunc_def));
#define ZSEEK(filefunc,filestream,pos,mode) ((*((filefunc).zseek_file))((filefunc).opaque,filestream,pos,mode))
#define ZCLOSE(filefunc,filestream) ((*((filefunc).zclose_file))((filefunc).opaque,filestream))
#define ZERROR(filefunc,filestream) ((*((filefunc).zerror_file))((filefunc).opaque,filestream))
#ifdef __cplusplus
}
#endif
#endif

View File

@ -1,7 +1,7 @@
/* unzip.c -- IO for uncompress .zip files using zlib
Version 0.20, September 01th, 2002
Version 0.21, March 10th, 2003
Copyright (C) 1998-2002 Gilles Vollant
Copyright (C) 1998-2003 Gilles Vollant
Read unzip.h for more info
*/
@ -60,7 +60,7 @@
const char unz_copyright[] =
" unzip 0.20 Copyright 1998-2002 Gilles Vollant - http://www.winimage.com/zLibDll";
" unzip 0.21 Copyright 1998-2003 Gilles Vollant - http://www.winimage.com/zLibDll";
/* unz_file_info_interntal contain internal info about a file in zipfile*/
typedef struct unz_file_info_internal_s
@ -1080,6 +1080,8 @@ extern int ZEXPORT unzOpenCurrentFile2 (file, method, level, raw)
err=inflateInit2(&pfile_in_zip_read_info->stream, -MAX_WBITS);
if (err == Z_OK)
pfile_in_zip_read_info->stream_initialised=1;
else
return err;
/* windowBits is passed < 0 to tell that there is no zlib header.
* Note that in this case inflate *requires* an extra "dummy" byte
* after the compressed stream in order to complete decompression and

View File

@ -1,7 +1,7 @@
/* unzip.h -- IO for uncompress .zip files using zlib
Version 0.20, September 01th, 2002
Version 0.21, March 10th, 2003
Copyright (C) 1998-2002 Gilles Vollant
Copyright (C) 1998-2003 Gilles Vollant
This unzip package allow extract file from .ZIP file, compatible with PKZip 2.04g
WinZip, InfoZip tools and compatible.