ObjFW  Diff

Differences From Artifact [dc39ebe128]:

• File utils/ofzip/ZIPArchive.m — part of check-in [7e5c81e186] at 2018-01-03 19:49:46 on branch trunk — Update copyright notice (user: js size: 12908)

To Artifact [f8793bebd7]:

• File utils/ofzip/ZIPArchive.m — part of check-in [156b850131] at 2018-03-11 12:55:20 on branch trunk — Remove OF_PATH_* macros These were way too simplistic, as paths differ in more than just that on various operating systems. (user: js size: 12923)

233
234
235
236
237
238
239

240
241
242
243
244
245
246
247

			app->_exitStatus = 1;
			goto outer_loop_end;
		}

		pathComponents = [outFileName pathComponents];
		for (OFString *component in pathComponents) {

			if ([component isEqual: OF_PATH_PARENT_DIRECTORY]) {
				[of_stderr writeLine: OF_LOCALIZED(
				    @"refusing_to_extract_file",
				    @"Refusing to extract %[file]!",
				    @"file", fileName)];

				app->_exitStatus = 1;
				goto outer_loop_end;

>
|

233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248

			app->_exitStatus = 1;
			goto outer_loop_end;
		}

		pathComponents = [outFileName pathComponents];
		for (OFString *component in pathComponents) {
			if ([component length] == 0 ||
			    [component isEqual: @".."]) {
				[of_stderr writeLine: OF_LOCALIZED(
				    @"refusing_to_extract_file",
				    @"Refusing to extract %[file]!",
				    @"file", fileName)];

				app->_exitStatus = 1;
				goto outer_loop_end;