third_party/zlib/contrib/minizip/unzip.h - Issue 8806004: Update zlib to 1.2.5.

Unified Diff: third_party/zlib/contrib/minizip/unzip.h

Issue 8806004: Update zlib to 1.2.5. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: '' Created 9 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Index: third_party/zlib/contrib/minizip/unzip.h

===================================================================

--- third_party/zlib/contrib/minizip/unzip.h (revision 113739)

+++ third_party/zlib/contrib/minizip/unzip.h (working copy)

@@ -1,20 +1,20 @@

/* unzip.h -- 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 )

- This unzip package allow extract file from .ZIP file, compatible with PKZip 2.04g

- WinZip, InfoZip tools and compatible.

+ Modifications of Unzip for Zip64

- 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

+ Modifications for Zip64 support on both zip and unzip

+ For more info read MiniZip_info.txt

- 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 :

+ 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

@@ -32,33 +32,39 @@

misrepresented as being the original software.

3. This notice may not be removed or altered from any source distribution.

+ ---------------------------------------------------------------------------------

-*/

+ Changes

-/* 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

+ See header of unzip64.c

-#ifndef _unz_H

-#define _unz_H

+#ifndef _unz64_H

+#define _unz64_H

#ifdef __cplusplus

extern "C" {

#endif

+#ifndef _ZLIB_H

#if defined(USE_SYSTEM_ZLIB)

#include <zlib.h>

#else

#include "third_party/zlib/zlib.h"

#endif

+#endif

-#ifndef _ZLIBIOAPI_H

+#ifndef _ZLIBIOAPI_H

#include "ioapi.h"

#endif

+#ifdef HAVE_BZIP2

+#include "bzlib.h"

+#endif

+#define Z_BZIP2ED 12

#if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP)

/* like the STRICT of WIN32, we define a pointer that cannot be converted

from (void*) without cast */

@@ -91,15 +97,42 @@

/* unz_global_info structure contain global data about the ZIPfile

These data comes from the end of central dir */

+typedef struct unz_global_info64_s

+ ZPOS64_T number_entry; /* total number of entries in

+ the central dir on this disk */

+ uLong size_comment; /* size of the global comment of the zipfile */

+} unz_global_info64;

typedef struct unz_global_info_s

{

uLong number_entry; /* total number of entries in

- the central dir on this disk */

+ the central dir on this disk */

uLong size_comment; /* size of the global comment of the zipfile */

} unz_global_info;

+/* unz_file_info contain information about a file in the zipfile */

+typedef struct unz_file_info64_s

+ uLong version; /* version made by 2 bytes */

+ uLong version_needed; /* version needed to extract 2 bytes */

+ uLong flag; /* general purpose bit flag 2 bytes */

+ uLong compression_method; /* compression method 2 bytes */

+ uLong dosDate; /* last mod file date in Dos fmt 4 bytes */

+ uLong crc; /* crc-32 4 bytes */

+ ZPOS64_T compressed_size; /* compressed size 8 bytes */

+ ZPOS64_T uncompressed_size; /* uncompressed size 8 bytes */

+ uLong size_filename; /* filename length 2 bytes */

+ uLong size_file_extra; /* extra field length 2 bytes */

+ uLong size_file_comment; /* file comment length 2 bytes */

-/* unz_file_info contain information about a file in the zipfile */

+ uLong disk_num_start; /* disk number start 2 bytes */

+ uLong internal_fa; /* internal file attributes 2 bytes */

+ uLong external_fa; /* external file attributes 4 bytes */

+ tm_unz tmu_date;

+} unz_file_info64;

typedef struct unz_file_info_s

