ObjFW  Check-in [ae44655c61]

Overview
Comment:Fix symlink handling in subpathsOfDirectoryAtPath:
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: ae44655c61b9e025a209a3c86b5b7f142f69fabca25c2d2089b7b002da71bf8c
User & Date: js on 2021-07-04 16:29:06
Other Links: manifest | tags
Context
2021-07-04
16:31
ofarc: Fix adding symlinks to directories check-in: ecb2dfa803 user: js tags: trunk
16:29
Fix symlink handling in subpathsOfDirectoryAtPath: check-in: ae44655c61 user: js tags: trunk
16:19
ofarc: Fix creating LHA files with directories check-in: d6bb16aa3b user: js tags: trunk
Changes

Modified src/OFFileManager.m from [452b87ebf4] to [d2360d47e0].

462
463
464
465
466
467
468


469
470

471
472
473
474
475
476
477
478
	OFMutableArray OF_GENERIC(OFString *) *ret =
	    [OFMutableArray arrayWithObject: path];

	for (OFString *subpath in [self contentsOfDirectoryAtPath: path]) {
		void *pool2 = objc_autoreleasePoolPush();
		OFString *fullSubpath =
		    [path stringByAppendingPathComponent: subpath];



		if ([self directoryExistsAtPath: fullSubpath])

		       [ret addObjectsFromArray:
			    [self subpathsOfDirectoryAtPath: fullSubpath]];
		else
			[ret addObject: fullSubpath];

		objc_autoreleasePoolPop(pool2);
	}








>
>

<
>
|







462
463
464
465
466
467
468
469
470
471

472
473
474
475
476
477
478
479
480
	OFMutableArray OF_GENERIC(OFString *) *ret =
	    [OFMutableArray arrayWithObject: path];

	for (OFString *subpath in [self contentsOfDirectoryAtPath: path]) {
		void *pool2 = objc_autoreleasePoolPush();
		OFString *fullSubpath =
		    [path stringByAppendingPathComponent: subpath];
		OFFileAttributes attributes =
		    [self attributesOfItemAtPath: fullSubpath];


		if ([attributes.fileType isEqual: OFFileTypeDirectory])
			[ret addObjectsFromArray:
			    [self subpathsOfDirectoryAtPath: fullSubpath]];
		else
			[ret addObject: fullSubpath];

		objc_autoreleasePoolPop(pool2);
	}