ObjFW  Diff

Differences From Artifact [8bbe969b1a]:

• File src/OFZIPArchive.m — part of check-in [e2ad3ceacb] at 2013-10-10 22:18:52 on branch trunk — OFZIPArchive: Correctly handle archive comments.

  Archive comments allow up to 65535 bytes after the end of central
  directory record, thus the magic bytes for the end of central directory
  record are not always at end - 22. (user: js, size: 9897) [annotate] [blame] [check-ins using]

To Artifact [b1f97cb82f]:

• File src/OFZIPArchive.m — part of check-in [1ce5d53f93] at 2013-10-29 18:00:08 on branch trunk — OFZIPArchive: Only check lower byte of minVersion.

  The higher byte identifies the OS and is not helpful in the comparison,
  as it's better to just try to decompress it instead of checking if we
  are on the specified OS. (user: js, size: 9924) [annotate] [blame] [check-ins using]

237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254

		     whence: SEEK_SET];
	localFileHeader = [[[OFZIPArchive_LocalFileHeader alloc]
	    initWithFile: _file] autorelease];

	if (![localFileHeader matchesEntry: entry])
		@throw [OFInvalidFormatException exception];

	if (localFileHeader->_minVersion > 20) {
		OFString *version = [OFString stringWithFormat: @"%u.%u",
		    localFileHeader->_minVersion / 10,
		    localFileHeader->_minVersion % 10];

		@throw [OFUnsupportedVersionException
		    exceptionWithVersion: version];
	}

	ret = [[OFZIPArchive_FileStream alloc]
	    initWithArchiveFile: _path

|

|
|

237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254

		     whence: SEEK_SET];
	localFileHeader = [[[OFZIPArchive_LocalFileHeader alloc]
	    initWithFile: _file] autorelease];

	if (![localFileHeader matchesEntry: entry])
		@throw [OFInvalidFormatException exception];

	if ((localFileHeader->_minVersion & 0xFF) > 20) {
		OFString *version = [OFString stringWithFormat: @"%u.%u",
		    (localFileHeader->_minVersion & 0xFF) / 10,
		    (localFileHeader->_minVersion & 0xFF) % 10];

		@throw [OFUnsupportedVersionException
		    exceptionWithVersion: version];
	}

	ret = [[OFZIPArchive_FileStream alloc]
	    initWithArchiveFile: _path