ObjFW  Check-in [79b125eda5]

Overview
Comment:ofarc: Delay setting modified date of directories
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | 1.0
Files: files | file ages | folders
SHA3-256: 79b125eda58319a38b97ec235db222a90ed1a4dab96b464fcf2813adfbcc5ca2
User & Date: js on 2024-03-02 11:41:47
Other Links: branch diff | manifest | tags
Context
2024-03-02
15:06
Fix linker warning on macOS/iOS check-in: 9aa5bfa889 user: js tags: 1.0
11:41
ofarc: Delay setting modified date of directories check-in: 79b125eda5 user: js tags: 1.0
11:41
ofarc: Delay setting modified date of directories check-in: f007fe7b02 user: js tags: trunk
10:57
ofarc: Fix typo in German localization check-in: d8bf76b68d user: js tags: 1.0
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Modified utils/ofarc/LHAArchive.m from [0bf9a4ae71] to [f7ef0447c1].

︙
14
15
16
17
18
19
20

21
22
23
24

25
26
27
28
29
30
31

14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33








+




+








 */

#include "config.h"

#include <errno.h>

#import "OFApplication.h"
#import "OFArray.h"
#import "OFDate.h"
#import "OFFileManager.h"
#import "OFLocale.h"
#import "OFNumber.h"
#import "OFPair.h"
#import "OFSet.h"
#import "OFStdIOStream.h"
#import "OFString.h"

#import "LHAArchive.h"
#import "OFArc.h"
︙
259
260
261
262
263
264
265

266
267
268
269
270
271
272

261
262
263
264
265
266
267
268
269
270
271
272
273
274
275








+








	}
}

- (void)extractFiles: (OFArray OF_GENERIC(OFString *) *)files
{
	OFFileManager *fileManager = [OFFileManager defaultManager];
	bool all = (files.count == 0);
	OFMutableArray *delayedModificationDates = [OFMutableArray array];
	OFMutableSet OF_GENERIC(OFString *) *missing =
	    [OFMutableSet setWithArray: files];
	OFLHAArchiveEntry *entry;

	while ((entry = [_archive nextEntry]) != nil) {
		void *pool = objc_autoreleasePoolPush();
		OFString *fileName = entry.fileName;
︙
297
298
299
300
301
302
303





304



305
306
307
308
309
310
311

300
301
302
303
304
305
306
307
308
309
310
311

312
313
314
315
316
317
318
319
320
321








+
+
+
+
+
-
+
+
+








			    @"Extracting %[file]...",
			    @"file", fileName)];

		if ([fileName hasSuffix: @"/"]) {
			[fileManager createDirectoryAtPath: outFileName
					     createParents: true];
			setPermissions(outFileName, entry);
			/*
			 * As creating a new file in a directory changes its
			 * modification date, we can only set it once all files
			 * have been created.
			 */
			setModificationDate(outFileName, entry);
			[delayedModificationDates addObject:
			    [OFPair pairWithFirstObject: outFileName
					   secondObject: entry]];

			if (app->_outputLevel >= 0) {
				[OFStdOut writeString: @"\r"];
				[OFStdOut writeLine: OF_LOCALIZED(
				    @"extracting_file_done",
				    @"Extracting %[file]... done",
				    @"file", fileName)];
︙
367
368
369
370
371
372
373



374
375
376
377
378
379
380

377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393








+
+
+








			    @"file", fileName)];
		}

outer_loop_end:
		objc_autoreleasePoolPop(pool);
	}

	for (OFPair *pair in delayedModificationDates)
		setModificationDate(pair.firstObject, pair.secondObject);

	if (missing.count > 0) {
		for (OFString *file in missing)
			[OFStdErr writeLine: OF_LOCALIZED(
			    @"file_not_in_archive",
			    @"File %[file] is not in the archive!",
			    @"file", file)];
︙

Modified utils/ofarc/TarArchive.m from [5dbe6d6d86] to [bcc24ae359].

︙
14
15
16
17
18
19
20

21
22
23
24

25
26
27
28
29
30
31

14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33








+




+








 */

#include "config.h"

#include <errno.h>

#import "OFApplication.h"
#import "OFArray.h"
#import "OFDate.h"
#import "OFFileManager.h"
#import "OFLocale.h"
#import "OFNumber.h"
#import "OFPair.h"
#import "OFSet.h"
#import "OFStdIOStream.h"
#import "OFString.h"

#import "TarArchive.h"
#import "OFArc.h"
︙
280
281
282
283
284
285
286

287
288
289
290
291
292
293

282
283
284
285
286
287
288
289
290
291
292
293
294
295
296








+








	}
}

