diff options
author | Mark Adler <madler@alumni.caltech.edu> | 2011-09-09 23:24:02 -0700 |
---|---|---|
committer | Mark Adler <madler@alumni.caltech.edu> | 2011-09-09 23:24:02 -0700 |
commit | 79fbcdc939b5d515218187a0d5f2526fb632075a (patch) | |
tree | dc82b3a452568093ab8a9f365126ba56a419eea1 /contrib/minizip/mztools.c | |
parent | 7a6955760ba950eb82f57929f8f6c9847c65f0af (diff) | |
download | zlib-1.2.2.tar.gz zlib-1.2.2.tar.bz2 zlib-1.2.2.zip |
zlib 1.2.2v1.2.2
Diffstat (limited to 'contrib/minizip/mztools.c')
-rw-r--r-- | contrib/minizip/mztools.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/contrib/minizip/mztools.c b/contrib/minizip/mztools.c index 363ee13..c1266bc 100644 --- a/contrib/minizip/mztools.c +++ b/contrib/minizip/mztools.c | |||
@@ -62,7 +62,7 @@ uLong* bytesRecovered; | |||
62 | unsigned int fnsize = READ_16(header + 26); /* file name length */ | 62 | unsigned int fnsize = READ_16(header + 26); /* file name length */ |
63 | unsigned int extsize = READ_16(header + 28); /* extra field length */ | 63 | unsigned int extsize = READ_16(header + 28); /* extra field length */ |
64 | filename[0] = extra[0] = '\0'; | 64 | filename[0] = extra[0] = '\0'; |
65 | 65 | ||
66 | /* Header */ | 66 | /* Header */ |
67 | if (fwrite(header, 1, 30, fpOut) == 30) { | 67 | if (fwrite(header, 1, 30, fpOut) == 30) { |
68 | offset += 30; | 68 | offset += 30; |
@@ -70,7 +70,7 @@ uLong* bytesRecovered; | |||
70 | err = Z_ERRNO; | 70 | err = Z_ERRNO; |
71 | break; | 71 | break; |
72 | } | 72 | } |
73 | 73 | ||
74 | /* Filename */ | 74 | /* Filename */ |
75 | if (fnsize > 0) { | 75 | if (fnsize > 0) { |
76 | if (fread(filename, 1, fnsize, fpZip) == fnsize) { | 76 | if (fread(filename, 1, fnsize, fpZip) == fnsize) { |
@@ -103,7 +103,7 @@ uLong* bytesRecovered; | |||
103 | break; | 103 | break; |
104 | } | 104 | } |
105 | } | 105 | } |
106 | 106 | ||
107 | /* Data */ | 107 | /* Data */ |
108 | { | 108 | { |
109 | int dataSize = cpsize; | 109 | int dataSize = cpsize; |
@@ -133,7 +133,7 @@ uLong* bytesRecovered; | |||
133 | } | 133 | } |
134 | } | 134 | } |
135 | } | 135 | } |
136 | 136 | ||
137 | /* Central directory entry */ | 137 | /* Central directory entry */ |
138 | { | 138 | { |
139 | char header[46]; | 139 | char header[46]; |
@@ -159,7 +159,7 @@ uLong* bytesRecovered; | |||
159 | /* Header */ | 159 | /* Header */ |
160 | if (fwrite(header, 1, 46, fpOutCD) == 46) { | 160 | if (fwrite(header, 1, 46, fpOutCD) == 46) { |
161 | offsetCD += 46; | 161 | offsetCD += 46; |
162 | 162 | ||
163 | /* Filename */ | 163 | /* Filename */ |
164 | if (fnsize > 0) { | 164 | if (fnsize > 0) { |
165 | if (fwrite(filename, 1, fnsize, fpOutCD) == fnsize) { | 165 | if (fwrite(filename, 1, fnsize, fpOutCD) == fnsize) { |
@@ -172,7 +172,7 @@ uLong* bytesRecovered; | |||
172 | err = Z_STREAM_ERROR; | 172 | err = Z_STREAM_ERROR; |
173 | break; | 173 | break; |
174 | } | 174 | } |
175 | 175 | ||
176 | /* Extra field */ | 176 | /* Extra field */ |
177 | if (extsize > 0) { | 177 | if (extsize > 0) { |
178 | if (fwrite(extra, 1, extsize, fpOutCD) == extsize) { | 178 | if (fwrite(extra, 1, extsize, fpOutCD) == extsize) { |
@@ -182,7 +182,7 @@ uLong* bytesRecovered; | |||
182 | break; | 182 | break; |
183 | } | 183 | } |
184 | } | 184 | } |
185 | 185 | ||
186 | /* Comment field */ | 186 | /* Comment field */ |
187 | if (comsize > 0) { | 187 | if (comsize > 0) { |
188 | if ((int)fwrite(comment, 1, comsize, fpOutCD) == comsize) { | 188 | if ((int)fwrite(comment, 1, comsize, fpOutCD) == comsize) { |
@@ -192,8 +192,8 @@ uLong* bytesRecovered; | |||
192 | break; | 192 | break; |
193 | } | 193 | } |
194 | } | 194 | } |
195 | 195 | ||
196 | 196 | ||
197 | } else { | 197 | } else { |
198 | err = Z_ERRNO; | 198 | err = Z_ERRNO; |
199 | break; | 199 | break; |
@@ -225,17 +225,17 @@ uLong* bytesRecovered; | |||
225 | WRITE_32(header + 12, offsetCD); /* size of CD */ | 225 | WRITE_32(header + 12, offsetCD); /* size of CD */ |
226 | WRITE_32(header + 16, offset); /* offset to CD */ | 226 | WRITE_32(header + 16, offset); /* offset to CD */ |
227 | WRITE_16(header + 20, comsize); /* comment */ | 227 | WRITE_16(header + 20, comsize); /* comment */ |
228 | 228 | ||
229 | /* Header */ | 229 | /* Header */ |
230 | if (fwrite(header, 1, 22, fpOutCD) == 22) { | 230 | if (fwrite(header, 1, 22, fpOutCD) == 22) { |
231 | 231 | ||
232 | /* Comment field */ | 232 | /* Comment field */ |
233 | if (comsize > 0) { | 233 | if (comsize > 0) { |
234 | if ((int)fwrite(comment, 1, comsize, fpOutCD) != comsize) { | 234 | if ((int)fwrite(comment, 1, comsize, fpOutCD) != comsize) { |
235 | err = Z_ERRNO; | 235 | err = Z_ERRNO; |
236 | } | 236 | } |
237 | } | 237 | } |
238 | 238 | ||
239 | } else { | 239 | } else { |
240 | err = Z_ERRNO; | 240 | err = Z_ERRNO; |
241 | } | 241 | } |
@@ -257,14 +257,14 @@ uLong* bytesRecovered; | |||
257 | fclose(fpOutCD); | 257 | fclose(fpOutCD); |
258 | } | 258 | } |
259 | } | 259 | } |
260 | 260 | ||
261 | /* Close */ | 261 | /* Close */ |
262 | fclose(fpZip); | 262 | fclose(fpZip); |
263 | fclose(fpOut); | 263 | fclose(fpOut); |
264 | 264 | ||
265 | /* Wipe temporary file */ | 265 | /* Wipe temporary file */ |
266 | (void)remove(fileOutTmp); | 266 | (void)remove(fileOutTmp); |
267 | 267 | ||
268 | /* Number of recovered entries */ | 268 | /* Number of recovered entries */ |
269 | if (err == Z_OK) { | 269 | if (err == Z_OK) { |
270 | if (nRecovered != NULL) { | 270 | if (nRecovered != NULL) { |