diff options
Diffstat (limited to 'contrib/minizip/zip.c')
-rw-r--r-- | contrib/minizip/zip.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/contrib/minizip/zip.c b/contrib/minizip/zip.c index 7b559b7..ac4e243 100644 --- a/contrib/minizip/zip.c +++ b/contrib/minizip/zip.c | |||
@@ -14,7 +14,7 @@ | |||
14 | Oct-2009 - Mathias Svensson - Added Zip64 Support when creating new file archives | 14 | Oct-2009 - Mathias Svensson - Added Zip64 Support when creating new file archives |
15 | Oct-2009 - Mathias Svensson - Did some code cleanup and refactoring to get better overview of some functions. | 15 | Oct-2009 - Mathias Svensson - Did some code cleanup and refactoring to get better overview of some functions. |
16 | Oct-2009 - Mathias Svensson - Added zipRemoveExtraInfoBlock to strip extra field data from its ZIP64 data | 16 | Oct-2009 - Mathias Svensson - Added zipRemoveExtraInfoBlock to strip extra field data from its ZIP64 data |
17 | It is used when recreting zip archive with RAW when deleting items from a zip. | 17 | It is used when recreating zip archive with RAW when deleting items from a zip. |
18 | ZIP64 data is automatically added to items that needs it, and existing ZIP64 data need to be removed. | 18 | ZIP64 data is automatically added to items that needs it, and existing ZIP64 data need to be removed. |
19 | Oct-2009 - Mathias Svensson - Added support for BZIP2 as compression mode (bzip2 lib is required) | 19 | Oct-2009 - Mathias Svensson - Added support for BZIP2 as compression mode (bzip2 lib is required) |
20 | Jan-2010 - back to unzip and minizip 1.0 name scheme, with compatibility layer | 20 | Jan-2010 - back to unzip and minizip 1.0 name scheme, with compatibility layer |
@@ -48,7 +48,7 @@ | |||
48 | /* compile with -Dlocal if your debugger can't find static symbols */ | 48 | /* compile with -Dlocal if your debugger can't find static symbols */ |
49 | 49 | ||
50 | #ifndef VERSIONMADEBY | 50 | #ifndef VERSIONMADEBY |
51 | # define VERSIONMADEBY (0x0) /* platform depedent */ | 51 | # define VERSIONMADEBY (0x0) /* platform dependent */ |
52 | #endif | 52 | #endif |
53 | 53 | ||
54 | #ifndef Z_BUFSIZE | 54 | #ifndef Z_BUFSIZE |
@@ -139,20 +139,20 @@ typedef struct | |||
139 | uInt pos_in_buffered_data; /* last written byte in buffered_data */ | 139 | uInt pos_in_buffered_data; /* last written byte in buffered_data */ |
140 | 140 | ||
141 | ZPOS64_T pos_local_header; /* offset of the local header of the file | 141 | ZPOS64_T pos_local_header; /* offset of the local header of the file |
142 | currenty writing */ | 142 | currently writing */ |
143 | char* central_header; /* central header data for the current file */ | 143 | char* central_header; /* central header data for the current file */ |
144 | uLong size_centralExtra; | 144 | uLong size_centralExtra; |
145 | uLong size_centralheader; /* size of the central header for cur file */ | 145 | uLong size_centralheader; /* size of the central header for cur file */ |
146 | uLong size_centralExtraFree; /* Extra bytes allocated to the centralheader but that are not used */ | 146 | uLong size_centralExtraFree; /* Extra bytes allocated to the centralheader but that are not used */ |
147 | uLong flag; /* flag of the file currently writing */ | 147 | uLong flag; /* flag of the file currently writing */ |
148 | 148 | ||
149 | int method; /* compression method of file currenty wr.*/ | 149 | int method; /* compression method of file currently wr.*/ |
150 | int raw; /* 1 for directly writing raw data */ | 150 | int raw; /* 1 for directly writing raw data */ |
151 | Byte buffered_data[Z_BUFSIZE];/* buffer contain compressed data to be writ*/ | 151 | Byte buffered_data[Z_BUFSIZE];/* buffer contain compressed data to be writ*/ |
152 | uLong dosDate; | 152 | uLong dosDate; |
153 | uLong crc32; | 153 | uLong crc32; |
154 | int encrypt; | 154 | int encrypt; |
155 | int zip64; /* Add ZIP64 extened information in the extra field */ | 155 | int zip64; /* Add ZIP64 extended information in the extra field */ |
156 | ZPOS64_T pos_zip64extrainfo; | 156 | ZPOS64_T pos_zip64extrainfo; |
157 | ZPOS64_T totalCompressedData; | 157 | ZPOS64_T totalCompressedData; |
158 | ZPOS64_T totalUncompressedData; | 158 | ZPOS64_T totalUncompressedData; |
@@ -166,10 +166,10 @@ typedef struct | |||
166 | typedef struct | 166 | typedef struct |
167 | { | 167 | { |
168 | zlib_filefunc64_32_def z_filefunc; | 168 | zlib_filefunc64_32_def z_filefunc; |
169 | voidpf filestream; /* io structore of the zipfile */ | 169 | voidpf filestream; /* io structure of the zipfile */ |
170 | linkedlist_data central_dir;/* datablock with central dir in construction*/ | 170 | linkedlist_data central_dir;/* datablock with central dir in construction*/ |
171 | int in_opened_file_inzip; /* 1 if a file in the zip is currently writ.*/ | 171 | int in_opened_file_inzip; /* 1 if a file in the zip is currently writ.*/ |
172 | curfile64_info ci; /* info on the file curretly writing */ | 172 | curfile64_info ci; /* info on the file currently writing */ |
173 | 173 | ||
174 | ZPOS64_T begin_pos; /* position of the beginning of the zipfile */ | 174 | ZPOS64_T begin_pos; /* position of the beginning of the zipfile */ |
175 | ZPOS64_T add_position_when_writing_offset; | 175 | ZPOS64_T add_position_when_writing_offset; |
@@ -620,9 +620,9 @@ local int LoadCentralDirectoryRecord(zip64_internal* pziinit) { | |||
620 | uLong uL; | 620 | uLong uL; |
621 | 621 | ||
622 | uLong number_disk; /* number of the current dist, used for | 622 | uLong number_disk; /* number of the current dist, used for |
623 | spaning ZIP, unsupported, always 0*/ | 623 | spanning ZIP, unsupported, always 0*/ |
624 | uLong number_disk_with_CD; /* number the the disk with central dir, used | 624 | uLong number_disk_with_CD; /* number the the disk with central dir, used |
625 | for spaning ZIP, unsupported, always 0*/ | 625 | for spanning ZIP, unsupported, always 0*/ |
626 | ZPOS64_T number_entry; | 626 | ZPOS64_T number_entry; |
627 | ZPOS64_T number_entry_CD; /* total number of entries in | 627 | ZPOS64_T number_entry_CD; /* total number of entries in |
628 | the central dir | 628 | the central dir |