Differences From Artifact [b717d78c4a]:
- File utils/ofarc/LHAArchive.m — part of check-in [bc158ffe75] at 2020-06-02 21:02:57 on branch set-mtime — ofarc: Set modification date of extracted files (user: js, size: 14020) [annotate] [blame] [check-ins using] [more...]
To Artifact [da084987c7]:
- File
utils/ofarc/LHAArchive.m
— part of check-in
[25c985fec1]
at
2020-08-25 00:11:24
on branch trunk
— OFNumber: Remove (u)int{8,16,32,64} methods
Since C guarantees minimum sizes for char, short, int, long and long
long, these can be used instead. (user: js, size: 14157) [annotate] [blame] [check-ins using] [more...]
| ︙ | ︙ | |||
42 43 44 45 46 47 48 49 50 51 52 53 54 55 |
setPermissions(OFString *path, OFLHAArchiveEntry *entry)
{
#ifdef OF_FILE_MANAGER_SUPPORTS_PERMISSIONS
OFNumber *mode = entry.mode;
if (mode == nil)
return;
of_file_attributes_t attributes = [OFDictionary
dictionaryWithObject: mode
forKey: of_file_attribute_key_posix_permissions];
[[OFFileManager defaultManager] setAttributes: attributes
ofItemAtPath: path];
| > > > | 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 |
setPermissions(OFString *path, OFLHAArchiveEntry *entry)
{
#ifdef OF_FILE_MANAGER_SUPPORTS_PERMISSIONS
OFNumber *mode = entry.mode;
if (mode == nil)
return;
mode = [OFNumber numberWithUnsignedShort:
mode.unsignedShortValue & 0777];
of_file_attributes_t attributes = [OFDictionary
dictionaryWithObject: mode
forKey: of_file_attribute_key_posix_permissions];
[[OFFileManager defaultManager] setAttributes: attributes
ofItemAtPath: path];
|
| ︙ | ︙ | |||
141 142 143 144 145 146 147 | @"%" PRIu32, entry.uncompressedSize]; OFString *CRC16 = [OFString stringWithFormat: @"%04" PRIX16, entry.CRC16]; [of_stdout writeString: @"\t"]; [of_stdout writeLine: OF_LOCALIZED( @"list_compressed_size", | | | | | | | | | | | | | | | | | 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 |
@"%" PRIu32, entry.uncompressedSize];
OFString *CRC16 = [OFString stringWithFormat:
@"%04" PRIX16, entry.CRC16];
[of_stdout writeString: @"\t"];
[of_stdout writeLine: OF_LOCALIZED(
@"list_compressed_size",
@"["
@" 'Compressed: ',"
@" ["
@" {'size == 1': '1 byte'},"
@" {'': '%[size] bytes'}"
@" ]"
@"]".objectByParsingJSON,
@"size", compressedSize)];
[of_stdout writeString: @"\t"];
[of_stdout writeLine: OF_LOCALIZED(
@"list_uncompressed_size",
@"["
@" 'Uncompressed: ',"
@" ["
@" {'size == 1': '1 byte'},"
@" {'': '%[size] bytes'}"
@" ]"
@"]".objectByParsingJSON,
@"size", uncompressedSize)];
[of_stdout writeString: @"\t"];
[of_stdout writeLine: OF_LOCALIZED(
@"list_compression_method",
@"Compression method: %[method]",
@"method", entry.compressionMethod)];
[of_stdout writeString: @"\t"];
[of_stdout writeLine: OF_LOCALIZED(@"list_crc16",
@"CRC16: %[crc16]",
@"crc16", CRC16)];
[of_stdout writeString: @"\t"];
[of_stdout writeLine: OF_LOCALIZED(@"list_date",
@"Date: %[date]",
@"date", date)];
if (entry.mode != nil) {
OFString *modeString = [OFString
stringWithFormat:
@"%ho", entry.mode.unsignedShortValue];
[of_stdout writeString: @"\t"];
[of_stdout writeLine: OF_LOCALIZED(@"list_mode",
@"Mode: %[mode]",
@"mode", modeString)];
}
if (entry.UID != nil) {
|
| ︙ | ︙ | |||
465 466 467 468 469 470 471 | @"file", fileName)]; attributes = [fileManager attributesOfItemAtPath: fileName]; type = attributes.fileType; entry = [OFMutableLHAArchiveEntry entryWithFileName: fileName]; #ifdef OF_FILE_MANAGER_SUPPORTS_PERMISSIONS | | | | > | | 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 |
@"file", fileName)];
attributes = [fileManager attributesOfItemAtPath: fileName];
type = attributes.fileType;
entry = [OFMutableLHAArchiveEntry entryWithFileName: fileName];
#ifdef OF_FILE_MANAGER_SUPPORTS_PERMISSIONS
entry.mode = [OFNumber numberWithUnsignedLong:
attributes.filePOSIXPermissions];
#endif
entry.date = attributes.fileModificationDate;
#ifdef OF_FILE_MANAGER_SUPPORTS_OWNER
entry.UID =
[OFNumber numberWithUnsignedLong: attributes.filePOSIXUID];
entry.GID =
[OFNumber numberWithUnsignedLong: attributes.filePOSIXGID];
entry.owner = attributes.fileOwner;
entry.group = attributes.fileGroup;
#endif
if ([type isEqual: of_file_type_directory])
entry.compressionMethod = @"-lhd-";
output = [_archive streamForWritingEntry: entry];
if ([type isEqual: of_file_type_regular]) {
unsigned long long written = 0;
unsigned long long size = attributes.fileSize;
int8_t percent = -1, newPercent;
OFFile *input = [OFFile fileWithPath: fileName
mode: @"r"];
while (!input.atEndOfStream) {
ssize_t length = [app
|
| ︙ | ︙ |