{

uLong version; /* version made by 2 bytes */

@@ -135,6 +168,7 @@

extern unzFile ZEXPORT unzOpen OF((const char *path));

+extern unzFile ZEXPORT unzOpen64 OF((const void *path));

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

on a Windows XP computer "c:\\zlib\\zlib113.zip" or on an Unix computer

@@ -143,8 +177,14 @@

return value is NULL.

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

of this unzip package.

+ the "64" function take a const void* pointer, because the path is just the

+ value passed to the open64_file_func callback.

+ Under Windows, if UNICODE is defined, using fill_fopen64_filefunc, the path

+ is a pointer to a wide unicode string (LPCTSTR is LPCWSTR), so const char*

+ does not describe the reality

extern unzFile ZEXPORT unzOpen2 OF((const char *path,

zlib_filefunc_def* pzlib_filefunc_def));

@@ -152,6 +192,13 @@

for read/write the zip file (see ioapi.h)

+extern unzFile ZEXPORT unzOpen2_64 OF((const void *path,

+ zlib_filefunc64_def* pzlib_filefunc_def));

+/*

+ Open a Zip file, like unz64Open, but provide a set of file low level API

+ for read/write the zip file (see ioapi.h)

+*/

extern int ZEXPORT unzClose OF((unzFile file));

Close a ZipFile opened with unzipOpen.

@@ -161,6 +208,9 @@

extern int ZEXPORT unzGetGlobalInfo OF((unzFile file,

unz_global_info *pglobal_info));

+extern int ZEXPORT unzGetGlobalInfo64 OF((unzFile file,

+ unz_global_info64 *pglobal_info));

Write info about the ZipFile in the *pglobal_info structure.

No preparation of the structure is needed

@@ -223,8 +273,31 @@

unzFile file,

unz_file_pos* file_pos);

+typedef struct unz64_file_pos_s

+ ZPOS64_T pos_in_zip_directory; /* offset in zip file directory */

+ ZPOS64_T num_of_file; /* # of file */

+} unz64_file_pos;

+extern int ZEXPORT unzGetFilePos64(

+ unzFile file,

+ unz64_file_pos* file_pos);

+extern int ZEXPORT unzGoToFilePos64(

+ unzFile file,

+ const unz64_file_pos* file_pos);

/* ****************************************** */

+extern int ZEXPORT unzGetCurrentFileInfo64 OF((unzFile file,

+ unz_file_info64 *pfile_info,

+ char *szFileName,

+ uLong fileNameBufferSize,

+ void *extraField,

+ uLong extraFieldBufferSize,

+ char *szComment,

+ uLong commentBufferSize));

extern int ZEXPORT unzGetCurrentFileInfo OF((unzFile file,

unz_file_info *pfile_info,

char *szFileName,

@@ -246,6 +319,14 @@

(commentBufferSize is the size of the buffer)

+/** Addition for GDAL : START */

+extern ZPOS64_T ZEXPORT unzGetCurrentFileZStreamPos64 OF((unzFile file));

+/** Addition for GDAL : END */

/***************************************************************************/

/* for reading the content of the current zipfile, you can open it, read data

from it, and close it (you can close it before reading all the file)

@@ -314,6 +395,8 @@

extern z_off_t ZEXPORT unztell OF((unzFile file));

+extern ZPOS64_T ZEXPORT unztell64 OF((unzFile file));

Give the current position in uncompressed data

@@ -342,9 +425,11 @@

/***************************************************************************/

/* Get the current file offset */

+extern ZPOS64_T ZEXPORT unzGetOffset64 (unzFile file);

extern uLong ZEXPORT unzGetOffset (unzFile file);

/* Set the current file offset */

+extern int ZEXPORT unzSetOffset64 (unzFile file, ZPOS64_T pos);

extern int ZEXPORT unzSetOffset (unzFile file, uLong pos);

@@ -353,4 +438,4 @@

}

#endif

-#endif /* _unz_H */

+#endif /* _unz64_H */

« no previous file with comments | « third_party/zlib/contrib/minizip/mztools.c ('k') | third_party/zlib/contrib/minizip/unzip.c » ('j') | no next file with comments »