- (void)extractFiles: (OFArray OF_GENERIC(OFString *) *)files
{
	OFFileManager *fileManager = [OFFileManager defaultManager];
	bool all = (files.count == 0);
	OFMutableArray *delayedModificationDates = [OFMutableArray array];
	OFMutableSet OF_GENERIC(OFString *) *missing =
	    [OFMutableSet setWithArray: files];
	OFTarArchiveEntry *entry;

	while ((entry = [_archive nextEntry]) != nil) {
		void *pool = objc_autoreleasePoolPush();
		OFString *fileName = entry.fileName;
︙
331
332
333
334
335
336
337





338



339
340
341
342
343
344
345

334
335
336
337
338
339
340
341
342
343
344
345

346
347
348
349
350
351
352
353
354
355








+
+
+
+
+
-
+
+
+









		if (type == OFTarArchiveEntryTypeDirectory ||
		    (type == OFTarArchiveEntryTypeFile &&
		    [fileName hasSuffix: @"/"])) {
			[fileManager createDirectoryAtPath: outFileName
					     createParents: true];
			setPermissions(outFileName, entry);
			/*
			 * As creating a new file in a directory changes its
			 * modification date, we can only set it once all files
			 * have been created.
			 */
			setModificationDate(outFileName, entry);
			[delayedModificationDates addObject:
			    [OFPair pairWithFirstObject: outFileName
					   secondObject: entry]];

			if (app->_outputLevel >= 0) {
				[OFStdOut writeString: @"\r"];
				[OFStdOut writeLine: OF_LOCALIZED(
				    @"extracting_file_done",
				    @"Extracting %[file]... done",
				    @"file", fileName)];
︙
401
402
403
404
405
406
407



408
409
410
411
412
413
414

411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427








+
+
+








			    @"file", fileName)];
		}

outer_loop_end:
		objc_autoreleasePoolPop(pool);
	}

	for (OFPair *pair in delayedModificationDates)
		setModificationDate(pair.firstObject, pair.secondObject);

	if (missing.count > 0) {
		for (OFString *file in missing)
			[OFStdErr writeLine: OF_LOCALIZED(
			    @"file_not_in_archive",
			    @"File %[file] is not in the archive!",
			    @"file", file)];
︙

Modified utils/ofarc/ZIPArchive.m from [6ca4ff87a1] to [9a0280ef0d].

︙
14
15
16
17
18
19
20

21
22
23
24
25

26
27
28
29
30
31
32

14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34








+





+








 */

#include "config.h"

#include <errno.h>

#import "OFApplication.h"
#import "OFArray.h"
#import "OFData.h"
#import "OFDate.h"
#import "OFFileManager.h"
#import "OFLocale.h"
#import "OFNumber.h"
#import "OFPair.h"
#import "OFSet.h"
#import "OFStdIOStream.h"
#import "OFString.h"

#import "ZIPArchive.h"
#import "OFArc.h"
︙
269
270
271
272
273
274
275

276
277
278
279
280
281
282

271
272
273
274
275
276
277
278
279
280
281
282
283
284
285








+








	}
}

- (void)extractFiles: (OFArray OF_GENERIC(OFString *) *)files
{
	OFFileManager *fileManager = [OFFileManager defaultManager];
	bool all = (files.count == 0);
	OFMutableArray *delayedModificationDates = [OFMutableArray array];
	OFMutableSet OF_GENERIC(OFString *) *missing =
	    [OFMutableSet setWithArray: files];

	for (OFZIPArchiveEntry *entry in _archive.entries) {
		void *pool = objc_autoreleasePoolPush();
		OFString *fileName = entry.fileName;
		OFString *outFileName, *directory;
︙
306
307
308
309
310
311
312





313



314
315
316
317
318
319
320

309
310
311
312
313
314
315
316
317
318
319
320

321
322
323
324
325
326
327
328
329
330








+
+
+
+
+
-
+
+
+








			    @"Extracting %[file]...",
			    @"file", fileName)];

		if ([fileName hasSuffix: @"/"]) {
			[fileManager createDirectoryAtPath: outFileName
					     createParents: true];
			setPermissions(outFileName, entry);
			/*
			 * As creating a new file in a directory changes its
			 * modification date, we can only set it once all files
			 * have been created.
			 */
			setModificationDate(outFileName, entry);
			[delayedModificationDates addObject:
			    [OFPair pairWithFirstObject: outFileName
					   secondObject: entry]];

			if (app->_outputLevel >= 0) {
				[OFStdOut writeString: @"\r"];
				[OFStdOut writeLine: OF_LOCALIZED(
				    @"extracting_file_done",
				    @"Extracting %[file]... done",
				    @"file", fileName)];
︙
376
377
378
379
380
381
382



383
384
385
386
387
388
389

386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402








+
+
+








			    @"file", fileName)];
		}

outer_loop_end:
		objc_autoreleasePoolPop(pool);
	}

	for (OFPair *pair in delayedModificationDates)
		setModificationDate(pair.firstObject, pair.secondObject);

	if (missing.count > 0) {
		for (OFString *file in missing)
			[OFStdErr writeLine: OF_LOCALIZED(
			    @"file_not_in_archive",
			    @"File %[file] is not in the archive!",
			    @"file", file)];
︙

Fossil 2.23 [47362306a7] 2023-11-01 18:56:47
This page was generated in about 0.016s