gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-22 16:33:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix -[NSFileManager URLForDirectory:...] using incorrect NSURL initializer and simplified implementation

Browse source
This commit is contained in:
Frederik Seiffert 2021-10-20 13:26:10 +02:00 committed by Frederik Seiffert
parent c307a04a39
commit 80f05c2278
2 changed files with 24 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2021-09-20 Frederik Seiffert <frederik@algoriddim.com>
* Source/NSFileManager.m:
Fix -[NSFileManager URLForDirectory:...] using incorrect NSURL
initializer and simplified implementation.
2021-09-16 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSJSONSerialization.m:

38
Source/NSFileManager.m
View file

@ -867,33 +867,31 @@ static NSStringEncoding defaultEncoding;
create: (BOOL)shouldCreate
error: (NSError **)error
{
NSURL *result = nil;
NSArray *urlArray = NSSearchPathForDirectoriesInDomains(directory, domain, YES);
// Find out the URL exists...
if ([urlArray count] > 0)
{
result = [NSURL URLWithString: [urlArray objectAtIndex: 0]];
}
NSString *path = nil;
if (directory == NSItemReplacementDirectory)
{
result = [NSURL URLWithString: NSTemporaryDirectory()];
path = NSTemporaryDirectory();
}
else
{
NSArray *pathArray = NSSearchPathForDirectoriesInDomains(directory, domain, YES);
if ([pathArray count] > 0)
{
path = [pathArray objectAtIndex: 0];
}
}
if (![self fileExistsAtPath: [result absoluteString]])
if (shouldCreate && ![self fileExistsAtPath: path])
{
// If we should created it, create it...
if (shouldCreate)
{
[self createDirectoryAtPath: [result absoluteString]
withIntermediateDirectories: YES
attributes: nil
error: error];
}
[self createDirectoryAtPath: path
withIntermediateDirectories: YES
attributes: nil
error: error];
}
return result;
return [NSURL fileURLWithPath: path];
}
- (NSDirectoryEnumerator *)enumeratorAtURL: (NSURL *)url
@ -2903,7 +2901,7 @@ static inline void gsedRelease(GSEnumeratedDirectory X)
if (_errorHandler != NULL)
{
flag = CALL_BLOCK(_errorHandler,
[NSURL URLWithString: _currentFilePath],
[NSURL fileURLWithPath: _currentFilePath],
[NSError _last]);
}
if (flag == NO)