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

NSFileManager: implement -attributesOfFileSystemForPath:withError:

Browse source 
Implement a method for getting attribytes of a file system path. Reuse
the implementation of -fileSystemAttributesAtPath: for this purpose but
export the last system errors to the caller. Make
-fileSystemAttributesAtPath: use the new implementation, without
exposing error info to the caller.
This commit is contained in:
Daniel Ferreira 2017-06-24 01:47:50 +10:00 committed by Ivan Vučica
parent 7636967f30
commit 270c1bcea9
2 changed files with 47 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Headers/Foundation/NSFileManager.h
View file

@ -345,6 +345,9 @@ typedef NSUInteger NSDirectoryEnumerationOptions;
* it can't be read for some reason).
*/
- (NSArray*) contentsOfDirectoryAtPath: (NSString*)path error: (NSError**)error;
- (NSDictionary*) attributesOfFileSystemForPath: (NSString*)path
error: (NSError**)error;
#endif
- (BOOL) copyPath: (NSString*)source

61
Source/NSFileManager.m
View file

@ -2005,23 +2005,8 @@ static NSStringEncoding defaultEncoding;
return d;
}
/**
* Returns a dictionary containing the filesystem attributes for the
* specified path (or nil if the path is not valid).<br />
* <deflist>
* <term><code>NSFileSystemSize</code></term>
* <desc>NSNumber the size of the filesystem in bytes</desc>
* <term><code>NSFileSystemFreeSize</code></term>
* <desc>NSNumber the amount of unused space on the filesystem in bytes</desc>
* <term><code>NSFileSystemNodes</code></term>
* <desc>NSNumber the number of nodes in use to store files</desc>
* <term><code>NSFileSystemFreeNodes</code></term>
* <desc>NSNumber the number of nodes available to create files</desc>
* <term><code>NSFileSystemNumber</code></term>
* <desc>NSNumber the identifying number for the filesystem</desc>
* </deflist>
*/
- (NSDictionary*) fileSystemAttributesAtPath: (NSString*)path
- (NSDictionary*) attributesOfFileSystemForPath: (NSString*)path
error: (NSError**)error
{
#if defined(_WIN32)
unsigned long long totalsize, freesize;
@ -2041,6 +2026,10 @@ static NSStringEncoding defaultEncoding;
if (!GetVolumePathNameW(lpath, volumePathName, 128))
{
if (error != NULL)
{
*error = [NSError _last];
}
return nil;
}
GetVolumeInformationW(volumePathName, NULL, 0, &volumeSerialNumber,
@ -2049,6 +2038,10 @@ static NSStringEncoding defaultEncoding;
if (!GetDiskFreeSpaceW(volumePathName, &SectorsPerCluster,
&BytesPerSector, &NumberFreeClusters, &TotalNumberClusters))
{
if (error != NULL)
{
*error = [NSError _last];
}
return nil;
}
@ -2091,6 +2084,10 @@ static NSStringEncoding defaultEncoding;
if (_STAT(lpath, &statbuf) != 0)
{
if (error != NULL)
{
*error = [NSError _last];
}
NSDebugMLLog(@"NSFileManager", @"stat failed for '%s' ... %@",
lpath, [NSError _last]);
return nil;
@ -2098,6 +2095,10 @@ static NSStringEncoding defaultEncoding;
#ifdef HAVE_STATVFS
if (statvfs(lpath, &statfsbuf) != 0)
{
if (error != NULL)
{
*error = [NSError _last];
}
NSDebugMLLog(@"NSFileManager", @"statvfs failed for '%s' ... %@",
lpath, [NSError _last]);
return nil;
@ -2106,6 +2107,10 @@ static NSStringEncoding defaultEncoding;
#else
if (statfs(lpath, &statfsbuf) != 0)
{
if (error != NULL)
{
*error = [NSError _last];
}
NSDebugMLLog(@"NSFileManager", @"statfs failed for '%s' ... %@",
lpath, [NSError _last]);
return nil;
@ -2133,6 +2138,28 @@ static NSStringEncoding defaultEncoding;
#endif /* _WIN32 */
}
/**
* Returns a dictionary containing the filesystem attributes for the
* specified path (or nil if the path is not valid).<br />
* <deflist>
* <term><code>NSFileSystemSize</code></term>
* <desc>NSNumber the size of the filesystem in bytes</desc>
* <term><code>NSFileSystemFreeSize</code></term>
* <desc>NSNumber the amount of unused space on the filesystem in bytes</desc>
* <term><code>NSFileSystemNodes</code></term>
* <desc>NSNumber the number of nodes in use to store files</desc>
* <term><code>NSFileSystemFreeNodes</code></term>
* <desc>NSNumber the number of nodes available to create files</desc>
* <term><code>NSFileSystemNumber</code></term>
* <desc>NSNumber the identifying number for the filesystem</desc>
* </deflist>
*/
- (NSDictionary*) fileSystemAttributesAtPath: (NSString*)path
{
return [self attributesOfFileSystemForPath:path
error:NULL];
}
/**
* Returns an array of the contents of the specified directory.<br />
* The listing does <strong>not</strong> recursively list subdirectories.<br />