Overview
| Comment: | OFZIP: Show hex dump of extra field with -vvv |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
240658fd6c98ed4e23c9fbd701fb46cb |
| User & Date: | js on 2014-05-25 23:53:42 |
| Other Links: | manifest | tags |
Context
|
2014-05-26
| ||
| 15:41 | OFZIPArchiveEntry: Make more properties public check-in: c1d665c395 user: js tags: trunk | |
|
2014-05-25
| ||
| 23:53 | OFZIP: Show hex dump of extra field with -vvv check-in: 240658fd6c user: js tags: trunk | |
| 23:42 | OFZIP: Make -x/-l, -f/-n, -v/-q mutually exclusive check-in: 5a782d2c74 user: js tags: trunk | |
Changes
Modified utils/OFZIP.m from [d89e8cb4a7] to [0a5ec525eb].
| ︙ | ︙ | |||
201 202 203 204 205 206 207 |
{
OFEnumerator *enumerator = [[archive entries] objectEnumerator];
OFZIPArchiveEntry *entry;
while ((entry = [enumerator nextObject]) != nil) {
void *pool = objc_autoreleasePoolPush();
| | | > > > > > > | 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 |
{
OFEnumerator *enumerator = [[archive entries] objectEnumerator];
OFZIPArchiveEntry *entry;
while ((entry = [enumerator nextObject]) != nil) {
void *pool = objc_autoreleasePoolPush();
if (_outputLevel >= 1) {
OFString *date = [[entry modificationDate]
localDateStringWithFormat: @"%Y-%m-%d %H:%M:%S"];
[of_stdout writeFormat:
@"%@: %" PRIu64 @" (%" PRIu64 @") bytes; %08X; %@; "
@"%@", [entry fileName], [entry uncompressedSize],
[entry compressedSize], [entry CRC32], date,
[entry fileComment]];
if (_outputLevel >= 3)
[of_stdout writeFormat: @"; %@",
[entry extraField]];
[of_stdout writeString: @"\n"];
} else
[of_stdout writeLine: [entry fileName]];
objc_autoreleasePoolPop(pool);
}
}
|
| ︙ | ︙ | |||
265 266 267 268 269 270 271 | [of_stderr writeFormat: @"Refusing to extract %@!\n", fileName]; _exitStatus = 1; continue; } } | | | | | 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 |
[of_stderr writeFormat:
@"Refusing to extract %@!\n", fileName];
_exitStatus = 1;
continue;
}
}
if (_outputLevel >= 0)
[of_stdout writeFormat: @"Extracting %@...", fileName];
if ([fileName hasSuffix: @"/"]) {
[OFFile createDirectoryAtPath: outFileName
createParents: true];
if (_outputLevel >= 0)
[of_stdout writeLine: @" done"];
continue;
}
directory = [outFileName stringByDeletingLastPathComponent];
if (![OFFile directoryExistsAtPath: directory])
[OFFile createDirectoryAtPath: directory
createParents: true];
if ([OFFile fileExistsAtPath: outFileName] && _override != 1) {
OFString *line;
if (_override == -1) {
if (_outputLevel >= 0)
[of_stdout writeLine: @" skipped"];
continue;
}
do {
[of_stderr writeFormat:
@"\rOverride %@? [ynAN?] ", fileName];
|
| ︙ | ︙ | |||
333 334 335 336 337 338 339 | [output writeBuffer: buffer length: length]; written += length; newPercent = (written == size ? 100 : (int_fast8_t)(written * 100 / size)); | | | | 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 |
[output writeBuffer: buffer
length: length];
written += length;
newPercent = (written == size
? 100 : (int_fast8_t)(written * 100 / size));
if (_outputLevel >= 0 && percent != newPercent) {
percent = newPercent;
[of_stdout writeFormat:
@"\rExtracting %@... %3u%%",
fileName, percent];
}
}
if (_outputLevel >= 0)
[of_stdout writeFormat: @"\rExtracting %@... done\n",
fileName];
objc_autoreleasePoolPop(pool);
}
if ([missing count] > 0) {
|
| ︙ | ︙ |