| Index: third_party/zlib/contrib/minizip/unzip.c
|
| ===================================================================
|
| --- third_party/zlib/contrib/minizip/unzip.c (revision 113739)
|
| +++ third_party/zlib/contrib/minizip/unzip.c (working copy)
|
| @@ -1,43 +1,77 @@
|
| /* unzip.c -- IO for uncompress .zip files using zlib
|
| - Version 1.01e, February 12th, 2005
|
| + Version 1.1, February 14h, 2010
|
| + part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
|
|
|
| - Copyright (C) 1998-2005 Gilles Vollant
|
| + Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
|
|
|
| - Read unzip.h for more info
|
| -*/
|
| + Modifications of Unzip for Zip64
|
| + Copyright (C) 2007-2008 Even Rouault
|
|
|
| -/* Decryption code comes from crypt.c by Info-ZIP but has been greatly reduced in terms of
|
| -compatibility with older software. The following is from the original crypt.c. Code
|
| -woven in by Terry Thorsen 1/2003.
|
| -*/
|
| -/*
|
| + Modifications for Zip64 support on both zip and unzip
|
| + Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
|
| +
|
| + For more info read MiniZip_info.txt
|
| +
|
| +
|
| + ------------------------------------------------------------------------------------
|
| + Decryption code comes from crypt.c by Info-ZIP but has been greatly reduced in terms of
|
| + compatibility with older software. The following is from the original crypt.c.
|
| + Code woven in by Terry Thorsen 1/2003.
|
| +
|
| Copyright (c) 1990-2000 Info-ZIP. All rights reserved.
|
|
|
| See the accompanying file LICENSE, version 2000-Apr-09 or later
|
| (the contents of which are also included in zip.h) for terms of use.
|
| If, for some reason, all these files are missing, the Info-ZIP license
|
| also may be found at: ftp://ftp.info-zip.org/pub/infozip/license.html
|
| -*/
|
| -/*
|
| - crypt.c (full version) by Info-ZIP. Last revised: [see crypt.h]
|
|
|
| + crypt.c (full version) by Info-ZIP. Last revised: [see crypt.h]
|
| +
|
| The encryption/decryption parts of this source code (as opposed to the
|
| non-echoing password parts) were originally written in Europe. The
|
| whole source package can be freely distributed, including from the USA.
|
| (Prior to January 2000, re-export from the US was a violation of US law.)
|
| - */
|
|
|
| -/*
|
| - This encryption code is a direct transcription of the algorithm from
|
| + This encryption code is a direct transcription of the algorithm from
|
| Roger Schlafly, described by Phil Katz in the file appnote.txt. This
|
| file (appnote.txt) is distributed with the PKZIP program (even in the
|
| version without encryption capabilities).
|
| - */
|
|
|
| + ------------------------------------------------------------------------------------
|
|
|
| + Changes in unzip.c
|
| +
|
| + 2007-2008 - Even Rouault - Addition of cpl_unzGetCurrentFileZStreamPos
|
| + 2007-2008 - Even Rouault - Decoration of symbol names unz* -> cpl_unz*
|
| + 2007-2008 - Even Rouault - Remove old C style function prototypes
|
| + 2007-2008 - Even Rouault - Add unzip support for ZIP64
|
| +
|
| + Copyright (C) 2007-2008 Even Rouault
|
| +
|
| +
|
| + Oct-2009 - Mathias Svensson - Removed cpl_* from symbol names (Even Rouault added them but since this is now moved to a new project (minizip64) I renamed them again).
|
| + Oct-2009 - Mathias Svensson - Fixed problem if uncompressed size was > 4G and compressed size was <4G
|
| + should only read the compressed/uncompressed size from the Zip64 format if
|
| + the size from normal header was 0xFFFFFFFF
|
| + Oct-2009 - Mathias Svensson - Applied some bug fixes from paches recived from Gilles Vollant
|
| + Oct-2009 - Mathias Svensson - Applied support to unzip files with compression mathod BZIP2 (bzip2 lib is required)
|
| + Patch created by Daniel Borca
|
| +
|
| + Jan-2010 - back to unzip and minizip 1.0 name scheme, with compatibility layer
|
| +
|
| + Copyright (C) 1998 - 2010 Gilles Vollant, Even Rouault, Mathias Svensson
|
| +
|
| +*/
|
| +
|
| +
|
| #include <stdio.h>
|
| #include <stdlib.h>
|
| #include <string.h>
|
| +
|
| +#ifndef NOUNCRYPT
|
| + #define NOUNCRYPT
|
| +#endif
|
| +
|
| #if defined(USE_SYSTEM_ZLIB)
|
| #include <zlib.h>
|
| #else
|
| @@ -89,16 +123,14 @@
|
| #define SIZEZIPLOCALHEADER (0x1e)
|
|
|
|
|
| -
|
| -
|
| const char unz_copyright[] =
|
| " unzip 1.01 Copyright 1998-2004 Gilles Vollant - http://www.winimage.com/zLibDll";
|
|
|
| /* unz_file_info_interntal contain internal info about a file in zipfile*/
|
| -typedef struct unz_file_info_internal_s
|
| +typedef struct unz_file_info64_internal_s
|
| {
|
| - uLong offset_curfile;/* relative offset of local header 4 bytes */
|
| -} unz_file_info_internal;
|
| + ZPOS64_T offset_curfile;/* relative offset of local header 8 bytes */
|
| +} unz_file_info64_internal;
|
|
|
|
|
| /* file_in_zip_read_info_s contain internal information about a file in zipfile,
|
| @@ -108,52 +140,61 @@
|
| char *read_buffer; /* internal buffer for compressed data */
|
| z_stream stream; /* zLib stream structure for inflate */
|
|
|
| - uLong pos_in_zipfile; /* position in byte on the zipfile, for fseek*/
|
| +#ifdef HAVE_BZIP2
|
| + bz_stream bstream; /* bzLib stream structure for bziped */
|
| +#endif
|
| +
|
| + ZPOS64_T pos_in_zipfile; /* position in byte on the zipfile, for fseek*/
|
| uLong stream_initialised; /* flag set if stream structure is initialised*/
|
|
|
| - uLong offset_local_extrafield;/* offset of the local extra field */
|
| + ZPOS64_T offset_local_extrafield;/* offset of the local extra field */
|
| uInt size_local_extrafield;/* size of the local extra field */
|
| - uLong pos_local_extrafield; /* position in the local extra field in read*/
|
| + ZPOS64_T pos_local_extrafield; /* position in the local extra field in read*/
|
| + ZPOS64_T total_out_64;
|
|
|
| uLong crc32; /* crc32 of all data uncompressed */
|
| uLong crc32_wait; /* crc32 we must obtain after decompress all */
|
| - uLong rest_read_compressed; /* number of byte to be decompressed */
|
| - uLong rest_read_uncompressed;/*number of byte to be obtained after decomp*/
|
| - zlib_filefunc_def z_filefunc;
|
| + ZPOS64_T rest_read_compressed; /* number of byte to be decompressed */
|
| + ZPOS64_T rest_read_uncompressed;/*number of byte to be obtained after decomp*/
|
| + zlib_filefunc64_32_def z_filefunc;
|
| voidpf filestream; /* io structore of the zipfile */
|
| uLong compression_method; /* compression method (0==store) */
|
| - uLong byte_before_the_zipfile;/* byte before the zipfile, (>0 for sfx)*/
|
| + ZPOS64_T byte_before_the_zipfile;/* byte before the zipfile, (>0 for sfx)*/
|
| int raw;
|
| -} file_in_zip_read_info_s;
|
| +} file_in_zip64_read_info_s;
|
|
|
|
|
| -/* unz_s contain internal information about the zipfile
|
| +/* unz64_s contain internal information about the zipfile
|
| */
|
| typedef struct
|
| {
|
| - zlib_filefunc_def z_filefunc;
|
| + zlib_filefunc64_32_def z_filefunc;
|
| + int is64bitOpenFunction;
|
| voidpf filestream; /* io structore of the zipfile */
|
| - unz_global_info gi; /* public global information */
|
| - uLong byte_before_the_zipfile;/* byte before the zipfile, (>0 for sfx)*/
|
| - uLong num_file; /* number of the current file in the zipfile*/
|
| - uLong pos_in_central_dir; /* pos of the current file in the central dir*/
|
| - uLong current_file_ok; /* flag about the usability of the current file*/
|
| - uLong central_pos; /* position of the beginning of the central dir*/
|
| + unz_global_info64 gi; /* public global information */
|
| + ZPOS64_T byte_before_the_zipfile;/* byte before the zipfile, (>0 for sfx)*/
|
| + ZPOS64_T num_file; /* number of the current file in the zipfile*/
|
| + ZPOS64_T pos_in_central_dir; /* pos of the current file in the central dir*/
|
| + ZPOS64_T current_file_ok; /* flag about the usability of the current file*/
|
| + ZPOS64_T central_pos; /* position of the beginning of the central dir*/
|
|
|
| - uLong size_central_dir; /* size of the central directory */
|
| - uLong offset_central_dir; /* offset of start of central directory with
|
| + ZPOS64_T size_central_dir; /* size of the central directory */
|
| + ZPOS64_T offset_central_dir; /* offset of start of central directory with
|
| respect to the starting disk number */
|
|
|
| - unz_file_info cur_file_info; /* public info about the current file in zip*/
|
| - unz_file_info_internal cur_file_info_internal; /* private info about it*/
|
| - file_in_zip_read_info_s* pfile_in_zip_read; /* structure about the current
|
| + unz_file_info64 cur_file_info; /* public info about the current file in zip*/
|
| + unz_file_info64_internal cur_file_info_internal; /* private info about it*/
|
| + file_in_zip64_read_info_s* pfile_in_zip_read; /* structure about the current
|
| file if we are decompressing it */
|
| int encrypted;
|
| +
|
| + int isZip64;
|
| +
|
| # ifndef NOUNCRYPT
|
| unsigned long keys[3]; /* keys defining the pseudo-random sequence */
|
| const unsigned long* pcrc_32_tab;
|
| # endif
|
| -} unz_s;
|
| +} unz64_s;
|
|
|
|
|
| #ifndef NOUNCRYPT
|
| @@ -167,18 +208,15 @@
|
| */
|
|
|
|
|
| -local int unzlocal_getByte OF((
|
| - const zlib_filefunc_def* pzlib_filefunc_def,
|
| +local int unz64local_getByte OF((
|
| + const zlib_filefunc64_32_def* pzlib_filefunc_def,
|
| voidpf filestream,
|
| int *pi));
|
|
|
| -local int unzlocal_getByte(pzlib_filefunc_def,filestream,pi)
|
| - const zlib_filefunc_def* pzlib_filefunc_def;
|
| - voidpf filestream;
|
| - int *pi;
|
| +local int unz64local_getByte(const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, int *pi)
|
| {
|
| unsigned char c;
|
| - int err = (int)ZREAD(*pzlib_filefunc_def,filestream,&c,1);
|
| + int err = (int)ZREAD64(*pzlib_filefunc_def,filestream,&c,1);
|
| if (err==1)
|
| {
|
| *pi = (int)c;
|
| @@ -186,7 +224,7 @@
|
| }
|
| else
|
| {
|
| - if (ZERROR(*pzlib_filefunc_def,filestream))
|
| + if (ZERROR64(*pzlib_filefunc_def,filestream))
|
| return UNZ_ERRNO;
|
| else
|
| return UNZ_EOF;
|
| @@ -197,26 +235,25 @@
|
| /* ===========================================================================
|
| Reads a long in LSB order from the given gz_stream. Sets
|
| */
|
| -local int unzlocal_getShort OF((
|
| - const zlib_filefunc_def* pzlib_filefunc_def,
|
| +local int unz64local_getShort OF((
|
| + const zlib_filefunc64_32_def* pzlib_filefunc_def,
|
| voidpf filestream,
|
| uLong *pX));
|
|
|
| -local int unzlocal_getShort (pzlib_filefunc_def,filestream,pX)
|
| - const zlib_filefunc_def* pzlib_filefunc_def;
|
| - voidpf filestream;
|
| - uLong *pX;
|
| +local int unz64local_getShort (const zlib_filefunc64_32_def* pzlib_filefunc_def,
|
| + voidpf filestream,
|
| + uLong *pX)
|
| {
|
| uLong x ;
|
| - int i;
|
| + int i = 0;
|
| int err;
|
|
|
| - err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);
|
| + err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
|
| x = (uLong)i;
|
|
|
| if (err==UNZ_OK)
|
| - err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);
|
| - x += ((uLong)i)<<8;
|
| + err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
|
| + x |= ((uLong)i)<<8;
|
|
|
| if (err==UNZ_OK)
|
| *pX = x;
|
| @@ -225,33 +262,32 @@
|
| return err;
|
| }
|
|
|
| -local int unzlocal_getLong OF((
|
| - const zlib_filefunc_def* pzlib_filefunc_def,
|
| +local int unz64local_getLong OF((
|
| + const zlib_filefunc64_32_def* pzlib_filefunc_def,
|
| voidpf filestream,
|
| uLong *pX));
|
|
|
| -local int unzlocal_getLong (pzlib_filefunc_def,filestream,pX)
|
| - const zlib_filefunc_def* pzlib_filefunc_def;
|
| - voidpf filestream;
|
| - uLong *pX;
|
| +local int unz64local_getLong (const zlib_filefunc64_32_def* pzlib_filefunc_def,
|
| + voidpf filestream,
|
| + uLong *pX)
|
| {
|
| uLong x ;
|
| - int i;
|
| + int i = 0;
|
| int err;
|
|
|
| - err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);
|
| + err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
|
| x = (uLong)i;
|
|
|
| if (err==UNZ_OK)
|
| - err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);
|
| - x += ((uLong)i)<<8;
|
| + err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
|
| + x |= ((uLong)i)<<8;
|
|
|
| if (err==UNZ_OK)
|
| - err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);
|
| - x += ((uLong)i)<<16;
|
| + err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
|
| + x |= ((uLong)i)<<16;
|
|
|
| if (err==UNZ_OK)
|
| - err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);
|
| + err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
|
| x += ((uLong)i)<<24;
|
|
|
| if (err==UNZ_OK)
|
| @@ -261,11 +297,60 @@
|
| return err;
|
| }
|
|
|
| +local int unz64local_getLong64 OF((
|
| + const zlib_filefunc64_32_def* pzlib_filefunc_def,
|
| + voidpf filestream,
|
| + ZPOS64_T *pX));
|
|
|
| +
|
| +local int unz64local_getLong64 (const zlib_filefunc64_32_def* pzlib_filefunc_def,
|
| + voidpf filestream,
|
| + ZPOS64_T *pX)
|
| +{
|
| + ZPOS64_T x ;
|
| + int i = 0;
|
| + int err;
|
| +
|
| + err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
|
| + x = (ZPOS64_T)i;
|
| +
|
| + if (err==UNZ_OK)
|
| + err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
|
| + x |= ((ZPOS64_T)i)<<8;
|
| +
|
| + if (err==UNZ_OK)
|
| + err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
|
| + x |= ((ZPOS64_T)i)<<16;
|
| +
|
| + if (err==UNZ_OK)
|
| + err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
|
| + x |= ((ZPOS64_T)i)<<24;
|
| +
|
| + if (err==UNZ_OK)
|
| + err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
|
| + x |= ((ZPOS64_T)i)<<32;
|
| +
|
| + if (err==UNZ_OK)
|
| + err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
|
| + x |= ((ZPOS64_T)i)<<40;
|
| +
|
| + if (err==UNZ_OK)
|
| + err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
|
| + x |= ((ZPOS64_T)i)<<48;
|
| +
|
| + if (err==UNZ_OK)
|
| + err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
|
| + x |= ((ZPOS64_T)i)<<56;
|
| +
|
| + if (err==UNZ_OK)
|
| + *pX = x;
|
| + else
|
| + *pX = 0;
|
| + return err;
|
| +}
|
| +
|
| /* My own strcmpi / strcasecmp */
|
| -local int strcmpcasenosensitive_internal (fileName1,fileName2)
|
| - const char* fileName1;
|
| - const char* fileName2;
|
| +local int strcmpcasenosensitive_internal (const char* fileName1, const char* fileName2)
|
| {
|
| for (;;)
|
| {
|
| @@ -306,10 +391,10 @@
|
| (like 1 on Unix, 2 on Windows)
|
|
|
| */
|
| -extern int ZEXPORT unzStringFileNameCompare (fileName1,fileName2,iCaseSensitivity)
|
| - const char* fileName1;
|
| - const char* fileName2;
|
| - int iCaseSensitivity;
|
| +extern int ZEXPORT unzStringFileNameCompare (const char* fileName1,
|
| + const char* fileName2,
|
| + int iCaseSensitivity)
|
| +
|
| {
|
| if (iCaseSensitivity==0)
|
| iCaseSensitivity=CASESENSITIVITYDEFAULTVALUE;
|
| @@ -328,25 +413,20 @@
|
| Locate the Central directory of a zipfile (at the end, just before
|
| the global comment)
|
| */
|
| -local uLong unzlocal_SearchCentralDir OF((
|
| - const zlib_filefunc_def* pzlib_filefunc_def,
|
| - voidpf filestream));
|
| -
|
| -local uLong unzlocal_SearchCentralDir(pzlib_filefunc_def,filestream)
|
| - const zlib_filefunc_def* pzlib_filefunc_def;
|
| - voidpf filestream;
|
| +local ZPOS64_T unz64local_SearchCentralDir OF((const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream));
|
| +local ZPOS64_T unz64local_SearchCentralDir(const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream)
|
| {
|
| unsigned char* buf;
|
| - uLong uSizeFile;
|
| - uLong uBackRead;
|
| - uLong uMaxBack=0xffff; /* maximum size of global comment */
|
| - uLong uPosFound=0;
|
| + ZPOS64_T uSizeFile;
|
| + ZPOS64_T uBackRead;
|
| + ZPOS64_T uMaxBack=0xffff; /* maximum size of global comment */
|
| + ZPOS64_T uPosFound=0;
|
|
|
| - if (ZSEEK(*pzlib_filefunc_def,filestream,0,ZLIB_FILEFUNC_SEEK_END) != 0)
|
| + if (ZSEEK64(*pzlib_filefunc_def,filestream,0,ZLIB_FILEFUNC_SEEK_END) != 0)
|
| return 0;
|
|
|
|
|
| - uSizeFile = ZTELL(*pzlib_filefunc_def,filestream);
|
| + uSizeFile = ZTELL64(*pzlib_filefunc_def,filestream);
|
|
|
| if (uMaxBack>uSizeFile)
|
| uMaxBack = uSizeFile;
|
| @@ -358,7 +438,8 @@
|
| uBackRead = 4;
|
| while (uBackRead<uMaxBack)
|
| {
|
| - uLong uReadSize,uReadPos ;
|
| + uLong uReadSize;
|
| + ZPOS64_T uReadPos ;
|
| int i;
|
| if (uBackRead+BUFREADCOMMENT>uMaxBack)
|
| uBackRead = uMaxBack;
|
| @@ -367,11 +448,11 @@
|
| uReadPos = uSizeFile-uBackRead ;
|
|
|
| uReadSize = ((BUFREADCOMMENT+4) < (uSizeFile-uReadPos)) ?
|
| - (BUFREADCOMMENT+4) : (uSizeFile-uReadPos);
|
| - if (ZSEEK(*pzlib_filefunc_def,filestream,uReadPos,ZLIB_FILEFUNC_SEEK_SET)!=0)
|
| + (BUFREADCOMMENT+4) : (uLong)(uSizeFile-uReadPos);
|
| + if (ZSEEK64(*pzlib_filefunc_def,filestream,uReadPos,ZLIB_FILEFUNC_SEEK_SET)!=0)
|
| break;
|
|
|
| - if (ZREAD(*pzlib_filefunc_def,filestream,buf,uReadSize)!=uReadSize)
|
| + if (ZREAD64(*pzlib_filefunc_def,filestream,buf,uReadSize)!=uReadSize)
|
| break;
|
|
|
| for (i=(int)uReadSize-3; (i--)>0;)
|
| @@ -389,7 +470,113 @@
|
| return uPosFound;
|
| }
|
|
|
| +
|
| /*
|
| + Locate the Central directory 64 of a zipfile (at the end, just before
|
| + the global comment)
|
| +*/
|
| +local ZPOS64_T unz64local_SearchCentralDir64 OF((
|
| + const zlib_filefunc64_32_def* pzlib_filefunc_def,
|
| + voidpf filestream));
|
| +
|
| +local ZPOS64_T unz64local_SearchCentralDir64(const zlib_filefunc64_32_def* pzlib_filefunc_def,
|
| + voidpf filestream)
|
| +{
|
| + unsigned char* buf;
|
| + ZPOS64_T uSizeFile;
|
| + ZPOS64_T uBackRead;
|
| + ZPOS64_T uMaxBack=0xffff; /* maximum size of global comment */
|
| + ZPOS64_T uPosFound=0;
|
| + uLong uL;
|
| + ZPOS64_T relativeOffset;
|
| +
|
| + if (ZSEEK64(*pzlib_filefunc_def,filestream,0,ZLIB_FILEFUNC_SEEK_END) != 0)
|
| + return 0;
|
| +
|
| +
|
| + uSizeFile = ZTELL64(*pzlib_filefunc_def,filestream);
|
| +
|
| + if (uMaxBack>uSizeFile)
|
| + uMaxBack = uSizeFile;
|
| +
|
| + buf = (unsigned char*)ALLOC(BUFREADCOMMENT+4);
|
| + if (buf==NULL)
|
| + return 0;
|
| +
|
| + uBackRead = 4;
|
| + while (uBackRead<uMaxBack)
|
| + {
|
| + uLong uReadSize;
|
| + ZPOS64_T uReadPos;
|
| + int i;
|
| + if (uBackRead+BUFREADCOMMENT>uMaxBack)
|
| + uBackRead = uMaxBack;
|
| + else
|
| + uBackRead+=BUFREADCOMMENT;
|
| + uReadPos = uSizeFile-uBackRead ;
|
| +
|
| + uReadSize = ((BUFREADCOMMENT+4) < (uSizeFile-uReadPos)) ?
|
| + (BUFREADCOMMENT+4) : (uLong)(uSizeFile-uReadPos);
|
| + if (ZSEEK64(*pzlib_filefunc_def,filestream,uReadPos,ZLIB_FILEFUNC_SEEK_SET)!=0)
|
| + break;
|
| +
|
| + if (ZREAD64(*pzlib_filefunc_def,filestream,buf,uReadSize)!=uReadSize)
|
| + break;
|
| +
|
| + for (i=(int)uReadSize-3; (i--)>0;)
|
| + if (((*(buf+i))==0x50) && ((*(buf+i+1))==0x4b) &&
|
| + ((*(buf+i+2))==0x06) && ((*(buf+i+3))==0x07))
|
| + {
|
| + uPosFound = uReadPos+i;
|
| + break;
|
| + }
|
| +
|
| + if (uPosFound!=0)
|
| + break;
|
| + }
|
| + TRYFREE(buf);
|
| + if (uPosFound == 0)
|
| + return 0;
|
| +
|
| + /* Zip64 end of central directory locator */
|
| + if (ZSEEK64(*pzlib_filefunc_def,filestream, uPosFound,ZLIB_FILEFUNC_SEEK_SET)!=0)
|
| + return 0;
|
| +
|
| + /* the signature, already checked */
|
| + if (unz64local_getLong(pzlib_filefunc_def,filestream,&uL)!=UNZ_OK)
|
| + return 0;
|
| +
|
| + /* number of the disk with the start of the zip64 end of central directory */
|
| + if (unz64local_getLong(pzlib_filefunc_def,filestream,&uL)!=UNZ_OK)
|
| + return 0;
|
| + if (uL != 0)
|
| + return 0;
|
| +
|
| + /* relative offset of the zip64 end of central directory record */
|
| + if (unz64local_getLong64(pzlib_filefunc_def,filestream,&relativeOffset)!=UNZ_OK)
|
| + return 0;
|
| +
|
| + /* total number of disks */
|
| + if (unz64local_getLong(pzlib_filefunc_def,filestream,&uL)!=UNZ_OK)
|
| + return 0;
|
| + if (uL != 1)
|
| + return 0;
|
| +
|
| + /* Goto end of central directory record */
|
| + if (ZSEEK64(*pzlib_filefunc_def,filestream, relativeOffset,ZLIB_FILEFUNC_SEEK_SET)!=0)
|
| + return 0;
|
| +
|
| + /* the signature */
|
| + if (unz64local_getLong(pzlib_filefunc_def,filestream,&uL)!=UNZ_OK)
|
| + return 0;
|
| +
|
| + if (uL != 0x06064b50)
|
| + return 0;
|
| +
|
| + return relativeOffset;
|
| +}
|
| +
|
| +/*
|
| Open a Zip file. path contain the full pathname (by example,
|
| on a Windows NT computer "c:\\test\\zlib114.zip" or on an Unix computer
|
| "zlib/zlib114.zip".
|
| @@ -398,19 +585,20 @@
|
| Else, the return value is a unzFile Handle, usable with other function
|
| of this unzip package.
|
| */
|
| -extern unzFile ZEXPORT unzOpen2 (path, pzlib_filefunc_def)
|
| - const char *path;
|
| - zlib_filefunc_def* pzlib_filefunc_def;
|
| +local unzFile unzOpenInternal (const void *path,
|
| + zlib_filefunc64_32_def* pzlib_filefunc64_32_def,
|
| + int is64bitOpenFunction)
|
| {
|
| - unz_s us;
|
| - unz_s *s;
|
| - uLong central_pos,uL;
|
| + unz64_s us;
|
| + unz64_s *s;
|
| + ZPOS64_T central_pos;
|
| + uLong uL;
|
|
|
| uLong number_disk; /* number of the current dist, used for
|
| spaning ZIP, unsupported, always 0*/
|
| uLong number_disk_with_CD; /* number the the disk with central dir, used
|
| for spaning ZIP, unsupported, always 0*/
|
| - uLong number_entry_CD; /* total number of entries in
|
| + ZPOS64_T number_entry_CD; /* total number of entries in
|
| the central dir
|
| (same than number_entry on nospan) */
|
|
|
| @@ -419,71 +607,145 @@
|
| if (unz_copyright[0]!=' ')
|
| return NULL;
|
|
|
| - if (pzlib_filefunc_def==NULL)
|
| - fill_fopen_filefunc(&us.z_filefunc);
|
| + us.z_filefunc.zseek32_file = NULL;
|
| + us.z_filefunc.ztell32_file = NULL;
|
| + if (pzlib_filefunc64_32_def==NULL)
|
| + fill_fopen64_filefunc(&us.z_filefunc.zfile_func64);
|
| else
|
| - us.z_filefunc = *pzlib_filefunc_def;
|
| + us.z_filefunc = *pzlib_filefunc64_32_def;
|
| + us.is64bitOpenFunction = is64bitOpenFunction;
|
|
|
| - us.filestream= (*(us.z_filefunc.zopen_file))(us.z_filefunc.opaque,
|
| +
|
| +
|
| + us.filestream = ZOPEN64(us.z_filefunc,
|
| path,
|
| ZLIB_FILEFUNC_MODE_READ |
|
| ZLIB_FILEFUNC_MODE_EXISTING);
|
| if (us.filestream==NULL)
|
| return NULL;
|
|
|
| - central_pos = unzlocal_SearchCentralDir(&us.z_filefunc,us.filestream);
|
| - if (central_pos==0)
|
| - err=UNZ_ERRNO;
|
| + central_pos = unz64local_SearchCentralDir64(&us.z_filefunc,us.filestream);
|
| + if (central_pos)
|
| + {
|
| + uLong uS;
|
| + ZPOS64_T uL64;
|
|
|
| - if (ZSEEK(us.z_filefunc, us.filestream,
|
| + us.isZip64 = 1;
|
| +
|
| + if (ZSEEK64(us.z_filefunc, us.filestream,
|
| central_pos,ZLIB_FILEFUNC_SEEK_SET)!=0)
|
| err=UNZ_ERRNO;
|
|
|
| - /* the signature, already checked */
|
| - if (unzlocal_getLong(&us.z_filefunc, us.filestream,&uL)!=UNZ_OK)
|
| - err=UNZ_ERRNO;
|
| + /* the signature, already checked */
|
| + if (unz64local_getLong(&us.z_filefunc, us.filestream,&uL)!=UNZ_OK)
|
| + err=UNZ_ERRNO;
|
|
|
| - /* number of this disk */
|
| - if (unzlocal_getShort(&us.z_filefunc, us.filestream,&number_disk)!=UNZ_OK)
|
| - err=UNZ_ERRNO;
|
| + /* size of zip64 end of central directory record */
|
| + if (unz64local_getLong64(&us.z_filefunc, us.filestream,&uL64)!=UNZ_OK)
|
| + err=UNZ_ERRNO;
|
|
|
| - /* number of the disk with the start of the central directory */
|
| - if (unzlocal_getShort(&us.z_filefunc, us.filestream,&number_disk_with_CD)!=UNZ_OK)
|
| - err=UNZ_ERRNO;
|
| + /* version made by */
|
| + if (unz64local_getShort(&us.z_filefunc, us.filestream,&uS)!=UNZ_OK)
|
| + err=UNZ_ERRNO;
|
|
|
| - /* total number of entries in the central dir on this disk */
|
| - if (unzlocal_getShort(&us.z_filefunc, us.filestream,&us.gi.number_entry)!=UNZ_OK)
|
| - err=UNZ_ERRNO;
|
| + /* version needed to extract */
|
| + if (unz64local_getShort(&us.z_filefunc, us.filestream,&uS)!=UNZ_OK)
|
| + err=UNZ_ERRNO;
|
|
|
| - /* total number of entries in the central dir */
|
| - if (unzlocal_getShort(&us.z_filefunc, us.filestream,&number_entry_CD)!=UNZ_OK)
|
| - err=UNZ_ERRNO;
|
| + /* number of this disk */
|
| + if (unz64local_getLong(&us.z_filefunc, us.filestream,&number_disk)!=UNZ_OK)
|
| + err=UNZ_ERRNO;
|
|
|
| - if ((number_entry_CD!=us.gi.number_entry) ||
|
| - (number_disk_with_CD!=0) ||
|
| - (number_disk!=0))
|
| - err=UNZ_BADZIPFILE;
|
| + /* number of the disk with the start of the central directory */
|
| + if (unz64local_getLong(&us.z_filefunc, us.filestream,&number_disk_with_CD)!=UNZ_OK)
|
| + err=UNZ_ERRNO;
|
|
|
| - /* size of the central directory */
|
| - if (unzlocal_getLong(&us.z_filefunc, us.filestream,&us.size_central_dir)!=UNZ_OK)
|
| - err=UNZ_ERRNO;
|
| + /* total number of entries in the central directory on this disk */
|
| + if (unz64local_getLong64(&us.z_filefunc, us.filestream,&us.gi.number_entry)!=UNZ_OK)
|
| + err=UNZ_ERRNO;
|
|
|
| - /* offset of start of central directory with respect to the
|
| + /* total number of entries in the central directory */
|
| + if (unz64local_getLong64(&us.z_filefunc, us.filestream,&number_entry_CD)!=UNZ_OK)
|
| + err=UNZ_ERRNO;
|
| +
|
| + if ((number_entry_CD!=us.gi.number_entry) ||
|
| + (number_disk_with_CD!=0) ||
|
| + (number_disk!=0))
|
| + err=UNZ_BADZIPFILE;
|
| +
|
| + /* size of the central directory */
|
| + if (unz64local_getLong64(&us.z_filefunc, us.filestream,&us.size_central_dir)!=UNZ_OK)
|
| + err=UNZ_ERRNO;
|
| +
|
| + /* offset of start of central directory with respect to the
|
| starting disk number */
|
| - if (unzlocal_getLong(&us.z_filefunc, us.filestream,&us.offset_central_dir)!=UNZ_OK)
|
| - err=UNZ_ERRNO;
|
| + if (unz64local_getLong64(&us.z_filefunc, us.filestream,&us.offset_central_dir)!=UNZ_OK)
|
| + err=UNZ_ERRNO;
|
|
|
| - /* zipfile comment length */
|
| - if (unzlocal_getShort(&us.z_filefunc, us.filestream,&us.gi.size_comment)!=UNZ_OK)
|
| - err=UNZ_ERRNO;
|
| + us.gi.size_comment = 0;
|
| + }
|
| + else
|
| + {
|
| + central_pos = unz64local_SearchCentralDir(&us.z_filefunc,us.filestream);
|
| + if (central_pos==0)
|
| + err=UNZ_ERRNO;
|
|
|
| + us.isZip64 = 0;
|
| +
|
| + if (ZSEEK64(us.z_filefunc, us.filestream,
|
| + central_pos,ZLIB_FILEFUNC_SEEK_SET)!=0)
|
| + err=UNZ_ERRNO;
|
| +
|
| + /* the signature, already checked */
|
| + if (unz64local_getLong(&us.z_filefunc, us.filestream,&uL)!=UNZ_OK)
|
| + err=UNZ_ERRNO;
|
| +
|
| + /* number of this disk */
|
| + if (unz64local_getShort(&us.z_filefunc, us.filestream,&number_disk)!=UNZ_OK)
|
| + err=UNZ_ERRNO;
|
| +
|
| + /* number of the disk with the start of the central directory */
|
| + if (unz64local_getShort(&us.z_filefunc, us.filestream,&number_disk_with_CD)!=UNZ_OK)
|
| + err=UNZ_ERRNO;
|
| +
|
| + /* total number of entries in the central dir on this disk */
|
| + if (unz64local_getShort(&us.z_filefunc, us.filestream,&uL)!=UNZ_OK)
|
| + err=UNZ_ERRNO;
|
| + us.gi.number_entry = uL;
|
| +
|
| + /* total number of entries in the central dir */
|
| + if (unz64local_getShort(&us.z_filefunc, us.filestream,&uL)!=UNZ_OK)
|
| + err=UNZ_ERRNO;
|
| + number_entry_CD = uL;
|
| +
|
| + if ((number_entry_CD!=us.gi.number_entry) ||
|
| + (number_disk_with_CD!=0) ||
|
| + (number_disk!=0))
|
| + err=UNZ_BADZIPFILE;
|
| +
|
| + /* size of the central directory */
|
| + if (unz64local_getLong(&us.z_filefunc, us.filestream,&uL)!=UNZ_OK)
|
| + err=UNZ_ERRNO;
|
| + us.size_central_dir = uL;
|
| +
|
| + /* offset of start of central directory with respect to the
|
| + starting disk number */
|
| + if (unz64local_getLong(&us.z_filefunc, us.filestream,&uL)!=UNZ_OK)
|
| + err=UNZ_ERRNO;
|
| + us.offset_central_dir = uL;
|
| +
|
| + /* zipfile comment length */
|
| + if (unz64local_getShort(&us.z_filefunc, us.filestream,&us.gi.size_comment)!=UNZ_OK)
|
| + err=UNZ_ERRNO;
|
| + }
|
| +
|
| if ((central_pos<us.offset_central_dir+us.size_central_dir) &&
|
| (err==UNZ_OK))
|
| err=UNZ_BADZIPFILE;
|
|
|
| if (err!=UNZ_OK)
|
| {
|
| - ZCLOSE(us.z_filefunc, us.filestream);
|
| + ZCLOSE64(us.z_filefunc, us.filestream);
|
| return NULL;
|
| }
|
|
|
| @@ -494,36 +756,70 @@
|
| us.encrypted = 0;
|
|
|
|
|
| - s=(unz_s*)ALLOC(sizeof(unz_s));
|
| - *s=us;
|
| - unzGoToFirstFile((unzFile)s);
|
| + s=(unz64_s*)ALLOC(sizeof(unz64_s));
|
| + if( s != NULL)
|
| + {
|
| + *s=us;
|
| + unzGoToFirstFile((unzFile)s);
|
| + }
|
| return (unzFile)s;
|
| }
|
|
|
|
|
| -extern unzFile ZEXPORT unzOpen (path)
|
| - const char *path;
|
| +extern unzFile ZEXPORT unzOpen2 (const char *path,
|
| + zlib_filefunc_def* pzlib_filefunc32_def)
|
| {
|
| - return unzOpen2(path, NULL);
|
| + if (pzlib_filefunc32_def != NULL)
|
| + {
|
| + zlib_filefunc64_32_def zlib_filefunc64_32_def_fill;
|
| + fill_zlib_filefunc64_32_def_from_filefunc32(&zlib_filefunc64_32_def_fill,pzlib_filefunc32_def);
|
| + return unzOpenInternal(path, &zlib_filefunc64_32_def_fill, 0);
|
| + }
|
| + else
|
| + return unzOpenInternal(path, NULL, 0);
|
| }
|
|
|
| +extern unzFile ZEXPORT unzOpen2_64 (const void *path,
|
| + zlib_filefunc64_def* pzlib_filefunc_def)
|
| +{
|
| + if (pzlib_filefunc_def != NULL)
|
| + {
|
| + zlib_filefunc64_32_def zlib_filefunc64_32_def_fill;
|
| + zlib_filefunc64_32_def_fill.zfile_func64 = *pzlib_filefunc_def;
|
| + zlib_filefunc64_32_def_fill.ztell32_file = NULL;
|
| + zlib_filefunc64_32_def_fill.zseek32_file = NULL;
|
| + return unzOpenInternal(path, &zlib_filefunc64_32_def_fill, 1);
|
| + }
|
| + else
|
| + return unzOpenInternal(path, NULL, 1);
|
| +}
|
| +
|
| +extern unzFile ZEXPORT unzOpen (const char *path)
|
| +{
|
| + return unzOpenInternal(path, NULL, 0);
|
| +}
|
| +
|
| +extern unzFile ZEXPORT unzOpen64 (const void *path)
|
| +{
|
| + return unzOpenInternal(path, NULL, 1);
|
| +}
|
| +
|
| /*
|
| Close a ZipFile opened with unzipOpen.
|
| If there is files inside the .Zip opened with unzipOpenCurrentFile (see later),
|
| these files MUST be closed with unzipCloseCurrentFile before call unzipClose.
|
| return UNZ_OK if there is no problem. */
|
| -extern int ZEXPORT unzClose (file)
|
| - unzFile file;
|
| +extern int ZEXPORT unzClose (unzFile file)
|
| {
|
| - unz_s* s;
|
| + unz64_s* s;
|
| if (file==NULL)
|
| return UNZ_PARAMERROR;
|
| - s=(unz_s*)file;
|
| + s=(unz64_s*)file;
|
|
|
| if (s->pfile_in_zip_read!=NULL)
|
| unzCloseCurrentFile(file);
|
|
|
| - ZCLOSE(s->z_filefunc, s->filestream);
|
| + ZCLOSE64(s->z_filefunc, s->filestream);
|
| TRYFREE(s);
|
| return UNZ_OK;
|
| }
|
| @@ -533,28 +829,34 @@
|
| 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 (file,pglobal_info)
|
| - unzFile file;
|
| - unz_global_info *pglobal_info;
|
| +extern int ZEXPORT unzGetGlobalInfo64 (unzFile file, unz_global_info64* pglobal_info)
|
| {
|
| - unz_s* s;
|
| + unz64_s* s;
|
| if (file==NULL)
|
| return UNZ_PARAMERROR;
|
| - s=(unz_s*)file;
|
| + s=(unz64_s*)file;
|
| *pglobal_info=s->gi;
|
| return UNZ_OK;
|
| }
|
|
|
| -
|
| +extern int ZEXPORT unzGetGlobalInfo (unzFile file, unz_global_info* pglobal_info32)
|
| +{
|
| + unz64_s* s;
|
| + if (file==NULL)
|
| + return UNZ_PARAMERROR;
|
| + s=(unz64_s*)file;
|
| + /* to do : check if number_entry is not truncated */
|
| + pglobal_info32->number_entry = (uLong)s->gi.number_entry;
|
| + pglobal_info32->size_comment = s->gi.size_comment;
|
| + return UNZ_OK;
|
| +}
|
| /*
|
| Translate date/time from Dos format to tm_unz (readable more easilty)
|
| */
|
| -local void unzlocal_DosDateToTmuDate (ulDosDate, ptm)
|
| - uLong ulDosDate;
|
| - tm_unz* ptm;
|
| +local void unz64local_DosDateToTmuDate (ZPOS64_T ulDosDate, tm_unz* ptm)
|
| {
|
| - uLong uDate;
|
| - uDate = (uLong)(ulDosDate>>16);
|
| + ZPOS64_T uDate;
|
| + uDate = (ZPOS64_T)(ulDosDate>>16);
|
| ptm->tm_mday = (uInt)(uDate&0x1f) ;
|
| ptm->tm_mon = (uInt)((((uDate)&0x1E0)/0x20)-1) ;
|
| ptm->tm_year = (uInt)(((uDate&0x0FE00)/0x0200)+1980) ;
|
| @@ -567,9 +869,9 @@
|
| /*
|
| Get Info about the current file in the zipfile, with internal only info
|
| */
|
| -local int unzlocal_GetCurrentFileInfoInternal OF((unzFile file,
|
| - unz_file_info *pfile_info,
|
| - unz_file_info_internal
|
| +local int unz64local_GetCurrentFileInfoInternal OF((unzFile file,
|
| + unz_file_info64 *pfile_info,
|
| + unz_file_info64_internal
|
| *pfile_info_internal,
|
| char *szFileName,
|
| uLong fileNameBufferSize,
|
| @@ -578,92 +880,93 @@
|
| char *szComment,
|
| uLong commentBufferSize));
|
|
|
| -local int unzlocal_GetCurrentFileInfoInternal (file,
|
| - pfile_info,
|
| - pfile_info_internal,
|
| - szFileName, fileNameBufferSize,
|
| - extraField, extraFieldBufferSize,
|
| - szComment, commentBufferSize)
|
| - unzFile file;
|
| - unz_file_info *pfile_info;
|
| - unz_file_info_internal *pfile_info_internal;
|
| - char *szFileName;
|
| - uLong fileNameBufferSize;
|
| - void *extraField;
|
| - uLong extraFieldBufferSize;
|
| - char *szComment;
|
| - uLong commentBufferSize;
|
| +local int unz64local_GetCurrentFileInfoInternal (unzFile file,
|
| + unz_file_info64 *pfile_info,
|
| + unz_file_info64_internal
|
| + *pfile_info_internal,
|
| + char *szFileName,
|
| + uLong fileNameBufferSize,
|
| + void *extraField,
|
| + uLong extraFieldBufferSize,
|
| + char *szComment,
|
| + uLong commentBufferSize)
|
| {
|
| - unz_s* s;
|
| - unz_file_info file_info;
|
| - unz_file_info_internal file_info_internal;
|
| + unz64_s* s;
|
| + unz_file_info64 file_info;
|
| + unz_file_info64_internal file_info_internal;
|
| int err=UNZ_OK;
|
| uLong uMagic;
|
| long lSeek=0;
|
| + uLong uL;
|
|
|
| if (file==NULL)
|
| return UNZ_PARAMERROR;
|
| - s=(unz_s*)file;
|
| - if (ZSEEK(s->z_filefunc, s->filestream,
|
| + s=(unz64_s*)file;
|
| + if (ZSEEK64(s->z_filefunc, s->filestream,
|
| s->pos_in_central_dir+s->byte_before_the_zipfile,
|
| ZLIB_FILEFUNC_SEEK_SET)!=0)
|
| err=UNZ_ERRNO;
|
|
|
|
|
| /* we check the magic */
|
| - if (err==UNZ_OK) {
|
| - if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uMagic) != UNZ_OK)
|
| + if (err==UNZ_OK)
|
| + {
|
| + if (unz64local_getLong(&s->z_filefunc, s->filestream,&uMagic) != UNZ_OK)
|
| err=UNZ_ERRNO;
|
| else if (uMagic!=0x02014b50)
|
| err=UNZ_BADZIPFILE;
|
| }
|
|
|
| - if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.version) != UNZ_OK)
|
| + if (unz64local_getShort(&s->z_filefunc, s->filestream,&file_info.version) != UNZ_OK)
|
| err=UNZ_ERRNO;
|
|
|
| - if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.version_needed) != UNZ_OK)
|
| + if (unz64local_getShort(&s->z_filefunc, s->filestream,&file_info.version_needed) != UNZ_OK)
|
| err=UNZ_ERRNO;
|
|
|
| - if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.flag) != UNZ_OK)
|
| + if (unz64local_getShort(&s->z_filefunc, s->filestream,&file_info.flag) != UNZ_OK)
|
| err=UNZ_ERRNO;
|
|
|
| - if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.compression_method) != UNZ_OK)
|
| + if (unz64local_getShort(&s->z_filefunc, s->filestream,&file_info.compression_method) != UNZ_OK)
|
| err=UNZ_ERRNO;
|
|
|
| - if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.dosDate) != UNZ_OK)
|
| + if (unz64local_getLong(&s->z_filefunc, s->filestream,&file_info.dosDate) != UNZ_OK)
|
| err=UNZ_ERRNO;
|
|
|
| - unzlocal_DosDateToTmuDate(file_info.dosDate,&file_info.tmu_date);
|
| + unz64local_DosDateToTmuDate(file_info.dosDate,&file_info.tmu_date);
|
|
|
| - if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.crc) != UNZ_OK)
|
| + if (unz64local_getLong(&s->z_filefunc, s->filestream,&file_info.crc) != UNZ_OK)
|
| err=UNZ_ERRNO;
|
|
|
| - if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.compressed_size) != UNZ_OK)
|
| + if (unz64local_getLong(&s->z_filefunc, s->filestream,&uL) != UNZ_OK)
|
| err=UNZ_ERRNO;
|
| + file_info.compressed_size = uL;
|
|
|
| - if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.uncompressed_size) != UNZ_OK)
|
| + if (unz64local_getLong(&s->z_filefunc, s->filestream,&uL) != UNZ_OK)
|
| err=UNZ_ERRNO;
|
| + file_info.uncompressed_size = uL;
|
|
|
| - if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.size_filename) != UNZ_OK)
|
| + if (unz64local_getShort(&s->z_filefunc, s->filestream,&file_info.size_filename) != UNZ_OK)
|
| err=UNZ_ERRNO;
|
|
|
| - if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.size_file_extra) != UNZ_OK)
|
| + if (unz64local_getShort(&s->z_filefunc, s->filestream,&file_info.size_file_extra) != UNZ_OK)
|
| err=UNZ_ERRNO;
|
|
|
| - if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.size_file_comment) != UNZ_OK)
|
| + if (unz64local_getShort(&s->z_filefunc, s->filestream,&file_info.size_file_comment) != UNZ_OK)
|
| err=UNZ_ERRNO;
|
|
|
| - if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.disk_num_start) != UNZ_OK)
|
| + if (unz64local_getShort(&s->z_filefunc, s->filestream,&file_info.disk_num_start) != UNZ_OK)
|
| err=UNZ_ERRNO;
|
|
|
| - if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.internal_fa) != UNZ_OK)
|
| + if (unz64local_getShort(&s->z_filefunc, s->filestream,&file_info.internal_fa) != UNZ_OK)
|
| err=UNZ_ERRNO;
|
|
|
| - if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.external_fa) != UNZ_OK)
|
| + if (unz64local_getLong(&s->z_filefunc, s->filestream,&file_info.external_fa) != UNZ_OK)
|
| err=UNZ_ERRNO;
|
|
|
| - if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info_internal.offset_curfile) != UNZ_OK)
|
| + // relative offset of local header
|
| + if (unz64local_getLong(&s->z_filefunc, s->filestream,&uL) != UNZ_OK)
|
| err=UNZ_ERRNO;
|
| + file_info_internal.offset_curfile = uL;
|
|
|
| lSeek+=file_info.size_filename;
|
| if ((err==UNZ_OK) && (szFileName!=NULL))
|
| @@ -678,35 +981,106 @@
|
| uSizeRead = fileNameBufferSize;
|
|
|
| if ((file_info.size_filename>0) && (fileNameBufferSize>0))
|
| - if (ZREAD(s->z_filefunc, s->filestream,szFileName,uSizeRead)!=uSizeRead)
|
| + if (ZREAD64(s->z_filefunc, s->filestream,szFileName,uSizeRead)!=uSizeRead)
|
| err=UNZ_ERRNO;
|
| lSeek -= uSizeRead;
|
| }
|
|
|
| -
|
| + // Read extrafield
|
| if ((err==UNZ_OK) && (extraField!=NULL))
|
| {
|
| - uLong uSizeRead ;
|
| + ZPOS64_T uSizeRead ;
|
| if (file_info.size_file_extra<extraFieldBufferSize)
|
| uSizeRead = file_info.size_file_extra;
|
| else
|
| uSizeRead = extraFieldBufferSize;
|
|
|
| - if (lSeek!=0) {
|
| - if (ZSEEK(s->z_filefunc, s->filestream,lSeek,ZLIB_FILEFUNC_SEEK_CUR)==0)
|
| + if (lSeek!=0)
|
| + {
|
| + if (ZSEEK64(s->z_filefunc, s->filestream,lSeek,ZLIB_FILEFUNC_SEEK_CUR)==0)
|
| lSeek=0;
|
| else
|
| err=UNZ_ERRNO;
|
| }
|
| +
|
| if ((file_info.size_file_extra>0) && (extraFieldBufferSize>0))
|
| - if (ZREAD(s->z_filefunc, s->filestream,extraField,uSizeRead)!=uSizeRead)
|
| + if (ZREAD64(s->z_filefunc, s->filestream,extraField,(uLong)uSizeRead)!=uSizeRead)
|
| err=UNZ_ERRNO;
|
| - lSeek += file_info.size_file_extra - uSizeRead;
|
| +
|
| + lSeek += file_info.size_file_extra - (uLong)uSizeRead;
|
| }
|
| else
|
| - lSeek+=file_info.size_file_extra;
|
| + lSeek += file_info.size_file_extra;
|
|
|
|
|
| + if ((err==UNZ_OK) && (file_info.size_file_extra != 0))
|
| + {
|
| + uLong acc = 0;
|
| +
|
| + // since lSeek now points to after the extra field we need to move back
|
| + lSeek -= file_info.size_file_extra;
|
| +
|
| + if (lSeek!=0)
|
| + {
|
| + if (ZSEEK64(s->z_filefunc, s->filestream,lSeek,ZLIB_FILEFUNC_SEEK_CUR)==0)
|
| + lSeek=0;
|
| + else
|
| + err=UNZ_ERRNO;
|
| + }
|
| +
|
| + while(acc < file_info.size_file_extra)
|
| + {
|
| + uLong headerId;
|
| + uLong dataSize;
|
| +
|
| + if (unz64local_getShort(&s->z_filefunc, s->filestream,&headerId) != UNZ_OK)
|
| + err=UNZ_ERRNO;
|
| +
|
| + if (unz64local_getShort(&s->z_filefunc, s->filestream,&dataSize) != UNZ_OK)
|
| + err=UNZ_ERRNO;
|
| +
|
| + /* ZIP64 extra fields */
|
| + if (headerId == 0x0001)
|
| + {
|
| + uLong uL;
|
| +
|
| + if(file_info.uncompressed_size == (ZPOS64_T)(unsigned long)-1)
|
| + {
|
| + if (unz64local_getLong64(&s->z_filefunc, s->filestream,&file_info.uncompressed_size) != UNZ_OK)
|
| + err=UNZ_ERRNO;
|
| + }
|
| +
|
| + if(file_info.compressed_size == (ZPOS64_T)(unsigned long)-1)
|
| + {
|
| + if (unz64local_getLong64(&s->z_filefunc, s->filestream,&file_info.compressed_size) != UNZ_OK)
|
| + err=UNZ_ERRNO;
|
| + }
|
| +
|
| + if(file_info_internal.offset_curfile == (ZPOS64_T)(unsigned long)-1)
|
| + {
|
| + /* Relative Header offset */
|
| + if (unz64local_getLong64(&s->z_filefunc, s->filestream,&file_info_internal.offset_curfile) != UNZ_OK)
|
| + err=UNZ_ERRNO;
|
| + }
|
| +
|
| + if(file_info.disk_num_start == (unsigned long)-1)
|
| + {
|
| + /* Disk Start Number */
|
| + if (unz64local_getLong(&s->z_filefunc, s->filestream,&uL) != UNZ_OK)
|
| + err=UNZ_ERRNO;
|
| + }
|
| +
|
| + }
|
| + else
|
| + {
|
| + if (ZSEEK64(s->z_filefunc, s->filestream,dataSize,ZLIB_FILEFUNC_SEEK_CUR)!=0)
|
| + err=UNZ_ERRNO;
|
| + }
|
| +
|
| + acc += 2 + 2 + dataSize;
|
| + }
|
| + }
|
| +
|
| if ((err==UNZ_OK) && (szComment!=NULL))
|
| {
|
| uLong uSizeRead ;
|
| @@ -718,20 +1092,23 @@
|
| else
|
| uSizeRead = commentBufferSize;
|
|
|
| - if (lSeek!=0) {
|
| - if (ZSEEK(s->z_filefunc, s->filestream,lSeek,ZLIB_FILEFUNC_SEEK_CUR)==0)
|
| + if (lSeek!=0)
|
| + {
|
| + if (ZSEEK64(s->z_filefunc, s->filestream,lSeek,ZLIB_FILEFUNC_SEEK_CUR)==0)
|
| lSeek=0;
|
| else
|
| err=UNZ_ERRNO;
|
| }
|
| +
|
| if ((file_info.size_file_comment>0) && (commentBufferSize>0))
|
| - if (ZREAD(s->z_filefunc, s->filestream,szComment,uSizeRead)!=uSizeRead)
|
| + if (ZREAD64(s->z_filefunc, s->filestream,szComment,uSizeRead)!=uSizeRead)
|
| err=UNZ_ERRNO;
|
| lSeek+=file_info.size_file_comment - uSizeRead;
|
| }
|
| else
|
| lSeek+=file_info.size_file_comment;
|
|
|
| +
|
| if ((err==UNZ_OK) && (pfile_info!=NULL))
|
| *pfile_info=file_info;
|
|
|
| @@ -748,41 +1125,70 @@
|
| No preparation of the structure is needed
|
| return UNZ_OK if there is no problem.
|
| */
|
| -extern int ZEXPORT unzGetCurrentFileInfo (file,
|
| - pfile_info,
|
| - szFileName, fileNameBufferSize,
|
| - extraField, extraFieldBufferSize,
|
| - szComment, commentBufferSize)
|
| - unzFile file;
|
| - unz_file_info *pfile_info;
|
| - char *szFileName;
|
| - uLong fileNameBufferSize;
|
| - void *extraField;
|
| - uLong extraFieldBufferSize;
|
| - char *szComment;
|
| - uLong commentBufferSize;
|
| +extern int ZEXPORT unzGetCurrentFileInfo64 (unzFile file,
|
| + unz_file_info64 * pfile_info,
|
| + char * szFileName, uLong fileNameBufferSize,
|
| + void *extraField, uLong extraFieldBufferSize,
|
| + char* szComment, uLong commentBufferSize)
|
| {
|
| - return unzlocal_GetCurrentFileInfoInternal(file,pfile_info,NULL,
|
| + return unz64local_GetCurrentFileInfoInternal(file,pfile_info,NULL,
|
| szFileName,fileNameBufferSize,
|
| extraField,extraFieldBufferSize,
|
| szComment,commentBufferSize);
|
| }
|
|
|
| +extern int ZEXPORT unzGetCurrentFileInfo (unzFile file,
|
| + unz_file_info * pfile_info,
|
| + char * szFileName, uLong fileNameBufferSize,
|
| + void *extraField, uLong extraFieldBufferSize,
|
| + char* szComment, uLong commentBufferSize)
|
| +{
|
| + int err;
|
| + unz_file_info64 file_info64;
|
| + err = unz64local_GetCurrentFileInfoInternal(file,&file_info64,NULL,
|
| + szFileName,fileNameBufferSize,
|
| + extraField,extraFieldBufferSize,
|
| + szComment,commentBufferSize);
|
| + if (err==UNZ_OK)
|
| + {
|
| + pfile_info->version = file_info64.version;
|
| + pfile_info->version_needed = file_info64.version_needed;
|
| + pfile_info->flag = file_info64.flag;
|
| + pfile_info->compression_method = file_info64.compression_method;
|
| + pfile_info->dosDate = file_info64.dosDate;
|
| + pfile_info->crc = file_info64.crc;
|
| +
|
| + pfile_info->size_filename = file_info64.size_filename;
|
| + pfile_info->size_file_extra = file_info64.size_file_extra;
|
| + pfile_info->size_file_comment = file_info64.size_file_comment;
|
| +
|
| + pfile_info->disk_num_start = file_info64.disk_num_start;
|
| + pfile_info->internal_fa = file_info64.internal_fa;
|
| + pfile_info->external_fa = file_info64.external_fa;
|
| +
|
| + pfile_info->tmu_date = file_info64.tmu_date,
|
| +
|
| +
|
| + pfile_info->compressed_size = (uLong)file_info64.compressed_size;
|
| + pfile_info->uncompressed_size = (uLong)file_info64.uncompressed_size;
|
| +
|
| + }
|
| + return err;
|
| +}
|
| /*
|
| Set the current file of the zipfile to the first file.
|
| return UNZ_OK if there is no problem
|
| */
|
| -extern int ZEXPORT unzGoToFirstFile (file)
|
| - unzFile file;
|
| +extern int ZEXPORT unzGoToFirstFile (unzFile file)
|
| {
|
| int err=UNZ_OK;
|
| - unz_s* s;
|
| + unz64_s* s;
|
| if (file==NULL)
|
| return UNZ_PARAMERROR;
|
| - s=(unz_s*)file;
|
| + s=(unz64_s*)file;
|
| s->pos_in_central_dir=s->offset_central_dir;
|
| s->num_file=0;
|
| - err=unzlocal_GetCurrentFileInfoInternal(file,&s->cur_file_info,
|
| + err=unz64local_GetCurrentFileInfoInternal(file,&s->cur_file_info,
|
| &s->cur_file_info_internal,
|
| NULL,0,NULL,0,NULL,0);
|
| s->current_file_ok = (err == UNZ_OK);
|
| @@ -794,15 +1200,14 @@
|
| 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 (file)
|
| - unzFile file;
|
| +extern int ZEXPORT unzGoToNextFile (unzFile file)
|
| {
|
| - unz_s* s;
|
| + unz64_s* s;
|
| int err;
|
|
|
| if (file==NULL)
|
| return UNZ_PARAMERROR;
|
| - s=(unz_s*)file;
|
| + s=(unz64_s*)file;
|
| if (!s->current_file_ok)
|
| return UNZ_END_OF_LIST_OF_FILE;
|
| if (s->gi.number_entry != 0xffff) /* 2^16 files overflow hack */
|
| @@ -812,7 +1217,7 @@
|
| s->pos_in_central_dir += SIZECENTRALDIRITEM + s->cur_file_info.size_filename +
|
| s->cur_file_info.size_file_extra + s->cur_file_info.size_file_comment ;
|
| s->num_file++;
|
| - err = unzlocal_GetCurrentFileInfoInternal(file,&s->cur_file_info,
|
| + err = unz64local_GetCurrentFileInfoInternal(file,&s->cur_file_info,
|
| &s->cur_file_info_internal,
|
| NULL,0,NULL,0,NULL,0);
|
| s->current_file_ok = (err == UNZ_OK);
|
| @@ -828,21 +1233,18 @@
|
| UNZ_OK if the file is found. It becomes the current file.
|
| UNZ_END_OF_LIST_OF_FILE if the file is not found
|
| */
|
| -extern int ZEXPORT unzLocateFile (file, szFileName, iCaseSensitivity)
|
| - unzFile file;
|
| - const char *szFileName;
|
| - int iCaseSensitivity;
|
| +extern int ZEXPORT unzLocateFile (unzFile file, const char *szFileName, int iCaseSensitivity)
|
| {
|
| - unz_s* s;
|
| + unz64_s* s;
|
| int err;
|
|
|
| /* We remember the 'current' position in the file so that we can jump
|
| * back there if we fail.
|
| */
|
| - unz_file_info cur_file_infoSaved;
|
| - unz_file_info_internal cur_file_info_internalSaved;
|
| - uLong num_fileSaved;
|
| - uLong pos_in_central_dirSaved;
|
| + unz_file_info64 cur_file_infoSaved;
|
| + unz_file_info64_internal cur_file_info_internalSaved;
|
| + ZPOS64_T num_fileSaved;
|
| + ZPOS64_T pos_in_central_dirSaved;
|
|
|
|
|
| if (file==NULL)
|
| @@ -851,7 +1253,7 @@
|
| if (strlen(szFileName)>=UNZ_MAXFILENAMEINZIP)
|
| return UNZ_PARAMERROR;
|
|
|
| - s=(unz_s*)file;
|
| + s=(unz64_s*)file;
|
| if (!s->current_file_ok)
|
| return UNZ_END_OF_LIST_OF_FILE;
|
|
|
| @@ -866,7 +1268,7 @@
|
| while (err == UNZ_OK)
|
| {
|
| char szCurrentFileName[UNZ_MAXFILENAMEINZIP+1];
|
| - err = unzGetCurrentFileInfo(file,NULL,
|
| + err = unzGetCurrentFileInfo64(file,NULL,
|
| szCurrentFileName,sizeof(szCurrentFileName)-1,
|
| NULL,0,NULL,0);
|
| if (err == UNZ_OK)
|
| @@ -902,20 +1304,18 @@
|
| /*
|
| typedef struct unz_file_pos_s
|
| {
|
| - uLong pos_in_zip_directory; // offset in file
|
| - uLong num_of_file; // # of file
|
| + ZPOS64_T pos_in_zip_directory; // offset in file
|
| + ZPOS64_T num_of_file; // # of file
|
| } unz_file_pos;
|
| */
|
|
|
| -extern int ZEXPORT unzGetFilePos(file, file_pos)
|
| - unzFile file;
|
| - unz_file_pos* file_pos;
|
| +extern int ZEXPORT unzGetFilePos64(unzFile file, unz64_file_pos* file_pos)
|
| {
|
| - unz_s* s;
|
| + unz64_s* s;
|
|
|
| if (file==NULL || file_pos==NULL)
|
| return UNZ_PARAMERROR;
|
| - s=(unz_s*)file;
|
| + s=(unz64_s*)file;
|
| if (!s->current_file_ok)
|
| return UNZ_END_OF_LIST_OF_FILE;
|
|
|
| @@ -925,23 +1325,35 @@
|
| return UNZ_OK;
|
| }
|
|
|
| -extern int ZEXPORT unzGoToFilePos(file, file_pos)
|
| - unzFile file;
|
| - unz_file_pos* file_pos;
|
| +extern int ZEXPORT unzGetFilePos(
|
| + unzFile file,
|
| + unz_file_pos* file_pos)
|
| {
|
| - unz_s* s;
|
| + unz64_file_pos file_pos64;
|
| + int err = unzGetFilePos64(file,&file_pos64);
|
| + if (err==UNZ_OK)
|
| + {
|
| + file_pos->pos_in_zip_directory = (uLong)file_pos64.pos_in_zip_directory;
|
| + file_pos->num_of_file = (uLong)file_pos64.num_of_file;
|
| + }
|
| + return err;
|
| +}
|
| +
|
| +extern int ZEXPORT unzGoToFilePos64(unzFile file, const unz64_file_pos* file_pos)
|
| +{
|
| + unz64_s* s;
|
| int err;
|
|
|
| if (file==NULL || file_pos==NULL)
|
| return UNZ_PARAMERROR;
|
| - s=(unz_s*)file;
|
| + s=(unz64_s*)file;
|
|
|
| /* jump to the right spot */
|
| s->pos_in_central_dir = file_pos->pos_in_zip_directory;
|
| s->num_file = file_pos->num_of_file;
|
|
|
| /* set the current file */
|
| - err = unzlocal_GetCurrentFileInfoInternal(file,&s->cur_file_info,
|
| + err = unz64local_GetCurrentFileInfoInternal(file,&s->cur_file_info,
|
| &s->cur_file_info_internal,
|
| NULL,0,NULL,0,NULL,0);
|
| /* return results */
|
| @@ -949,6 +1361,19 @@
|
| return err;
|
| }
|
|
|
| +extern int ZEXPORT unzGoToFilePos(
|
| + unzFile file,
|
| + unz_file_pos* file_pos)
|
| +{
|
| + unz64_file_pos file_pos64;
|
| + if (file_pos == NULL)
|
| + return UNZ_PARAMERROR;
|
| +
|
| + file_pos64.pos_in_zip_directory = file_pos->pos_in_zip_directory;
|
| + file_pos64.num_of_file = file_pos->num_of_file;
|
| + return unzGoToFilePos64(file,&file_pos64);
|
| +}
|
| +
|
| /*
|
| // Unzip Helper Functions - should be here?
|
| ///////////////////////////////////////////
|
| @@ -961,13 +1386,9 @@
|
| store in *piSizeVar the size of extra info in local header
|
| (filename and size of extra field data)
|
| */
|
| -local int unzlocal_CheckCurrentFileCoherencyHeader (s,piSizeVar,
|
| - poffset_local_extrafield,
|
| - psize_local_extrafield)
|
| - unz_s* s;
|
| - uInt* piSizeVar;
|
| - uLong *poffset_local_extrafield;
|
| - uInt *psize_local_extrafield;
|
| +local int unz64local_CheckCurrentFileCoherencyHeader (unz64_s* s, uInt* piSizeVar,
|
| + ZPOS64_T * poffset_local_extrafield,
|
| + uInt * psize_local_extrafield)
|
| {
|
| uLong uMagic,uData,uFlags;
|
| uLong size_filename;
|
| @@ -978,66 +1399,66 @@
|
| *poffset_local_extrafield = 0;
|
| *psize_local_extrafield = 0;
|
|
|
| - if (ZSEEK(s->z_filefunc, s->filestream,s->cur_file_info_internal.offset_curfile +
|
| + if (ZSEEK64(s->z_filefunc, s->filestream,s->cur_file_info_internal.offset_curfile +
|
| s->byte_before_the_zipfile,ZLIB_FILEFUNC_SEEK_SET)!=0)
|
| return UNZ_ERRNO;
|
|
|
|
|
| - if (err==UNZ_OK) {
|
| - if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uMagic) != UNZ_OK)
|
| + if (err==UNZ_OK)
|
| + {
|
| + if (unz64local_getLong(&s->z_filefunc, s->filestream,&uMagic) != UNZ_OK)
|
| err=UNZ_ERRNO;
|
| else if (uMagic!=0x04034b50)
|
| err=UNZ_BADZIPFILE;
|
| }
|
|
|
| - if (unzlocal_getShort(&s->z_filefunc, s->filestream,&uData) != UNZ_OK)
|
| + if (unz64local_getShort(&s->z_filefunc, s->filestream,&uData) != UNZ_OK)
|
| err=UNZ_ERRNO;
|
| /*
|
| else if ((err==UNZ_OK) && (uData!=s->cur_file_info.wVersion))
|
| err=UNZ_BADZIPFILE;
|
| */
|
| - if (unzlocal_getShort(&s->z_filefunc, s->filestream,&uFlags) != UNZ_OK)
|
| + if (unz64local_getShort(&s->z_filefunc, s->filestream,&uFlags) != UNZ_OK)
|
| err=UNZ_ERRNO;
|
|
|
| - if (unzlocal_getShort(&s->z_filefunc, s->filestream,&uData) != UNZ_OK)
|
| + if (unz64local_getShort(&s->z_filefunc, s->filestream,&uData) != UNZ_OK)
|
| err=UNZ_ERRNO;
|
| else if ((err==UNZ_OK) && (uData!=s->cur_file_info.compression_method))
|
| err=UNZ_BADZIPFILE;
|
|
|
| if ((err==UNZ_OK) && (s->cur_file_info.compression_method!=0) &&
|
| +/* #ifdef HAVE_BZIP2 */
|
| + (s->cur_file_info.compression_method!=Z_BZIP2ED) &&
|
| +/* #endif */
|
| (s->cur_file_info.compression_method!=Z_DEFLATED))
|
| err=UNZ_BADZIPFILE;
|
|
|
| - if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* date/time */
|
| + if (unz64local_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* date/time */
|
| err=UNZ_ERRNO;
|
|
|
| - if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* crc */
|
| + if (unz64local_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* crc */
|
| err=UNZ_ERRNO;
|
| - else if ((err==UNZ_OK) && (uData!=s->cur_file_info.crc) &&
|
| - ((uFlags & 8)==0))
|
| + else if ((err==UNZ_OK) && (uData!=s->cur_file_info.crc) && ((uFlags & 8)==0))
|
| err=UNZ_BADZIPFILE;
|
|
|
| - if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* size compr */
|
| + if (unz64local_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* size compr */
|
| err=UNZ_ERRNO;
|
| - else if ((err==UNZ_OK) && (uData!=s->cur_file_info.compressed_size) &&
|
| - ((uFlags & 8)==0))
|
| + else if (uData != 0xFFFFFFFF && (err==UNZ_OK) && (uData!=s->cur_file_info.compressed_size) && ((uFlags & 8)==0))
|
| err=UNZ_BADZIPFILE;
|
|
|
| - if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* size uncompr */
|
| + if (unz64local_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* size uncompr */
|
| err=UNZ_ERRNO;
|
| - else if ((err==UNZ_OK) && (uData!=s->cur_file_info.uncompressed_size) &&
|
| - ((uFlags & 8)==0))
|
| + else if (uData != 0xFFFFFFFF && (err==UNZ_OK) && (uData!=s->cur_file_info.uncompressed_size) && ((uFlags & 8)==0))
|
| err=UNZ_BADZIPFILE;
|
|
|
| -
|
| - if (unzlocal_getShort(&s->z_filefunc, s->filestream,&size_filename) != UNZ_OK)
|
| + if (unz64local_getShort(&s->z_filefunc, s->filestream,&size_filename) != UNZ_OK)
|
| err=UNZ_ERRNO;
|
| else if ((err==UNZ_OK) && (size_filename!=s->cur_file_info.size_filename))
|
| err=UNZ_BADZIPFILE;
|
|
|
| *piSizeVar += (uInt)size_filename;
|
|
|
| - if (unzlocal_getShort(&s->z_filefunc, s->filestream,&size_extra_field) != UNZ_OK)
|
| + if (unz64local_getShort(&s->z_filefunc, s->filestream,&size_extra_field) != UNZ_OK)
|
| err=UNZ_ERRNO;
|
| *poffset_local_extrafield= s->cur_file_info_internal.offset_curfile +
|
| SIZEZIPLOCALHEADER + size_filename;
|
| @@ -1052,18 +1473,14 @@
|
| Open for reading data the current file in the zipfile.
|
| If there is no error and the file is opened, the return value is UNZ_OK.
|
| */
|
| -extern int ZEXPORT unzOpenCurrentFile3 (file, method, level, raw, password)
|
| - unzFile file;
|
| - int* method;
|
| - int* level;
|
| - int raw;
|
| - const char* password;
|
| +extern int ZEXPORT unzOpenCurrentFile3 (unzFile file, int* method,
|
| + int* level, int raw, const char* password)
|
| {
|
| int err=UNZ_OK;
|
| uInt iSizeVar;
|
| - unz_s* s;
|
| - file_in_zip_read_info_s* pfile_in_zip_read_info;
|
| - uLong offset_local_extrafield; /* offset of the local extra field */
|
| + unz64_s* s;
|
| + file_in_zip64_read_info_s* pfile_in_zip_read_info;
|
| + ZPOS64_T offset_local_extrafield; /* offset of the local extra field */
|
| uInt size_local_extrafield; /* size of the local extra field */
|
| # ifndef NOUNCRYPT
|
| char source[12];
|
| @@ -1074,19 +1491,17 @@
|
|
|
| if (file==NULL)
|
| return UNZ_PARAMERROR;
|
| - s=(unz_s*)file;
|
| + s=(unz64_s*)file;
|
| if (!s->current_file_ok)
|
| return UNZ_PARAMERROR;
|
|
|
| if (s->pfile_in_zip_read != NULL)
|
| unzCloseCurrentFile(file);
|
|
|
| - if (unzlocal_CheckCurrentFileCoherencyHeader(s,&iSizeVar,
|
| - &offset_local_extrafield,&size_local_extrafield)!=UNZ_OK)
|
| + if (unz64local_CheckCurrentFileCoherencyHeader(s,&iSizeVar, &offset_local_extrafield,&size_local_extrafield)!=UNZ_OK)
|
| return UNZ_BADZIPFILE;
|
|
|
| - pfile_in_zip_read_info = (file_in_zip_read_info_s*)
|
| - ALLOC(sizeof(file_in_zip_read_info_s));
|
| + pfile_in_zip_read_info = (file_in_zip64_read_info_s*)ALLOC(sizeof(file_in_zip64_read_info_s));
|
| if (pfile_in_zip_read_info==NULL)
|
| return UNZ_INTERNALERROR;
|
|
|
| @@ -1119,31 +1534,60 @@
|
| }
|
|
|
| if ((s->cur_file_info.compression_method!=0) &&
|
| +/* #ifdef HAVE_BZIP2 */
|
| + (s->cur_file_info.compression_method!=Z_BZIP2ED) &&
|
| +/* #endif */
|
| (s->cur_file_info.compression_method!=Z_DEFLATED))
|
| +
|
| err=UNZ_BADZIPFILE;
|
|
|
| pfile_in_zip_read_info->crc32_wait=s->cur_file_info.crc;
|
| pfile_in_zip_read_info->crc32=0;
|
| - pfile_in_zip_read_info->compression_method =
|
| - s->cur_file_info.compression_method;
|
| + pfile_in_zip_read_info->total_out_64=0;
|
| + pfile_in_zip_read_info->compression_method = s->cur_file_info.compression_method;
|
| pfile_in_zip_read_info->filestream=s->filestream;
|
| pfile_in_zip_read_info->z_filefunc=s->z_filefunc;
|
| pfile_in_zip_read_info->byte_before_the_zipfile=s->byte_before_the_zipfile;
|
|
|
| pfile_in_zip_read_info->stream.total_out = 0;
|
|
|
| - if ((s->cur_file_info.compression_method==Z_DEFLATED) &&
|
| - (!raw))
|
| + if ((s->cur_file_info.compression_method==Z_BZIP2ED) && (!raw))
|
| {
|
| +#ifdef HAVE_BZIP2
|
| + pfile_in_zip_read_info->bstream.bzalloc = (void *(*) (void *, int, int))0;
|
| + pfile_in_zip_read_info->bstream.bzfree = (free_func)0;
|
| + pfile_in_zip_read_info->bstream.opaque = (voidpf)0;
|
| + pfile_in_zip_read_info->bstream.state = (voidpf)0;
|
| +
|
| pfile_in_zip_read_info->stream.zalloc = (alloc_func)0;
|
| pfile_in_zip_read_info->stream.zfree = (free_func)0;
|
| pfile_in_zip_read_info->stream.opaque = (voidpf)0;
|
| pfile_in_zip_read_info->stream.next_in = (voidpf)0;
|
| pfile_in_zip_read_info->stream.avail_in = 0;
|
|
|
| + err=BZ2_bzDecompressInit(&pfile_in_zip_read_info->bstream, 0, 0);
|
| + if (err == Z_OK)
|
| + pfile_in_zip_read_info->stream_initialised=Z_BZIP2ED;
|
| + else
|
| + {
|
| + TRYFREE(pfile_in_zip_read_info);
|
| + return err;
|
| + }
|
| +#else
|
| + pfile_in_zip_read_info->raw=1;
|
| +#endif
|
| + }
|
| + else if ((s->cur_file_info.compression_method==Z_DEFLATED) && (!raw))
|
| + {
|
| + pfile_in_zip_read_info->stream.zalloc = (alloc_func)0;
|
| + pfile_in_zip_read_info->stream.zfree = (free_func)0;
|
| + pfile_in_zip_read_info->stream.opaque = (voidpf)0;
|
| + pfile_in_zip_read_info->stream.next_in = 0;
|
| + pfile_in_zip_read_info->stream.avail_in = 0;
|
| +
|
| err=inflateInit2(&pfile_in_zip_read_info->stream, -MAX_WBITS);
|
| if (err == Z_OK)
|
| - pfile_in_zip_read_info->stream_initialised=1;
|
| + pfile_in_zip_read_info->stream_initialised=Z_DEFLATED;
|
| else
|
| {
|
| TRYFREE(pfile_in_zip_read_info);
|
| @@ -1170,6 +1614,7 @@
|
| pfile_in_zip_read_info->stream.avail_in = (uInt)0;
|
|
|
| s->pfile_in_zip_read = pfile_in_zip_read_info;
|
| + s->encrypted = 0;
|
|
|
| # ifndef NOUNCRYPT
|
| if (password != NULL)
|
| @@ -1177,12 +1622,12 @@
|
| int i;
|
| s->pcrc_32_tab = get_crc_table();
|
| init_keys(password,s->keys,s->pcrc_32_tab);
|
| - if (ZSEEK(s->z_filefunc, s->filestream,
|
| + if (ZSEEK64(s->z_filefunc, s->filestream,
|
| s->pfile_in_zip_read->pos_in_zipfile +
|
| s->pfile_in_zip_read->byte_before_the_zipfile,
|
| SEEK_SET)!=0)
|
| return UNZ_INTERNALERROR;
|
| - if(ZREAD(s->z_filefunc, s->filestream,source, 12)<12)
|
| + if(ZREAD64(s->z_filefunc, s->filestream,source, 12)<12)
|
| return UNZ_INTERNALERROR;
|
|
|
| for (i = 0; i<12; i++)
|
| @@ -1197,28 +1642,39 @@
|
| return UNZ_OK;
|
| }
|
|
|
| -extern int ZEXPORT unzOpenCurrentFile (file)
|
| - unzFile file;
|
| +extern int ZEXPORT unzOpenCurrentFile (unzFile file)
|
| {
|
| return unzOpenCurrentFile3(file, NULL, NULL, 0, NULL);
|
| }
|
|
|
| -extern int ZEXPORT unzOpenCurrentFilePassword (file, password)
|
| - unzFile file;
|
| - const char* password;
|
| +extern int ZEXPORT unzOpenCurrentFilePassword (unzFile file, const char* password)
|
| {
|
| return unzOpenCurrentFile3(file, NULL, NULL, 0, password);
|
| }
|
|
|
| -extern int ZEXPORT unzOpenCurrentFile2 (file,method,level,raw)
|
| - unzFile file;
|
| - int* method;
|
| - int* level;
|
| - int raw;
|
| +extern int ZEXPORT unzOpenCurrentFile2 (unzFile file, int* method, int* level, int raw)
|
| {
|
| return unzOpenCurrentFile3(file, method, level, raw, NULL);
|
| }
|
|
|
| +/** Addition for GDAL : START */
|
| +
|
| +extern ZPOS64_T ZEXPORT unzGetCurrentFileZStreamPos64( unzFile file)
|
| +{
|
| + unz64_s* s;
|
| + file_in_zip64_read_info_s* pfile_in_zip_read_info;
|
| + s=(unz64_s*)file;
|
| + if (file==NULL)
|
| + return 0; //UNZ_PARAMERROR;
|
| + pfile_in_zip_read_info=s->pfile_in_zip_read;
|
| + if (pfile_in_zip_read_info==NULL)
|
| + return 0; //UNZ_PARAMERROR;
|
| + return pfile_in_zip_read_info->pos_in_zipfile +
|
| + pfile_in_zip_read_info->byte_before_the_zipfile;
|
| +}
|
| +
|
| +/** Addition for GDAL : END */
|
| +
|
| /*
|
| Read bytes from the current file.
|
| buf contain buffer where data must be copied
|
| @@ -1229,18 +1685,15 @@
|
| return <0 with error code if there is an error
|
| (UNZ_ERRNO for IO error, or zLib error for uncompress error)
|
| */
|
| -extern int ZEXPORT unzReadCurrentFile (file, buf, len)
|
| - unzFile file;
|
| - voidp buf;
|
| - unsigned len;
|
| +extern int ZEXPORT unzReadCurrentFile (unzFile file, voidp buf, unsigned len)
|
| {
|
| int err=UNZ_OK;
|
| uInt iRead = 0;
|
| - unz_s* s;
|
| - file_in_zip_read_info_s* pfile_in_zip_read_info;
|
| + unz64_s* s;
|
| + file_in_zip64_read_info_s* pfile_in_zip_read_info;
|
| if (file==NULL)
|
| return UNZ_PARAMERROR;
|
| - s=(unz_s*)file;
|
| + s=(unz64_s*)file;
|
| pfile_in_zip_read_info=s->pfile_in_zip_read;
|
|
|
| if (pfile_in_zip_read_info==NULL)
|
| @@ -1278,13 +1731,13 @@
|
| uReadThis = (uInt)pfile_in_zip_read_info->rest_read_compressed;
|
| if (uReadThis == 0)
|
| return UNZ_EOF;
|
| - if (ZSEEK(pfile_in_zip_read_info->z_filefunc,
|
| + if (ZSEEK64(pfile_in_zip_read_info->z_filefunc,
|
| pfile_in_zip_read_info->filestream,
|
| pfile_in_zip_read_info->pos_in_zipfile +
|
| pfile_in_zip_read_info->byte_before_the_zipfile,
|
| ZLIB_FILEFUNC_SEEK_SET)!=0)
|
| return UNZ_ERRNO;
|
| - if (ZREAD(pfile_in_zip_read_info->z_filefunc,
|
| + if (ZREAD64(pfile_in_zip_read_info->z_filefunc,
|
| pfile_in_zip_read_info->filestream,
|
| pfile_in_zip_read_info->read_buffer,
|
| uReadThis)!=uReadThis)
|
| @@ -1330,6 +1783,8 @@
|
| *(pfile_in_zip_read_info->stream.next_out+i) =
|
| *(pfile_in_zip_read_info->stream.next_in+i);
|
|
|
| + pfile_in_zip_read_info->total_out_64 = pfile_in_zip_read_info->total_out_64 + uDoCopy;
|
| +
|
| pfile_in_zip_read_info->crc32 = crc32(pfile_in_zip_read_info->crc32,
|
| pfile_in_zip_read_info->stream.next_out,
|
| uDoCopy);
|
| @@ -1341,11 +1796,54 @@
|
| pfile_in_zip_read_info->stream.total_out += uDoCopy;
|
| iRead += uDoCopy;
|
| }
|
| - else
|
| + else if (pfile_in_zip_read_info->compression_method==Z_BZIP2ED)
|
| {
|
| +#ifdef HAVE_BZIP2
|
| uLong uTotalOutBefore,uTotalOutAfter;
|
| const Bytef *bufBefore;
|
| uLong uOutThis;
|
| +
|
| + pfile_in_zip_read_info->bstream.next_in = (char*)pfile_in_zip_read_info->stream.next_in;
|
| + pfile_in_zip_read_info->bstream.avail_in = pfile_in_zip_read_info->stream.avail_in;
|
| + pfile_in_zip_read_info->bstream.total_in_lo32 = pfile_in_zip_read_info->stream.total_in;
|
| + pfile_in_zip_read_info->bstream.total_in_hi32 = 0;
|
| + pfile_in_zip_read_info->bstream.next_out = (char*)pfile_in_zip_read_info->stream.next_out;
|
| + pfile_in_zip_read_info->bstream.avail_out = pfile_in_zip_read_info->stream.avail_out;
|
| + pfile_in_zip_read_info->bstream.total_out_lo32 = pfile_in_zip_read_info->stream.total_out;
|
| + pfile_in_zip_read_info->bstream.total_out_hi32 = 0;
|
| +
|
| + uTotalOutBefore = pfile_in_zip_read_info->bstream.total_out_lo32;
|
| + bufBefore = (const Bytef *)pfile_in_zip_read_info->bstream.next_out;
|
| +
|
| + err=BZ2_bzDecompress(&pfile_in_zip_read_info->bstream);
|
| +
|
| + uTotalOutAfter = pfile_in_zip_read_info->bstream.total_out_lo32;
|
| + uOutThis = uTotalOutAfter-uTotalOutBefore;
|
| +
|
| + pfile_in_zip_read_info->total_out_64 = pfile_in_zip_read_info->total_out_64 + uOutThis;
|
| +
|
| + pfile_in_zip_read_info->crc32 = crc32(pfile_in_zip_read_info->crc32,bufBefore, (uInt)(uOutThis));
|
| + pfile_in_zip_read_info->rest_read_uncompressed -= uOutThis;
|
| + iRead += (uInt)(uTotalOutAfter - uTotalOutBefore);
|
| +
|
| + pfile_in_zip_read_info->stream.next_in = (Bytef*)pfile_in_zip_read_info->bstream.next_in;
|
| + pfile_in_zip_read_info->stream.avail_in = pfile_in_zip_read_info->bstream.avail_in;
|
| + pfile_in_zip_read_info->stream.total_in = pfile_in_zip_read_info->bstream.total_in_lo32;
|
| + pfile_in_zip_read_info->stream.next_out = (Bytef*)pfile_in_zip_read_info->bstream.next_out;
|
| + pfile_in_zip_read_info->stream.avail_out = pfile_in_zip_read_info->bstream.avail_out;
|
| + pfile_in_zip_read_info->stream.total_out = pfile_in_zip_read_info->bstream.total_out_lo32;
|
| +
|
| + if (err==BZ_STREAM_END)
|
| + return (iRead==0) ? UNZ_EOF : iRead;
|
| + if (err!=BZ_OK)
|
| + break;
|
| +#endif
|
| + } // end Z_BZIP2ED
|
| + else
|
| + {
|
| + ZPOS64_T uTotalOutBefore,uTotalOutAfter;
|
| + const Bytef *bufBefore;
|
| + ZPOS64_T uOutThis;
|
| int flush=Z_SYNC_FLUSH;
|
|
|
| uTotalOutBefore = pfile_in_zip_read_info->stream.total_out;
|
| @@ -1365,6 +1863,8 @@
|
| uTotalOutAfter = pfile_in_zip_read_info->stream.total_out;
|
| uOutThis = uTotalOutAfter-uTotalOutBefore;
|
|
|
| + pfile_in_zip_read_info->total_out_64 = pfile_in_zip_read_info->total_out_64 + uOutThis;
|
| +
|
| pfile_in_zip_read_info->crc32 =
|
| crc32(pfile_in_zip_read_info->crc32,bufBefore,
|
| (uInt)(uOutThis));
|
| @@ -1390,14 +1890,13 @@
|
| /*
|
| Give the current position in uncompressed data
|
| */
|
| -extern z_off_t ZEXPORT unztell (file)
|
| - unzFile file;
|
| +extern z_off_t ZEXPORT unztell (unzFile file)
|
| {
|
| - unz_s* s;
|
| - file_in_zip_read_info_s* pfile_in_zip_read_info;
|
| + unz64_s* s;
|
| + file_in_zip64_read_info_s* pfile_in_zip_read_info;
|
| if (file==NULL)
|
| return UNZ_PARAMERROR;
|
| - s=(unz_s*)file;
|
| + s=(unz64_s*)file;
|
| pfile_in_zip_read_info=s->pfile_in_zip_read;
|
|
|
| if (pfile_in_zip_read_info==NULL)
|
| @@ -1406,18 +1905,33 @@
|
| return (z_off_t)pfile_in_zip_read_info->stream.total_out;
|
| }
|
|
|
| +extern ZPOS64_T ZEXPORT unztell64 (unzFile file)
|
| +{
|
|
|
| + unz64_s* s;
|
| + file_in_zip64_read_info_s* pfile_in_zip_read_info;
|
| + if (file==NULL)
|
| + return (ZPOS64_T)-1;
|
| + s=(unz64_s*)file;
|
| + pfile_in_zip_read_info=s->pfile_in_zip_read;
|
| +
|
| + if (pfile_in_zip_read_info==NULL)
|
| + return (ZPOS64_T)-1;
|
| +
|
| + return pfile_in_zip_read_info->total_out_64;
|
| +}
|
| +
|
| +
|
| /*
|
| return 1 if the end of file was reached, 0 elsewhere
|
| */
|
| -extern int ZEXPORT unzeof (file)
|
| - unzFile file;
|
| +extern int ZEXPORT unzeof (unzFile file)
|
| {
|
| - unz_s* s;
|
| - file_in_zip_read_info_s* pfile_in_zip_read_info;
|
| + unz64_s* s;
|
| + file_in_zip64_read_info_s* pfile_in_zip_read_info;
|
| if (file==NULL)
|
| return UNZ_PARAMERROR;
|
| - s=(unz_s*)file;
|
| + s=(unz64_s*)file;
|
| pfile_in_zip_read_info=s->pfile_in_zip_read;
|
|
|
| if (pfile_in_zip_read_info==NULL)
|
| @@ -1432,9 +1946,9 @@
|
|
|
|
|
| /*
|
| - 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)
|
| +Read extra field from the current file (opened by unzOpenCurrentFile)
|
| +This is the local-header version of the extra field (sometimes, there is
|
| +more info in the local-header version than in the central-header)
|
|
|
| if buf==NULL, it return the size of the local extra field that can be read
|
|
|
| @@ -1443,19 +1957,16 @@
|
| the return value is the number of bytes copied in buf, or (if <0)
|
| the error code
|
| */
|
| -extern int ZEXPORT unzGetLocalExtrafield (file,buf,len)
|
| - unzFile file;
|
| - voidp buf;
|
| - unsigned len;
|
| +extern int ZEXPORT unzGetLocalExtrafield (unzFile file, voidp buf, unsigned len)
|
| {
|
| - unz_s* s;
|
| - file_in_zip_read_info_s* pfile_in_zip_read_info;
|
| + unz64_s* s;
|
| + file_in_zip64_read_info_s* pfile_in_zip_read_info;
|
| uInt read_now;
|
| - uLong size_to_read;
|
| + ZPOS64_T size_to_read;
|
|
|
| if (file==NULL)
|
| return UNZ_PARAMERROR;
|
| - s=(unz_s*)file;
|
| + s=(unz64_s*)file;
|
| pfile_in_zip_read_info=s->pfile_in_zip_read;
|
|
|
| if (pfile_in_zip_read_info==NULL)
|
| @@ -1475,14 +1986,14 @@
|
| if (read_now==0)
|
| return 0;
|
|
|
| - if (ZSEEK(pfile_in_zip_read_info->z_filefunc,
|
| + if (ZSEEK64(pfile_in_zip_read_info->z_filefunc,
|
| pfile_in_zip_read_info->filestream,
|
| pfile_in_zip_read_info->offset_local_extrafield +
|
| pfile_in_zip_read_info->pos_local_extrafield,
|
| ZLIB_FILEFUNC_SEEK_SET)!=0)
|
| return UNZ_ERRNO;
|
|
|
| - if (ZREAD(pfile_in_zip_read_info->z_filefunc,
|
| + if (ZREAD64(pfile_in_zip_read_info->z_filefunc,
|
| pfile_in_zip_read_info->filestream,
|
| buf,read_now)!=read_now)
|
| return UNZ_ERRNO;
|
| @@ -1494,16 +2005,15 @@
|
| Close the file in zip opened with unzipOpenCurrentFile
|
| Return UNZ_CRCERROR if all the file was read but the CRC is not good
|
| */
|
| -extern int ZEXPORT unzCloseCurrentFile (file)
|
| - unzFile file;
|
| +extern int ZEXPORT unzCloseCurrentFile (unzFile file)
|
| {
|
| int err=UNZ_OK;
|
|
|
| - unz_s* s;
|
| - file_in_zip_read_info_s* pfile_in_zip_read_info;
|
| + unz64_s* s;
|
| + file_in_zip64_read_info_s* pfile_in_zip_read_info;
|
| if (file==NULL)
|
| return UNZ_PARAMERROR;
|
| - s=(unz_s*)file;
|
| + s=(unz64_s*)file;
|
| pfile_in_zip_read_info=s->pfile_in_zip_read;
|
|
|
| if (pfile_in_zip_read_info==NULL)
|
| @@ -1520,9 +2030,14 @@
|
|
|
| TRYFREE(pfile_in_zip_read_info->read_buffer);
|
| pfile_in_zip_read_info->read_buffer = NULL;
|
| - if (pfile_in_zip_read_info->stream_initialised)
|
| + if (pfile_in_zip_read_info->stream_initialised == Z_DEFLATED)
|
| inflateEnd(&pfile_in_zip_read_info->stream);
|
| +#ifdef HAVE_BZIP2
|
| + else if (pfile_in_zip_read_info->stream_initialised == Z_BZIP2ED)
|
| + BZ2_bzDecompressEnd(&pfile_in_zip_read_info->bstream);
|
| +#endif
|
|
|
| +
|
| pfile_in_zip_read_info->stream_initialised = 0;
|
| TRYFREE(pfile_in_zip_read_info);
|
|
|
| @@ -1537,29 +2052,25 @@
|
| uSizeBuf is the size of the szComment buffer.
|
| return the number of byte copied or an error code <0
|
| */
|
| -extern int ZEXPORT unzGetGlobalComment (file, szComment, uSizeBuf)
|
| - unzFile file;
|
| - char *szComment;
|
| - uLong uSizeBuf;
|
| +extern int ZEXPORT unzGetGlobalComment (unzFile file, char * szComment, uLong uSizeBuf)
|
| {
|
| - //int err=UNZ_OK;
|
| - unz_s* s;
|
| + unz64_s* s;
|
| uLong uReadThis ;
|
| if (file==NULL)
|
| - return UNZ_PARAMERROR;
|
| - s=(unz_s*)file;
|
| + return (int)UNZ_PARAMERROR;
|
| + s=(unz64_s*)file;
|
|
|
| uReadThis = uSizeBuf;
|
| if (uReadThis>s->gi.size_comment)
|
| uReadThis = s->gi.size_comment;
|
|
|
| - if (ZSEEK(s->z_filefunc,s->filestream,s->central_pos+22,ZLIB_FILEFUNC_SEEK_SET)!=0)
|
| + if (ZSEEK64(s->z_filefunc,s->filestream,s->central_pos+22,ZLIB_FILEFUNC_SEEK_SET)!=0)
|
| return UNZ_ERRNO;
|
|
|
| if (uReadThis>0)
|
| {
|
| *szComment='\0';
|
| - if (ZREAD(s->z_filefunc,s->filestream,szComment,uReadThis)!=uReadThis)
|
| + if (ZREAD64(s->z_filefunc,s->filestream,szComment,uReadThis)!=uReadThis)
|
| return UNZ_ERRNO;
|
| }
|
|
|
| @@ -1569,14 +2080,13 @@
|
| }
|
|
|
| /* Additions by RX '2004 */
|
| -extern uLong ZEXPORT unzGetOffset (file)
|
| - unzFile file;
|
| +extern ZPOS64_T ZEXPORT unzGetOffset64(unzFile file)
|
| {
|
| - unz_s* s;
|
| + unz64_s* s;
|
|
|
| if (file==NULL)
|
| - return UNZ_PARAMERROR;
|
| - s=(unz_s*)file;
|
| + return 0; //UNZ_PARAMERROR;
|
| + s=(unz64_s*)file;
|
| if (!s->current_file_ok)
|
| return 0;
|
| if (s->gi.number_entry != 0 && s->gi.number_entry != 0xffff)
|
| @@ -1585,22 +2095,35 @@
|
| return s->pos_in_central_dir;
|
| }
|
|
|
| -extern int ZEXPORT unzSetOffset (file, pos)
|
| - unzFile file;
|
| - uLong pos;
|
| +extern uLong ZEXPORT unzGetOffset (unzFile file)
|
| {
|
| - unz_s* s;
|
| + ZPOS64_T offset64;
|
| +
|
| + if (file==NULL)
|
| + return 0; //UNZ_PARAMERROR;
|
| + offset64 = unzGetOffset64(file);
|
| + return (uLong)offset64;
|
| +}
|
| +
|
| +extern int ZEXPORT unzSetOffset64(unzFile file, ZPOS64_T pos)
|
| +{
|
| + unz64_s* s;
|
| int err;
|
|
|
| if (file==NULL)
|
| return UNZ_PARAMERROR;
|
| - s=(unz_s*)file;
|
| + s=(unz64_s*)file;
|
|
|
| s->pos_in_central_dir = pos;
|
| s->num_file = s->gi.number_entry; /* hack */
|
| - err = unzlocal_GetCurrentFileInfoInternal(file,&s->cur_file_info,
|
| + err = unz64local_GetCurrentFileInfoInternal(file,&s->cur_file_info,
|
| &s->cur_file_info_internal,
|
| NULL,0,NULL,0,NULL,0);
|
| s->current_file_ok = (err == UNZ_OK);
|
| return err;
|
| }
|
| +
|
| +extern int ZEXPORT unzSetOffset (unzFile file, uLong pos)
|
| +{
|
| + return unzSetOffset64(file,pos);
|
| +}
|
|
|
Chromium Code Reviews
