|
|
@@ -1,21 +1,47 @@
|
|
|
/* unzip.h -- IO for uncompress .zip files using zlib
|
|
|
Version 1.1, February 14h, 2010
|
|
|
- part of the MiniZip project
|
|
|
-
|
|
|
- Copyright (C) 1998-2010 Gilles Vollant
|
|
|
- http://www.winimage.com/zLibDll/minizip.html
|
|
|
- Modifications of Unzip for Zip64
|
|
|
- Copyright (C) 2007-2008 Even Rouault
|
|
|
- Modifications for Zip64 support on both zip and unzip
|
|
|
- Copyright (C) 2009-2010 Mathias Svensson
|
|
|
- http://result42.com
|
|
|
-
|
|
|
- This program is distributed under the terms of the same license as zlib.
|
|
|
- See the accompanying LICENSE file for the full text of the license.
|
|
|
+ part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
|
|
|
+
|
|
|
+ Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
|
|
|
+
|
|
|
+ Modifications of Unzip for Zip64
|
|
|
+ Copyright (C) 2007-2008 Even Rouault
|
|
|
+
|
|
|
+ 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
|
|
|
+
|
|
|
+ ---------------------------------------------------------------------------------
|
|
|
+
|
|
|
+ Condition of use and distribution are the same than zlib :
|
|
|
+
|
|
|
+ This software is provided 'as-is', without any express or implied
|
|
|
+ warranty. In no event will the authors be held liable for any damages
|
|
|
+ arising from the use of this software.
|
|
|
+
|
|
|
+ Permission is granted to anyone to use this software for any purpose,
|
|
|
+ including commercial applications, and to alter it and redistribute it
|
|
|
+ freely, subject to the following restrictions:
|
|
|
+
|
|
|
+ 1. The origin of this software must not be misrepresented; you must not
|
|
|
+ claim that you wrote the original software. If you use this software
|
|
|
+ in a product, an acknowledgment in the product documentation would be
|
|
|
+ appreciated but is not required.
|
|
|
+ 2. Altered source versions must be plainly marked as such, and must not be
|
|
|
+ misrepresented as being the original software.
|
|
|
+ 3. This notice may not be removed or altered from any source distribution.
|
|
|
+
|
|
|
+ ---------------------------------------------------------------------------------
|
|
|
+
|
|
|
+ Changes
|
|
|
+
|
|
|
+ See header of unzip64.c
|
|
|
+
|
|
|
*/
|
|
|
|
|
|
-#ifndef _UNZ_H
|
|
|
-#define _UNZ_H
|
|
|
+#ifndef _unz64_H
|
|
|
+#define _unz64_H
|
|
|
|
|
|
#ifdef __cplusplus
|
|
|
extern "C" {
|
|
|
@@ -25,7 +51,7 @@ extern "C" {
|
|
|
#include "zlib.h"
|
|
|
#endif
|
|
|
|
|
|
-#ifndef _ZLIBIOAPI_H
|
|
|
+#ifndef _ZLIBIOAPI_H
|
|
|
#include "ioapi.h"
|
|
|
#endif
|
|
|
|
|
|
@@ -38,12 +64,13 @@ extern "C" {
|
|
|
#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; } unz_file__;
|
|
|
-typedef unz_file__ *unzFile;
|
|
|
+typedef struct TagunzFile__ { int unused; } unzFile__;
|
|
|
+typedef unzFile__ *unzFile;
|
|
|
#else
|
|
|
typedef voidp unzFile;
|
|
|
#endif
|
|
|
|
|
|
+
|
|
|
#define UNZ_OK (0)
|
|
|
#define UNZ_END_OF_LIST_OF_FILE (-100)
|
|
|
#define UNZ_ERRNO (Z_ERRNO)
|
|
|
@@ -52,255 +79,359 @@ typedef voidp unzFile;
|
|
|
#define UNZ_BADZIPFILE (-103)
|
|
|
#define UNZ_INTERNALERROR (-104)
|
|
|
#define UNZ_CRCERROR (-105)
|
|
|
-#define UNZ_BADPASSWORD (-106)
|
|
|
+
|
|
|
+/* tm_unz contain date/time info */
|
|
|
+typedef struct tm_unz_s
|
|
|
+{
|
|
|
+ int tm_sec; /* seconds after the minute - [0,59] */
|
|
|
+ int tm_min; /* minutes after the hour - [0,59] */
|
|
|
+ int tm_hour; /* hours since midnight - [0,23] */
|
|
|
+ int tm_mday; /* day of the month - [1,31] */
|
|
|
+ int tm_mon; /* months since January - [0,11] */
|
|
|
+ int 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_info64_s
|
|
|
{
|
|
|
- uint64_t number_entry; /* total number of entries in the central dir on this disk */
|
|
|
- uint32_t number_disk_with_CD; /* number the the disk with central dir, used for spanning ZIP*/
|
|
|
- uint16_t size_comment; /* size of the global comment of the zipfile */
|
|
|
+ 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
|
|
|
{
|
|
|
- uint32_t number_entry; /* total number of entries in the central dir on this disk */
|
|
|
- uint32_t number_disk_with_CD; /* number the the disk with central dir, used for spanning ZIP*/
|
|
|
- uint16_t size_comment; /* size of the global comment of the zipfile */
|
|
|
+ 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_info64_s
|
|
|
{
|
|
|
- uint16_t version; /* version made by 2 bytes */
|
|
|
- uint16_t version_needed; /* version needed to extract 2 bytes */
|
|
|
- uint16_t flag; /* general purpose bit flag 2 bytes */
|
|
|
- uint16_t compression_method; /* compression method 2 bytes */
|
|
|
- uint32_t dos_date; /* last mod file date in Dos fmt 4 bytes */
|
|
|
- uint32_t crc; /* crc-32 4 bytes */
|
|
|
- uint64_t compressed_size; /* compressed size 8 bytes */
|
|
|
- uint64_t uncompressed_size; /* uncompressed size 8 bytes */
|
|
|
- uint16_t size_filename; /* filename length 2 bytes */
|
|
|
- uint16_t size_file_extra; /* extra field length 2 bytes */
|
|
|
- uint16_t size_file_comment; /* file comment length 2 bytes */
|
|
|
-
|
|
|
- uint32_t disk_num_start; /* disk number start 4 bytes */
|
|
|
- uint16_t internal_fa; /* internal file attributes 2 bytes */
|
|
|
- uint32_t external_fa; /* external file attributes 4 bytes */
|
|
|
-
|
|
|
- uint64_t disk_offset;
|
|
|
-
|
|
|
- uint16_t size_file_extra_internal;
|
|
|
+ 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 */
|
|
|
+
|
|
|
+ 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
|
|
|
{
|
|
|
- uint16_t version; /* version made by 2 bytes */
|
|
|
- uint16_t version_needed; /* version needed to extract 2 bytes */
|
|
|
- uint16_t flag; /* general purpose bit flag 2 bytes */
|
|
|
- uint16_t compression_method; /* compression method 2 bytes */
|
|
|
- uint32_t dos_date; /* last mod file date in Dos fmt 4 bytes */
|
|
|
- uint32_t crc; /* crc-32 4 bytes */
|
|
|
- uint32_t compressed_size; /* compressed size 4 bytes */
|
|
|
- uint32_t uncompressed_size; /* uncompressed size 4 bytes */
|
|
|
- uint16_t size_filename; /* filename length 2 bytes */
|
|
|
- uint16_t size_file_extra; /* extra field length 2 bytes */
|
|
|
- uint16_t size_file_comment; /* file comment length 2 bytes */
|
|
|
-
|
|
|
- uint16_t disk_num_start; /* disk number start 2 bytes */
|
|
|
- uint16_t internal_fa; /* internal file attributes 2 bytes */
|
|
|
- uint32_t external_fa; /* external file attributes 4 bytes */
|
|
|
-
|
|
|
- uint64_t disk_offset;
|
|
|
+ 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 */
|
|
|
+
|
|
|
+ tm_unz tmu_date;
|
|
|
} unz_file_info;
|
|
|
|
|
|
-/***************************************************************************/
|
|
|
-/* Opening and close a zip file */
|
|
|
-
|
|
|
-extern unzFile ZEXPORT unzOpen(const char *path);
|
|
|
-extern unzFile ZEXPORT unzOpen64(const void *path);
|
|
|
-/* Open a Zip file.
|
|
|
-
|
|
|
- path should contain the full path (by example, on a Windows XP computer
|
|
|
- "c:\\zlib\\zlib113.zip" or on an Unix computer "zlib/zlib113.zip".
|
|
|
- return NULL if zipfile cannot be opened or doesn't exist
|
|
|
- return unzFile handle if no error
|
|
|
-
|
|
|
- NOTE: The "64" function take a const void *pointer, because the path is just the value passed to the
|
|
|
- open64_file_func callback. Under Windows, if UNICODE is defined, using fill_fopen64_filefunc, the path
|
|
|
- is a pointer to a wide unicode string (LPCTSTR is LPCWSTR), so const char *does not describe the reality */
|
|
|
+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 unzOpen2(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 operations */
|
|
|
-extern unzFile ZEXPORT unzOpen2_64(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 64-bit operations */
|
|
|
|
|
|
-extern int ZEXPORT unzClose(unzFile file);
|
|
|
-/* Close a ZipFile opened with unzOpen. If there is files inside the .Zip opened with unzOpenCurrentFile,
|
|
|
- these files MUST be closed with unzipCloseCurrentFile before call unzipClose.
|
|
|
+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
|
|
|
+ "zlib/zlib113.zip".
|
|
|
+ If the zipfile cannot be opened (file don't exist or in not valid), the
|
|
|
+ return value is NULL.
|
|
|
+ Else, the return value is a unzFile Handle, usable with other function
|
|
|
+ of this unzip package.
|
|
|
+ the "64" function take a const void* pointer, because the path is just the
|
|
|
+ value passed to the open64_file_func callback.
|
|
|
+ Under Windows, if UNICODE is defined, using fill_fopen64_filefunc, the path
|
|
|
+ is a pointer to a wide unicode string (LPCTSTR is LPCWSTR), so const char*
|
|
|
+ does not describe the reality
|
|
|
+*/
|
|
|
|
|
|
- return UNZ_OK if there is no error */
|
|
|
|
|
|
-extern int ZEXPORT unzGetGlobalInfo(unzFile file, unz_global_info *pglobal_info);
|
|
|
-extern int ZEXPORT unzGetGlobalInfo64(unzFile file, unz_global_info64 *pglobal_info);
|
|
|
-/* Write info about the ZipFile in the *pglobal_info structure.
|
|
|
+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)
|
|
|
+*/
|
|
|
|
|
|
- return UNZ_OK if no error */
|
|
|
+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 unzGetGlobalComment(unzFile file, char *comment, uint16_t comment_size);
|
|
|
-/* Get the global comment string of the ZipFile, in the comment buffer.
|
|
|
+extern int ZEXPORT unzClose OF((unzFile file));
|
|
|
+/*
|
|
|
+ Close a ZipFile opened with unzOpen.
|
|
|
+ If there is files inside the .Zip opened with unzOpenCurrentFile (see later),
|
|
|
+ these files MUST be closed with unzCloseCurrentFile before call unzClose.
|
|
|
+ return UNZ_OK if there is no problem. */
|
|
|
+
|
|
|
+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
|
|
|
+ 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
|
|
|
+*/
|
|
|
|
|
|
- uSizeBuf is the size of the szComment buffer.
|
|
|
- return the number of byte copied or an error code <0 */
|
|
|
|
|
|
/***************************************************************************/
|
|
|
-/* 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) */
|
|
|
+/* Unzip package allow you browse the directory of the zipfile */
|
|
|
|
|
|
-extern int ZEXPORT unzOpenCurrentFile(unzFile file);
|
|
|
-/* Open for reading data the current file in the zipfile.
|
|
|
-
|
|
|
- return UNZ_OK if no error */
|
|
|
+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
|
|
|
+*/
|
|
|
|
|
|
-extern int ZEXPORT unzOpenCurrentFilePassword(unzFile file, const char *password);
|
|
|
-/* Open for reading data the current file in the zipfile.
|
|
|
- password is a crypting password
|
|
|
+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.
|
|
|
+*/
|
|
|
|
|
|
- return UNZ_OK if no error */
|
|
|
+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
|
|
|
|
|
|
-extern int ZEXPORT unzOpenCurrentFile2(unzFile file, int *method, int *level, int raw);
|
|
|
-/* Same as 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
|
|
|
+ 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
|
|
|
+*/
|
|
|
|
|
|
- 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(unzFile file, int *method, int *level, int raw, const char *password);
|
|
|
-/* Same as unzOpenCurrentFile, but takes extra parameter password for encrypted files */
|
|
|
+/* ****************************************** */
|
|
|
+/* 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 unzReadCurrentFile(unzFile file, voidp buf, uint32_t len);
|
|
|
-/* Read bytes from the current file (opened by unzOpenCurrentFile)
|
|
|
- buf contain buffer where data must be copied
|
|
|
- len the size of buf.
|
|
|
+extern int ZEXPORT unzGetFilePos(
|
|
|
+ unzFile file,
|
|
|
+ unz_file_pos* file_pos);
|
|
|
|
|
|
- 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 int ZEXPORT unzGoToFilePos(
|
|
|
+ unzFile file,
|
|
|
+ unz_file_pos* file_pos);
|
|
|
|
|
|
-extern int ZEXPORT unzGetCurrentFileInfo(unzFile file, unz_file_info *pfile_info, char *filename,
|
|
|
- uint16_t filename_size, void *extrafield, uint16_t extrafield_size, char *comment, uint16_t comment_size);
|
|
|
-extern int ZEXPORT unzGetCurrentFileInfo64(unzFile file, unz_file_info64 *pfile_info, char *filename,
|
|
|
- uint16_t filename_size, void *extrafield, uint16_t extrafield_size, char *comment, uint16_t comment_size);
|
|
|
-/* Get Info about the current file
|
|
|
+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;
|
|
|
|
|
|
- pfile_info if != NULL, the *pfile_info structure will contain somes info about the current file
|
|
|
- filename if != NULL, the file name string will be copied in filename
|
|
|
- filename_size is the size of the filename buffer
|
|
|
- extrafield if != NULL, the extra field information from the central header will be copied in to
|
|
|
- extrafield_size is the size of the extraField buffer
|
|
|
- comment if != NULL, the comment string of the file will be copied in to
|
|
|
- comment_size is the size of the comment buffer */
|
|
|
+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,
|
|
|
+ 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)
|
|
|
+*/
|
|
|
|
|
|
-extern int ZEXPORT unzGetLocalExtrafield(unzFile file, voidp buf, uint32_t len);
|
|
|
-/* Read extra field from the current file (opened by unzOpenCurrentFile)
|
|
|
- This is the local-header version of the extra field (sometimes, there is
|
|
|
- more info in the local-header version than in the central-header)
|
|
|
|
|
|
- if buf == NULL, it return the size of the local extra field
|
|
|
- if buf != NULL, len is the size of the buffer, the extra header is copied in buf.
|
|
|
+/** Addition for GDAL : START */
|
|
|
|
|
|
- return number of bytes copied in buf, or (if <0) the error code */
|
|
|
+extern ZPOS64_T ZEXPORT unzGetCurrentFileZStreamPos64 OF((unzFile file));
|
|
|
|
|
|
-extern int ZEXPORT unzCloseCurrentFile(unzFile file);
|
|
|
-/* Close the file in zip opened with unzOpenCurrentFile
|
|
|
+/** Addition for GDAL : END */
|
|
|
|
|
|
- return UNZ_CRCERROR if all the file was read but the CRC is not good */
|
|
|
|
|
|
/***************************************************************************/
|
|
|
-/* Browse the directory of the zipfile */
|
|
|
-
|
|
|
-typedef int (*unzFileNameComparer)(unzFile file, const char *filename1, const char *filename2);
|
|
|
-typedef int (*unzIteratorFunction)(unzFile file);
|
|
|
-typedef int (*unzIteratorFunction2)(unzFile file, unz_file_info64 *pfile_info, char *filename,
|
|
|
- uint16_t filename_size, void *extrafield, uint16_t extrafield_size, char *comment, uint16_t comment_size);
|
|
|
-
|
|
|
-extern int ZEXPORT unzGoToFirstFile(unzFile file);
|
|
|
-/* Set the current file of the zipfile to the first file.
|
|
|
-
|
|
|
- return UNZ_OK if no error */
|
|
|
+/* 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.
|
|
|
+*/
|
|
|
|
|
|
-extern int ZEXPORT unzGoToFirstFile2(unzFile file, unz_file_info64 *pfile_info, char *filename,
|
|
|
- uint16_t filename_size, void *extrafield, uint16_t extrafield_size, char *comment, uint16_t comment_size);
|
|
|
-/* Set the current file of the zipfile to the first file and retrieves the current info on success.
|
|
|
- Not as seek intensive as unzGoToFirstFile + unzGetCurrentFileInfo.
|
|
|
+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.
|
|
|
+*/
|
|
|
|
|
|
- return UNZ_OK if no error */
|
|
|
+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 unzGoToNextFile(unzFile file);
|
|
|
-/* Set the current file of the zipfile to the next file.
|
|
|
+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
|
|
|
+*/
|
|
|
|
|
|
- return UNZ_OK if no error
|
|
|
- return UNZ_END_OF_LIST_OF_FILE if the actual file was the latest */
|
|
|
|
|
|
-extern int ZEXPORT unzGoToNextFile2(unzFile file, unz_file_info64 *pfile_info, char *filename,
|
|
|
- uint16_t filename_size, void *extrafield, uint16_t extrafield_size, char *comment, uint16_t comment_size);
|
|
|
-/* Set the current file of the zipfile to the next file and retrieves the current
|
|
|
- info on success. Does less seeking around than unzGotoNextFile + unzGetCurrentFileInfo.
|
|
|
+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
|
|
|
+*/
|
|
|
|
|
|
- return UNZ_OK if no error
|
|
|
- return UNZ_END_OF_LIST_OF_FILE if the actual file was the latest */
|
|
|
+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.
|
|
|
+
|
|
|
+ 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 int ZEXPORT unzLocateFile(unzFile file, const char *filename, unzFileNameComparer filename_compare_func);
|
|
|
-/* Try locate the file szFileName in the zipfile. For custom filename comparison pass in comparison function.
|
|
|
+extern z_off_t ZEXPORT unztell OF((unzFile file));
|
|
|
|
|
|
- return UNZ_OK if the file is found (it becomes the current file)
|
|
|
- return UNZ_END_OF_LIST_OF_FILE if the file is not found */
|
|
|
+extern ZPOS64_T ZEXPORT unztell64 OF((unzFile file));
|
|
|
+/*
|
|
|
+ Give the current position in uncompressed data
|
|
|
+*/
|
|
|
|
|
|
-/***************************************************************************/
|
|
|
-/* Raw access to zip file */
|
|
|
+extern int ZEXPORT unzeof OF((unzFile file));
|
|
|
+/*
|
|
|
+ return 1 if the end of file was reached, 0 elsewhere
|
|
|
+*/
|
|
|
|
|
|
-typedef struct unz_file_pos_s
|
|
|
-{
|
|
|
- uint32_t pos_in_zip_directory; /* offset in zip file directory */
|
|
|
- uint32_t num_of_file; /* # of file */
|
|
|
-} unz_file_pos;
|
|
|
+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 unzGetFilePos(unzFile file, unz_file_pos *file_pos);
|
|
|
-extern int ZEXPORT unzGoToFilePos(unzFile file, unz_file_pos *file_pos);
|
|
|
+ if buf==NULL, it return the size of the local extra field
|
|
|
|
|
|
-typedef struct unz64_file_pos_s
|
|
|
-{
|
|
|
- uint64_t pos_in_zip_directory; /* offset in zip file directory */
|
|
|
- uint64_t num_of_file; /* # of file */
|
|
|
-} unz64_file_pos;
|
|
|
+ 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 unzGetFilePos64(unzFile file, unz64_file_pos *file_pos);
|
|
|
-extern int ZEXPORT unzGoToFilePos64(unzFile file, const unz64_file_pos *file_pos);
|
|
|
+/***************************************************************************/
|
|
|
|
|
|
-extern int32_t ZEXPORT unzGetOffset(unzFile file);
|
|
|
-extern int64_t ZEXPORT unzGetOffset64(unzFile file);
|
|
|
/* Get the current file offset */
|
|
|
+extern ZPOS64_T ZEXPORT unzGetOffset64 (unzFile file);
|
|
|
+extern uLong ZEXPORT unzGetOffset (unzFile file);
|
|
|
|
|
|
-extern int ZEXPORT unzSetOffset(unzFile file, uint32_t pos);
|
|
|
-extern int ZEXPORT unzSetOffset64(unzFile file, uint64_t pos);
|
|
|
/* Set the current file offset */
|
|
|
+extern int ZEXPORT unzSetOffset64 (unzFile file, ZPOS64_T pos);
|
|
|
+extern int ZEXPORT unzSetOffset (unzFile file, uLong pos);
|
|
|
|
|
|
-extern int32_t ZEXPORT unzTell(unzFile file);
|
|
|
-extern int64_t ZEXPORT unzTell64(unzFile file);
|
|
|
-/* return current position in uncompressed data */
|
|
|
|
|
|
-extern int ZEXPORT unzSeek(unzFile file, uint32_t offset, int origin);
|
|
|
-extern int ZEXPORT unzSeek64(unzFile file, uint64_t offset, int origin);
|
|
|
-/* Seek within the uncompressed data if compression method is storage */
|
|
|
-
|
|
|
-extern int ZEXPORT unzEndOfFile(unzFile file);
|
|
|
-/* return 1 if the end of file was reached, 0 elsewhere */
|
|
|
-
|
|
|
-/***************************************************************************/
|
|
|
|
|
|
#ifdef __cplusplus
|
|
|
}
|
|
|
#endif
|
|
|
|
|
|
-#endif /* _UNZ_H */
|
|
|
+#endif /* _unz64_H */
|
Alex