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

Fixed [NSProcessInfo -processName] and updated places that used it.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@4809 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
richard 1999-09-03 08:59:07 +00:00
parent 90fb38e82f
commit aa2e0cc17a
4 changed files with 38 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

59
Source/NSUserDefaults.m
View file

@ -326,8 +326,7 @@ static BOOL setSharedDefaults = NO; /* Flag to prevent infinite recursion */
RETAIN([NSDistributedLock lockWithPath: defaultsDatabaseLockName]);
}
if (processName == nil)
processName = RETAIN([[[NSProcessInfo processInfo] processName]
lastPathComponent]);
processName = RETAIN([[NSProcessInfo processInfo] processName]);
// Create an empty search list
searchList = [[NSMutableArray alloc] initWithCapacity: 10];
@ -901,31 +900,41 @@ static BOOL setSharedDefaults = NO; /* Flag to prevent infinite recursion */
while (!done)
{
if ([key hasPrefix: @"-"]) {
/* anything beginning with a '-' is a defaults key and we must strip
the '-' from it. As a special case, we leave the '- in place
for '-GS...' and '--GS...' for backward compatibility. */
if ([key hasPrefix: @"-GS"] == NO && [key hasPrefix: @"--GS"] == NO) {
if ([key hasPrefix: @"-"])
{
NSString *old = nil;
/* anything beginning with a '-' is a defaults key and we must strip
the '-' from it. As a special case, we leave the '- in place
for '-GS...' and '--GS...' for backward compatibility. */
if ([key hasPrefix: @"-GS"] == YES || [key hasPrefix: @"--GS"] == YES)
{
old = key;
}
key = [key substringFromIndex: 1];
val = [enumerator nextObject];
if (!val)
{ // No more args
[argDict setObject: @"" forKey: key]; // arg is empty.
if (old)
[argDict setObject: @"" forKey: old];
done = YES;
continue;
}
else if ([val hasPrefix: @"-"])
{ // Yet another argument
[argDict setObject: @"" forKey: key]; // arg is empty.
if (old)
[argDict setObject: @"" forKey: old];
key = val;
continue;
}
else
{ // Real parameter
[argDict setObject: val forKey: key];
if (old)
[argDict setObject: val forKey: old];
}
}
val = [enumerator nextObject];
if (!val)
{ // No more args
[argDict setObject: @"" forKey: key]; // arg is empty.
done = YES;
continue;
}
else if ([val hasPrefix: @"-"])
{ // Yet another argument
[argDict setObject: @"" forKey: key]; // arg is empty.
key = val;
continue;
}
else
{ // Real parameter
[argDict setObject: val forKey: key];
}
}
done = ((key = [enumerator nextObject]) == nil);
}