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

Attempt to handle windows UNC file specifications.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@17280 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
CaS 2003-07-21 13:12:15 +00:00
parent a49480cc93
commit 4c941c1ba5
1 changed files with 20 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Source/NSFileManager.m
View file

@ -1688,7 +1688,9 @@ static NSFileManager* defaultManager = nil;
* Under windoze, this attempts to use local conventions to convert to a * Under windoze, this attempts to use local conventions to convert to a
* windows path. In GNUstep, the conventional unix syntax '~user/...' can * windows path. In GNUstep, the conventional unix syntax '~user/...' can
* be used to indicate a windoze drive specification by using the drive * be used to indicate a windoze drive specification by using the drive
* letter in place of the username. * letter in place of the username, and the syntax '~@server/...' can be used
* to indicate a file located on the named windoze network server (the
* '~@' maps to the leading '//' in a windoze UNC path specification.
*/ */
- (const char*) fileSystemRepresentationWithPath: (NSString*)path - (const char*) fileSystemRepresentationWithPath: (NSString*)path
{ {
@ -1709,7 +1711,12 @@ static NSFileManager* defaultManager = nil;
return 0; return 0;
} }
l = strlen(c_path); l = strlen(c_path);
if (l >= 2 && c_path[0] == '~' && isalpha(c_path[1]) if (l >= 2 && c_path[0] == '~' && c_path[1] == '@')
{
// Conver to windows UNC path.
newpath = [NSString stringWithFormat: @"//%s", &c_path[2]];
}
else if (l >= 2 && c_path[0] == '~' && isalpha(c_path[1])
&& (l == 2 || c_path[2] == '/')) && (l == 2 || c_path[2] == '/'))
{ {
newpath = [NSString stringWithFormat: @"%c:%s", c_path[1], newpath = [NSString stringWithFormat: @"%c:%s", c_path[1],
@ -1816,7 +1823,16 @@ static NSFileManager* defaultManager = nil;
{ {
return @""; return @"";
} }
if (len >= 2 && ptr[1] == ':' && isalpha(ptr[0])) if (len >= 2 && ptr[1] == '/' && ptr[0] == '/')
{
/*
* Convert '//<servername>/' to '~@<servername>/' sequences.
*/
buf[0] = '~';
buf[1] = '@';
i = 2;
}
else if (len >= 2 && ptr[1] == ':' && isalpha(ptr[0]))
{ {
/* /*
* Convert '<driveletter>:' to '~<driveletter>/' sequences. * Convert '<driveletter>:' to '~<driveletter>/' sequences.
@ -1852,7 +1868,7 @@ static NSFileManager* defaultManager = nil;
i = 0; i = 0;
} }
/* /*
* Convert backslashes to slashes, colaescing adjacent slashses. * Convert backslashes to slashes, colaescing adjacent slashes.
* Also elide '/./' sequences, because we can do so efficiently. * Also elide '/./' sequences, because we can do so efficiently.
*/ */
j = i; j = i;