Author: rfm
Date: Sun Jun 26 14:04:23 2016
New Revision: 39926
URL: http://svn.gna.org/viewcvs/gnustep?rev=39926&view=rev
Log:
If we don't have a home directory, we can't expand a '~' in a path.
Modified:
libs/base/trunk/Source/NSString.m
libs/base/trunk/Tests/base/NSString/test02.m
Modified: libs/base/trunk/Source/NSString.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/base/trunk/Source/NSString.m?rev=39926&r1=39925&r2=39926&view=diff
==============================================================================
--- libs/base/trunk/Source/NSString.m (original)
+++ libs/base/trunk/Source/NSString.m Sun Jun 26 14:04:23 2016
@@ -4659,8 +4659,8 @@
}
firstSlashRange = [self rangeOfCharacterFromSet: pathSeps()
- options: NSLiteralSearch
- range: ((NSRange){0, length})];
+ options: NSLiteralSearch
+ range: ((NSRange){0, length})];
if (firstSlashRange.length == 0)
{
firstSlashRange.location = length;
@@ -4692,12 +4692,12 @@
firstSlashRange.location = [self length];
}
uname = [self substringWithRange: ((NSRange){1, userNameLen})];
- homedir = NSHomeDirectoryForUser (uname);
+ homedir = NSHomeDirectoryForUser(uname);
}
else
{
/* It is of the form `~/blah/...' or is '~' */
- homedir = NSHomeDirectory ();
+ homedir = NSHomeDirectory();
}
if (homedir != nil)
Modified: libs/base/trunk/Tests/base/NSString/test02.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/base/trunk/Tests/base/NSString/test02.m?rev=39926&r1=39925&r2=39926&view=diff
==============================================================================
--- libs/base/trunk/Tests/base/NSString/test02.m (original)
+++ libs/base/trunk/Tests/base/NSString/test02.m Sun Jun 26 14:04:23 2016
@@ -319,8 +319,11 @@
"foo->bar relative symlink expanded by stringByResolvingSymlinksInPath")
#endif
- PASS(NO == [[@"~" stringByResolvingSymlinksInPath] isEqual: @"~"],
- "tilde is expanded by stringByResolvingSymlinksInPath")
+ if (NSHomeDirectory() != nil)
+ {
+ PASS(NO == [[@"~" stringByResolvingSymlinksInPath] isEqual: @"~"],
+ "tilde is expanded by stringByResolvingSymlinksInPath")
+ }
[fm changeCurrentDirectoryPath: cwd];
[fm removeFileAtPath: tmpdst handler: nil];
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
