Overview
| Comment: | Add -[OFTarArchiveEntry description]
Also includes a small typo fix for -[OFZIPArchiveEntry description] and |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
f4a5590b5849bbdd7a2fb1d3a25d74ee |
| User & Date: | js on 2016-07-03 13:29:21 |
| Other Links: | manifest | tags |
Context
|
2016-07-03
| ||
| 17:25 | OFHTTPClient: Make sure / is not encoded in path check-in: df0769200f user: js tags: trunk | |
| 13:29 | Add -[OFTarArchiveEntry description] check-in: f4a5590b58 user: js tags: trunk | |
| 12:19 | Add forwardingTargetForSelector: for x86_64/Mach-O check-in: d9c9a3d0bc user: js tags: trunk | |
Changes
Modified src/OFTarArchiveEntry.m from [9d5bd4c896] to [bd41f6ca0a].
| ︙ | ︙ | |||
174 175 176 177 178 179 180 181 | _toRead = 0; } if (_size % 512 != 0) [_stream readIntoBuffer: buffer exactLength: 512 - (_size % 512)]; } @end | > > > > > > > > > > > > > > > > > > > > > > > > > | 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 |
_toRead = 0;
}
if (_size % 512 != 0)
[_stream readIntoBuffer: buffer
exactLength: 512 - (_size % 512)];
}
- (OFString*)description
{
void *pool = objc_autoreleasePoolPush();
OFString *ret = [OFString stringWithFormat: @"<%@: %p\n"
@"\tFile name = %@\n"
@"\tMode = %06o\n"
@"\tSize = %" PRIu64 @"\n"
@"\tModification date = %@\n"
@"\tType = %u\n"
@"\tTarget file name = %@\n"
@"\tOwner = %@\n"
@"\tGroup = %@\n"
@"\tDevice major = %" PRIu32 @"\n"
@"\tDevice minor = %" PRIu32 @"\n"
@">",
[self class], self, _fileName, _mode, _size, _modificationDate,
_type, _targetFileName, _owner, _group, _deviceMajor, _deviceMinor];
[ret retain];
objc_autoreleasePoolPop(pool);
return [ret autorelease];
}
@end
|
Modified src/OFZIPArchiveEntry.m from [666898b117] to [4e05d700c6].
| ︙ | ︙ | |||
263 264 265 266 267 268 269 |
{
return [[_extraField copy] autorelease];
}
- (OFString*)description
{
void *pool = objc_autoreleasePoolPush();
| < | < < | | > > > | 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 |
{
return [[_extraField copy] autorelease];
}
- (OFString*)description
{
void *pool = objc_autoreleasePoolPush();
OFString *ret = [OFString stringWithFormat: @"<%@: %p\n"
@"\tFile name = %@\n"
@"\tFile comment = %@\n"
@"\tGeneral purpose bit flag = %u\n"
@"\tCompression method = %u\n"
@"\tCompressed size = %ju\n"
@"\tUncompressed size = %ju\n"
@"\tModification date = %@\n"
@"\tCRC32 = %" @PRIu32 @"\n"
@"\tExtra field = %@\n"
@">",
[self class], self, _fileName, _fileComment, _generalPurposeBitFlag,
_compressionMethod, (intmax_t)_compressedSize,
(intmax_t)_uncompressedSize, [self modificationDate], _CRC32,
_extraField];
[ret retain];
objc_autoreleasePoolPop(pool);
return [ret autorelease];
}
@end
|
Modified utils/ofzip/TarArchive.m from [6c1d27db62] to [9d595f8962].
| ︙ | ︙ | |||
93 94 95 96 97 98 99 |
if (app->_outputLevel >= 1) {
OFString *date = [[entry modificationDate]
localDateStringWithFormat: @"%Y-%m-%d %H:%M:%S"];
[of_stdout writeFormat:
@"\tSize: %" PRIu64 @" bytes\n"
| | | > > > | 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 |
if (app->_outputLevel >= 1) {
OFString *date = [[entry modificationDate]
localDateStringWithFormat: @"%Y-%m-%d %H:%M:%S"];
[of_stdout writeFormat:
@"\tSize: %" PRIu64 @" bytes\n"
@"\tMode: %06o\n",
[entry size], [entry mode]];
if ([entry owner] != nil)
[of_stdout writeFormat: @"\tOwner: %@\n",
[entry owner]];
if ([entry group] != nil)
[of_stdout writeFormat: @"\tGroup: %@\n",
[entry group]];
[of_stdout writeFormat: @"\tModification date: %@\n",
date];
}
if (app->_outputLevel >= 2) {
switch ([entry type]) {
case OF_TAR_ARCHIVE_ENTRY_TYPE_FILE:
[of_stdout writeLine: @"\tType: Normal file"];
break;
|
| ︙ | ︙ |