diff options
Diffstat (limited to 'contrib/minizip/unzip.c')
-rw-r--r-- | contrib/minizip/unzip.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/contrib/minizip/unzip.c b/contrib/minizip/unzip.c index 8d010c5..c1c2986 100644 --- a/contrib/minizip/unzip.c +++ b/contrib/minizip/unzip.c | |||
@@ -49,12 +49,12 @@ | |||
49 | Copyright (C) 2007-2008 Even Rouault | 49 | Copyright (C) 2007-2008 Even Rouault |
50 | 50 | ||
51 | 51 | ||
52 | 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). | 52 | 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). |
53 | Oct-2009 - Mathias Svensson - Fixed problem if uncompressed size was > 4G and compressed size was <4G | 53 | Oct-2009 - Mathias Svensson - Fixed problem if uncompressed size was > 4G and compressed size was <4G |
54 | should only read the compressed/uncompressed size from the Zip64 format if | 54 | should only read the compressed/uncompressed size from the Zip64 format if |
55 | the size from normal header was 0xFFFFFFFF | 55 | the size from normal header was 0xFFFFFFFF |
56 | Oct-2009 - Mathias Svensson - Applied some bug fixes from paches recived from Gilles Vollant | 56 | Oct-2009 - Mathias Svensson - Applied some bug fixes from patches received from Gilles Vollant |
57 | Oct-2009 - Mathias Svensson - Applied support to unzip files with compression mathod BZIP2 (bzip2 lib is required) | 57 | Oct-2009 - Mathias Svensson - Applied support to unzip files with compression method BZIP2 (bzip2 lib is required) |
58 | Patch created by Daniel Borca | 58 | Patch created by Daniel Borca |
59 | 59 | ||
60 | Jan-2010 - back to unzip and minizip 1.0 name scheme, with compatibility layer | 60 | Jan-2010 - back to unzip and minizip 1.0 name scheme, with compatibility layer |
@@ -153,7 +153,7 @@ typedef struct | |||
153 | ZPOS64_T rest_read_compressed; /* number of byte to be decompressed */ | 153 | ZPOS64_T rest_read_compressed; /* number of byte to be decompressed */ |
154 | ZPOS64_T rest_read_uncompressed;/*number of byte to be obtained after decomp*/ | 154 | ZPOS64_T rest_read_uncompressed;/*number of byte to be obtained after decomp*/ |
155 | zlib_filefunc64_32_def z_filefunc; | 155 | zlib_filefunc64_32_def z_filefunc; |
156 | voidpf filestream; /* io structore of the zipfile */ | 156 | voidpf filestream; /* io structure of the zipfile */ |
157 | uLong compression_method; /* compression method (0==store) */ | 157 | uLong compression_method; /* compression method (0==store) */ |
158 | ZPOS64_T byte_before_the_zipfile;/* byte before the zipfile, (>0 for sfx)*/ | 158 | ZPOS64_T byte_before_the_zipfile;/* byte before the zipfile, (>0 for sfx)*/ |
159 | int raw; | 159 | int raw; |
@@ -166,7 +166,7 @@ typedef struct | |||
166 | { | 166 | { |
167 | zlib_filefunc64_32_def z_filefunc; | 167 | zlib_filefunc64_32_def z_filefunc; |
168 | int is64bitOpenFunction; | 168 | int is64bitOpenFunction; |
169 | voidpf filestream; /* io structore of the zipfile */ | 169 | voidpf filestream; /* io structure of the zipfile */ |
170 | unz_global_info64 gi; /* public global information */ | 170 | unz_global_info64 gi; /* public global information */ |
171 | ZPOS64_T byte_before_the_zipfile;/* byte before the zipfile, (>0 for sfx)*/ | 171 | ZPOS64_T byte_before_the_zipfile;/* byte before the zipfile, (>0 for sfx)*/ |
172 | ZPOS64_T num_file; /* number of the current file in the zipfile*/ | 172 | ZPOS64_T num_file; /* number of the current file in the zipfile*/ |
@@ -355,11 +355,11 @@ local int strcmpcasenosensitive_internal(const char* fileName1, const char* file | |||
355 | #endif | 355 | #endif |
356 | 356 | ||
357 | /* | 357 | /* |
358 | Compare two filename (fileName1,fileName2). | 358 | Compare two filenames (fileName1,fileName2). |
359 | If iCaseSenisivity = 1, comparision is case sensitivity (like strcmp) | 359 | If iCaseSensitivity = 1, comparison is case sensitive (like strcmp) |
360 | If iCaseSenisivity = 2, comparision is not case sensitivity (like strcmpi | 360 | If iCaseSensitivity = 2, comparison is not case sensitive (like strcmpi |
361 | or strcasecmp) | 361 | or strcasecmp) |
362 | If iCaseSenisivity = 0, case sensitivity is defaut of your operating system | 362 | If iCaseSensitivity = 0, case sensitivity is default of your operating system |
363 | (like 1 on Unix, 2 on Windows) | 363 | (like 1 on Unix, 2 on Windows) |
364 | 364 | ||
365 | */ | 365 | */ |
@@ -561,9 +561,9 @@ local unzFile unzOpenInternal(const void *path, | |||
561 | uLong uL; | 561 | uLong uL; |
562 | 562 | ||
563 | uLong number_disk; /* number of the current dist, used for | 563 | uLong number_disk; /* number of the current dist, used for |
564 | spaning ZIP, unsupported, always 0*/ | 564 | spanning ZIP, unsupported, always 0*/ |
565 | uLong number_disk_with_CD; /* number the the disk with central dir, used | 565 | uLong number_disk_with_CD; /* number the the disk with central dir, used |
566 | for spaning ZIP, unsupported, always 0*/ | 566 | for spanning ZIP, unsupported, always 0*/ |
567 | ZPOS64_T number_entry_CD; /* total number of entries in | 567 | ZPOS64_T number_entry_CD; /* total number of entries in |
568 | the central dir | 568 | the central dir |
569 | (same than number_entry on nospan) */ | 569 | (same than number_entry on nospan) */ |
@@ -810,7 +810,7 @@ extern int ZEXPORT unzGetGlobalInfo(unzFile file, unz_global_info* pglobal_info3 | |||
810 | return UNZ_OK; | 810 | return UNZ_OK; |
811 | } | 811 | } |
812 | /* | 812 | /* |
813 | Translate date/time from Dos format to tm_unz (readable more easilty) | 813 | Translate date/time from Dos format to tm_unz (readable more easily) |
814 | */ | 814 | */ |
815 | local void unz64local_DosDateToTmuDate(ZPOS64_T ulDosDate, tm_unz* ptm) { | 815 | local void unz64local_DosDateToTmuDate(ZPOS64_T ulDosDate, tm_unz* ptm) { |
816 | ZPOS64_T uDate; | 816 | ZPOS64_T uDate; |
@@ -1607,7 +1607,7 @@ extern ZPOS64_T ZEXPORT unzGetCurrentFileZStreamPos64(unzFile file) { | |||
1607 | buf contain buffer where data must be copied | 1607 | buf contain buffer where data must be copied |
1608 | len the size of buf. | 1608 | len the size of buf. |
1609 | 1609 | ||
1610 | return the number of byte copied if somes bytes are copied | 1610 | return the number of byte copied if some bytes are copied |
1611 | return 0 if the end of file was reached | 1611 | return 0 if the end of file was reached |
1612 | return <0 with error code if there is an error | 1612 | return <0 with error code if there is an error |
1613 | (UNZ_ERRNO for IO error, or zLib error for uncompress error) | 1613 | (UNZ_ERRNO for IO error, or zLib error for uncompress error) |