Differences From Artifact [c337e995c2]:
- File
src/OFZooArchive.m
— part of check-in
[34a3e817b3]
at
2024-03-04 01:21:52
on branch trunk
— Rename schemes for archive IRI handlers back
The naming was confusing, as it is used to refer to a specific file in
an archive and not the entire archive. (user: js, size: 14604) [annotate] [blame] [check-ins using]
To Artifact [b281cdb8f3]:
- File src/OFZooArchive.m — part of check-in [181edbb0f0] at 2024-03-09 11:50:08 on branch trunk — OFZooArchive: Add support for archive comments (user: js, size: 15659) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 |
}
- (void)dealloc
{
if (_stream != nil)
[self close];
[_currentEntry release];
[super dealloc];
}
- (void)of_readArchiveHeader
{
char headerText[20];
| > | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 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 195 196 197 198 199 200 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 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 |
}
- (void)dealloc
{
if (_stream != nil)
[self close];
[_archiveComment release];
[_currentEntry release];
[super dealloc];
}
- (void)of_readArchiveHeader
{
char headerText[20];
uint32_t firstFileOffset, commentOffset;
uint16_t commentLength;
[_stream readIntoBuffer: headerText exactLength: 20];
if ([_stream readLittleEndianInt32] != 0xFDC4A7DC)
@throw [OFInvalidFormatException exception];
firstFileOffset = [_stream readLittleEndianInt32];
if ([_stream readLittleEndianInt32] != ~(uint32_t)(firstFileOffset - 1))
@throw [OFInvalidFormatException exception];
if ((_minVersionNeeded = [_stream readBigEndianInt16]) > 0x201)
@throw [OFUnsupportedVersionException exceptionWithVersion:
[OFString stringWithFormat: @"%" PRIu8 @".%" PRIu8,
_minVersionNeeded >> 8,
_minVersionNeeded & 0xFF]];
if ((_headerType = [_stream readInt8]) > 1)
@throw [OFUnsupportedVersionException exceptionWithVersion:
[OFString stringWithFormat: @"%" PRIu8, _headerType]];
commentOffset = [_stream readLittleEndianInt32];
commentLength = [_stream readLittleEndianInt16];
if (commentOffset > 0) {
[_stream seekToOffset: commentOffset whence: OFSeekSet];
_archiveComment = [_stream readStringWithLength: commentLength
encoding: _encoding];
}
[_stream seekToOffset: firstFileOffset whence: OFSeekSet];
}
- (OFString *)archiveComment
{
return _archiveComment;
}
- (void)setArchiveComment: (OFString *)comment
{
void *pool = objc_autoreleasePoolPush();
OFString *old;
if ([comment cStringLengthWithEncoding: _encoding] > UINT16_MAX)
@throw [OFOutOfRangeException exception];
old = _archiveComment;
_archiveComment = [comment copy];
[old release];
objc_autoreleasePoolPop(pool);
}
- (OFZooArchiveEntry *)nextEntry
{
if (_mode != modeRead)
@throw [OFInvalidArgumentException exception];
if (_currentEntry != nil)
|
| ︙ | ︙ | |||
292 293 294 295 296 297 298 299 300 301 |
@throw [OFInvalidArgumentException exception];
if (entry.compressionMethod != 0)
@throw [OFNotImplementedException exceptionWithSelector: _cmd
object: self];
if (_lastHeaderOffset == 0) {
/* First file - write header. */
[_stream writeBuffer: "ObjFW Zoo Archive.\x1F" length: 20];
[_stream writeLittleEndianInt32: 0xFDC4A7DC];
| > > > | | | > | | > > | > > > > > > | 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 |
@throw [OFInvalidArgumentException exception];
if (entry.compressionMethod != 0)
@throw [OFNotImplementedException exceptionWithSelector: _cmd
object: self];
if (_lastHeaderOffset == 0) {
uint16_t commentLength =
[_archiveComment cStringLengthWithEncoding: _encoding];
/* First file - write header. */
[_stream writeBuffer: "ObjFW Zoo Archive.\x1F" length: 20];
[_stream writeLittleEndianInt32: 0xFDC4A7DC];
[_stream writeLittleEndianInt32: 42 + commentLength];
[_stream writeLittleEndianInt32: -(42 + commentLength)];
/* TODO: Increase to 0x201 once we add compressed files. */
[_stream writeBigEndianInt16: 0x200];
/* Header type */
[_stream writeInt8: 1];
if (_archiveComment != nil) {
[_stream writeLittleEndianInt32: 42];
[_stream writeLittleEndianInt16: commentLength];
} else {
[_stream writeLittleEndianInt32: 0];
[_stream writeLittleEndianInt16: 0];
}
/* Version flag */
[_stream writeInt8: 0];
if (_archiveComment != nil)
[_stream writeString: _archiveComment
encoding: _encoding];
} else
[self of_fixUpLastHeader];
@try {
[_lastReturnedStream close];
} @catch (OFNotOpenException *e) {
/* Might have already been closed by the user - that's fine. */
|
| ︙ | ︙ |