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

Apply Roland Schwingel's filesystem number fix for windows.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@29880 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rfm 2010-03-08 12:49:43 +00:00
parent 46fb261443
commit e711927519
2 changed files with 27 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2010-03-08 Roland Schwingel <roland.schwingel@onevision.de>
* Source/NSFileManager.m: implement fileSystemNumber for mswindows.
2010-03-08 Richard Frith-Macdonald <rfm@gnu.org> 2010-03-08 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSObject.m: * Source/NSObject.m:

26
Source/NSFileManager.m
View file

@ -192,7 +192,7 @@
#define _CLOSEDIR(A) _wclosedir(A) #define _CLOSEDIR(A) _wclosedir(A)
#define _OPENDIR(A) _wopendir(A) #define _OPENDIR(A) _wopendir(A)
#define _READDIR(A) _wreaddir(A) #define _READDIR(A) _wreaddir(A)
#define _RENAME(A,B) _wrename(A,B) #define _RENAME(A,B) (MoveFileExW(A,B,MOVEFILE_COPY_ALLOWED|MOVEFILE_REPLACE_EXISTING|MOVEFILE_WRITE_THROUGH)==0)?-1:0
#define _RMDIR(A) _wrmdir(A) #define _RMDIR(A) _wrmdir(A)
#define _STAT(A,B) _wstat(A,B) #define _STAT(A,B) _wstat(A,B)
#define _UTIME(A,B) _wutime(A,B) #define _UTIME(A,B) _wutime(A,B)
@ -1778,9 +1778,18 @@ static NSStringEncoding defaultEncoding;
}; };
DWORD SectorsPerCluster, BytesPerSector, NumberFreeClusters; DWORD SectorsPerCluster, BytesPerSector, NumberFreeClusters;
DWORD TotalNumberClusters; DWORD TotalNumberClusters;
DWORD volumeSerialNumber = 0;
const _CHAR *lpath = [self fileSystemRepresentationWithPath: path]; const _CHAR *lpath = [self fileSystemRepresentationWithPath: path];
_CHAR volumePathName[128];
if (!GetDiskFreeSpaceW(lpath, &SectorsPerCluster, if (!GetVolumePathNameW(lpath, volumePathName, 128))
{
return nil;
}
GetVolumeInformationW(volumePathName, NULL, 0, &volumeSerialNumber,
NULL, NULL, NULL, 0);
if (!GetDiskFreeSpaceW(volumePathName, &SectorsPerCluster,
&BytesPerSector, &NumberFreeClusters, &TotalNumberClusters)) &BytesPerSector, &NumberFreeClusters, &TotalNumberClusters))
{ {
return nil; return nil;
@ -1797,7 +1806,7 @@ static NSStringEncoding defaultEncoding;
values[1] = [NSNumber numberWithUnsignedLongLong: freesize]; values[1] = [NSNumber numberWithUnsignedLongLong: freesize];
values[2] = [NSNumber numberWithLong: LONG_MAX]; values[2] = [NSNumber numberWithLong: LONG_MAX];
values[3] = [NSNumber numberWithLong: LONG_MAX]; values[3] = [NSNumber numberWithLong: LONG_MAX];
values[4] = [NSNumber numberWithUnsignedInt: 0]; values[4] = [NSNumber numberWithUnsignedInt: volumeSerialNumber];
return [NSDictionary dictionaryWithObjects: values forKeys: keys count: 5]; return [NSDictionary dictionaryWithObjects: values forKeys: keys count: 5];
@ -3227,7 +3236,18 @@ static NSSet *fileKeys = nil;
- (NSUInteger) fileSystemNumber - (NSUInteger) fileSystemNumber
{ {
#if defined(__MINGW32__)
DWORD volumeSerialNumber = 0;
_CHAR volumePathName[128];
if (GetVolumePathNameW(_path,volumePathName,128))
{
GetVolumeInformationW(volumePathName,NULL,0,&volumeSerialNumber,NULL,NULL,NULL,0);
}
return (NSUInteger)volumeSerialNumber;
#else
return statbuf.st_dev; return statbuf.st_dev;
#endif
} }
- (NSString*) fileType - (NSString*) fileType