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

Add logic to stop enumeration

Browse source
This commit is contained in:
Gregory John Casamento 2019-08-05 16:20:09 -04:00
parent 904604b448
commit cb20153df4
1 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
Source/NSFileManager.m
View file

@ -2698,11 +2698,7 @@ static inline void gsedRelease(GSEnumeratedDirectory X)
#else
const char *dirname = NULL;
#endif
// Skip it if it is hidden and flag is yes...
if ([[dir.path lastPathComponent] hasPrefix: @"."] && _flags.skipHidden == YES)
{
continue;
}
#ifdef __ANDROID__
if (dir.assetDir)
{
@ -2724,6 +2720,12 @@ static inline void gsedRelease(GSEnumeratedDirectory X)
if (dirname)
{
// Skip it if it is hidden and flag is yes...
if ([[dir.path lastPathComponent] hasPrefix: @"."] && _flags.skipHidden == YES)
{
continue;
}
#if defined(_WIN32)
/* Skip "." and ".." directory entries */
if (wcscmp(dirname, L".") == 0
@ -2731,6 +2733,7 @@ static inline void gsedRelease(GSEnumeratedDirectory X)
{
continue;
}
/* Name of file to return */
returnFileName = [_mgr
stringWithFileSystemRepresentation: dirname
@ -2742,7 +2745,8 @@ static inline void gsedRelease(GSEnumeratedDirectory X)
{
continue;
}
/* Name of file to return */
/* Name of file to return */
returnFileName = [_mgr
stringWithFileSystemRepresentation: dirname
length: strlen(dirname)];
@ -2807,9 +2811,18 @@ static inline void gsedRelease(GSEnumeratedDirectory X)
}
else
{
BOOL flag = YES;
NSDebugLog(@"Failed to recurse into directory '%@' - %@",
_currentFilePath, [NSError _last]);
}
if(_errorHandler != NULL)
{
flag = CALL_BLOCK(_errorHandler, [NSURL URLWithString: _currentFilePath], [NSError _last]);
}
if(flag == NO)
{
return nil; // Stop enumeration...
}
}
}
}
break; // Got a file name - break out of loop