ObjFW  Check-in [ecb2dfa803]

Overview
Comment:ofarc: Fix adding symlinks to directories
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: ecb2dfa803f8748bf2ec7a338bdff2ffd9623c4b7d16b6f66a95f48dc7a6d36d
User & Date: js on 2021-07-04 16:31:34
Other Links: manifest | tags
Context
2021-07-09
21:23
ofhash: Update usage to reflect changed reality check-in: 405f056137 user: js tags: trunk
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
Changes

Modified utils/ofarc/OFArc.m from [d48722ca04] to [905433948f].

148
149
150
151
152
153
154
155
156



157
158
159
160

161
162
163
164
165
166
167
static void
addFiles(id <Archive> archive, OFArray OF_GENERIC(OFString *) *files)
{
	OFMutableArray *expandedFiles =
	    [OFMutableArray arrayWithCapacity: files.count];
	OFFileManager *fileManager = [OFFileManager defaultManager];

	for (OFString *file in files)
		if ([fileManager directoryExistsAtPath: file])



			[expandedFiles addObjectsFromArray: 
			    [fileManager subpathsOfDirectoryAtPath: file]];
		else
			[expandedFiles addObject: file];


	[archive addFiles: expandedFiles];
}

@implementation OFArc
- (void)applicationDidFinishLaunching
{







|
|
>
>
>




>







148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
static void
addFiles(id <Archive> archive, OFArray OF_GENERIC(OFString *) *files)
{
	OFMutableArray *expandedFiles =
	    [OFMutableArray arrayWithCapacity: files.count];
	OFFileManager *fileManager = [OFFileManager defaultManager];

	for (OFString *file in files) {
		OFFileAttributes attributes =
		    [fileManager attributesOfItemAtPath: file];

		if ([attributes.fileType isEqual: OFFileTypeDirectory])
			[expandedFiles addObjectsFromArray: 
			    [fileManager subpathsOfDirectoryAtPath: file]];
		else
			[expandedFiles addObject: file];
	}

	[archive addFiles: expandedFiles];
}

@implementation OFArc
- (void)applicationDidFinishLaunching
{