Differences From Artifact [5f83697ea8]:
- File
utils/ofarc/LHAArchive.m
— part of check-in
[327e67021e]
at
2022-08-25 19:56:25
on branch trunk
— OFLHAArchiveEntry: Merge date and modificationDate
The date is meant to be the modification date and the extension is
supposed to override the modification date on old LHA versions where the
modification date is only stored in local time. (user: js, size: 13584) [annotate] [blame] [check-ins using]
To Artifact [a1e8c6e072]:
- File
utils/ofarc/LHAArchive.m
— part of check-in
[6f13f74134]
at
2022-08-27 20:23:24
on branch trunk
— OFLHAArchiveEntry: Make (un)compressedSize ull
There's newer, less common LHA versions that allow 64 bit for the size.
However, for consistency with OFTarArchiveEntry, use unsigned long long
instead of uint64_t. (user: js, size: 13586) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
119 120 121 122 123 124 125 |
[OFStdOut writeLine: entry.fileName];
if (app->_outputLevel >= 1) {
OFString *modificationDate = [entry.modificationDate
localDateStringWithFormat: @"%Y-%m-%d %H:%M:%S"];
OFString *compressedSize = [OFString stringWithFormat:
| | | | 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 |
[OFStdOut writeLine: entry.fileName];
if (app->_outputLevel >= 1) {
OFString *modificationDate = [entry.modificationDate
localDateStringWithFormat: @"%Y-%m-%d %H:%M:%S"];
OFString *compressedSize = [OFString stringWithFormat:
@"%llu", entry.compressedSize];
OFString *uncompressedSize = [OFString stringWithFormat:
@"%llu", entry.uncompressedSize];
OFString *CRC16 = [OFString stringWithFormat:
@"%04" PRIX16, entry.CRC16];
[OFStdOut writeString: @"\t"];
[OFStdOut writeLine: OF_LOCALIZED(
@"list_compressed_size",
@"["
|
| ︙ | ︙ | |||
254 255 256 257 258 259 260 |
while ((entry = [_archive nextEntry]) != nil) {
void *pool = objc_autoreleasePoolPush();
OFString *fileName = entry.fileName;
OFString *outFileName, *directory;
OFFile *output;
OFStream *stream;
| | | 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 |
while ((entry = [_archive nextEntry]) != nil) {
void *pool = objc_autoreleasePoolPush();
OFString *fileName = entry.fileName;
OFString *outFileName, *directory;
OFFile *output;
OFStream *stream;
unsigned long long written = 0, size = entry.uncompressedSize;
int8_t percent = -1, newPercent;
if (!all && ![files containsObject: fileName])
continue;
[missing removeObject: fileName];
|
| ︙ | ︙ |