gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-30 08:21:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add new init method

Browse source
This commit is contained in:
Gregory John Casamento 2019-08-05 14:37:58 -04:00
parent 52459ae2aa
commit 69168d3661
2 changed files with 74 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

80
Source/NSFileManager.m
View file

@ -179,6 +179,17 @@
followSymlinks: (BOOL)follow
justContents: (BOOL)justContents
for: (NSFileManager*)mgr;
- (id) initWithDirectoryPath: (NSString*)path
recurseIntoSubdirectories: (BOOL)recurse
followSymlinks: (BOOL)follow
justContents: (BOOL)justContents
skipHidden: (BOOL)skipHidden
errorHandler: (GSDirEnumErrorHandler) handler
for: (NSFileManager*)mgr;
- (void) _setSkipHidden: (BOOL)flag;
- (void) _setErrorHandler: (GSDirEnumErrorHandler) handler;
@end
/*
@ -809,7 +820,27 @@ static NSStringEncoding defaultEncoding;
options: (NSDirectoryEnumerationOptions)mask
errorHandler: (GSDirEnumErrorHandler)handler
{
return nil;
NSDirectoryEnumerator *direnum;
NSString *path;
DESTROY(_lastError);
if (![[url scheme] isEqualToString: @"file"])
{
return nil;
}
path = [url path];
direnum = [[NSDirectoryEnumerator alloc]
initWithDirectoryPath: path
recurseIntoSubdirectories: !(mask & NSDirectoryEnumerationSkipsSubdirectoryDescendants)
followSymlinks: NO
justContents: NO
skipHidden: (mask & NSDirectoryEnumerationSkipsHiddenFiles)
errorHandler: handler
for: self];
return direnum;
}
- (NSArray*) contentsOfDirectoryAtPath: (NSString*)path error: (NSError**)error
@ -2490,18 +2521,22 @@ static inline void gsedRelease(GSEnumeratedDirectory X)
}
}
/**
* Initialize instance to enumerate contents at path, which should be a
* directory and can be specified in relative or absolute, and may include
* Unix conventions like '<code>~</code>' for user home directory, which will
* be appropriately converted on Windoze systems. The justContents flag, if
* set, is equivalent to recurseIntoSubdirectories = NO and followSymlinks =
* NO, but the implementation will be made more efficient.
*/
- (void) _setSkipHidden: (BOOL)flag
{
_flags.skipHidden = flag;
}
- (void) _setErrorHandler: (GSDirEnumErrorHandler) handler
{
_errorHandler = handler;
}
- (id) initWithDirectoryPath: (NSString*)path
recurseIntoSubdirectories: (BOOL)recurse
followSymlinks: (BOOL)follow
justContents: (BOOL)justContents
skipHidden: (BOOL)skipHidden
errorHandler: (GSDirEnumErrorHandler) handler
for: (NSFileManager*)mgr
{
if (nil != (self = [super init]))
@ -2518,7 +2553,9 @@ static inline void gsedRelease(GSEnumeratedDirectory X)
_flags.isRecursive = recurse;
_flags.isFollowing = follow;
_flags.justContents = justContents;
_flags.skipHidden = skipHidden;
_errorHandler = handler;
_topPath = [[NSString alloc] initWithString: path];
localPath = [_mgr fileSystemRepresentationWithPath: path];
@ -2558,6 +2595,29 @@ static inline void gsedRelease(GSEnumeratedDirectory X)
return self;
}
/**
* Initialize instance to enumerate contents at path, which should be a
* directory and can be specified in relative or absolute, and may include
* Unix conventions like '<code>~</code>' for user home directory, which will
* be appropriately converted on Windoze systems. The justContents flag, if
* set, is equivalent to recurseIntoSubdirectories = NO and followSymlinks =
* NO, but the implementation will be made more efficient.
*/
- (id) initWithDirectoryPath: (NSString*)path
recurseIntoSubdirectories: (BOOL)recurse
followSymlinks: (BOOL)follow
justContents: (BOOL)justContents
for: (NSFileManager*)mgr
{
return [self initWithDirectoryPath: path
recurseIntoSubdirectories: recurse
followSymlinks: follow
justContents: justContents
skipHidden: NO
errorHandler: NULL
for: mgr];
}
- (void) dealloc
{
GSIArrayEmpty(_stack);