gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-06-01 09:02:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

Set up default values for environment variables.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@10323 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
CaS 2001-07-07 19:47:02 +00:00
parent df8ea1d187
commit 9c2889563b
2 changed files with 68 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2001-07-07 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSUser.m: NSSearchPathForDirectoriesInDomains() Set up
default values if environment variables are missing.
2001-07-07 Richard Frith-Macdonald <rfm@gnu.org> 2001-07-07 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSData.m: readContentsOfFile() hack added to permit reading * Source/NSData.m: readContentsOfFile() hack added to permit reading

63
Source/NSUser.m
View file

@ -404,6 +404,8 @@ NSSearchPathForDirectoriesInDomains(NSSearchPathDirectory directoryKey,
/* Double-Locking Pattern */ /* Double-Locking Pattern */
if (gnustep_system_root == nil) if (gnustep_system_root == nil)
{ {
BOOL warned = NO;
env = [[NSProcessInfo processInfo] environment]; env = [[NSProcessInfo processInfo] environment];
/* Any of the following might be nil */ /* Any of the following might be nil */
gnustep_system_root = [env objectForKey: @"GNUSTEP_SYSTEM_ROOT"]; gnustep_system_root = [env objectForKey: @"GNUSTEP_SYSTEM_ROOT"];
@ -415,18 +417,79 @@ NSSearchPathForDirectoriesInDomains(NSSearchPathDirectory directoryKey,
* character sets, language settings and similar * character sets, language settings and similar
* resources. Use fprintf to avoid recursive calls. * resources. Use fprintf to avoid recursive calls.
*/ */
warned = YES;
fprintf (stderr, fprintf (stderr,
"Warning - GNUSTEP_SYSTEM_ROOT is not set " "Warning - GNUSTEP_SYSTEM_ROOT is not set "
"- using /usr/GNUstep/System as a default\n"); "- using /usr/GNUstep/System as a default\n");
gnustep_system_root = @"/usr/GNUstep/System"; gnustep_system_root = @"/usr/GNUstep/System";
} }
gnustep_local_root = [env objectForKey: @"GNUSTEP_LOCAL_ROOT"]; gnustep_local_root = [env objectForKey: @"GNUSTEP_LOCAL_ROOT"];
TEST_RETAIN (gnustep_local_root); TEST_RETAIN (gnustep_local_root);
if (gnustep_local_root == nil)
{
if ([[gnustep_system_root lastPathComponent] isEqual:
@"System"] == YES)
{
gnustep_local_root = [[gnustep_system_root
stringByDeletingLastPathComponent]
stringByAppendingPathComponent: @"Local"];
TEST_RETAIN (gnustep_local_root);
}
else
{
gnustep_local_root = @"/usr/GNUstep/Local";
}
if (warned == NO)
{
warned = YES;
fprintf (stderr,
"Warning - GNUSTEP_LOCAL_ROOT is not set "
"- using %s\n", [gnustep_local_root lossyCString]);
}
}
gnustep_network_root = [env objectForKey: gnustep_network_root = [env objectForKey:
@"GNUSTEP_NETWORK_ROOT"]; @"GNUSTEP_NETWORK_ROOT"];
TEST_RETAIN (gnustep_network_root); TEST_RETAIN (gnustep_network_root);
if (gnustep_network_root == nil)
{
if ([[gnustep_system_root lastPathComponent] isEqual:
@"System"] == YES)
{
gnustep_network_root = [[gnustep_system_root
stringByDeletingLastPathComponent]
stringByAppendingPathComponent: @"Network"];
TEST_RETAIN (gnustep_network_root);
}
else
{
gnustep_network_root = @"/usr/GNUstep/Network";
}
if (warned == NO)
{
warned = YES;
fprintf (stderr,
"Warning - GNUSTEP_NETWORK_ROOT is not set "
"- using %s\n", [gnustep_network_root lossyCString]);
}
}
gnustep_user_root = [env objectForKey: @"GNUSTEP_USER_ROOT"]; gnustep_user_root = [env objectForKey: @"GNUSTEP_USER_ROOT"];
TEST_RETAIN (gnustep_user_root); TEST_RETAIN (gnustep_user_root);
if (gnustep_user_root == nil)
{
gnustep_user_root = [NSHomeDirectory()
stringByAppendingPathComponent: @"GNUstep"];
TEST_RETAIN (gnustep_user_root);
if (warned == NO)
{
warned = YES;
fprintf (stderr,
"Warning - GNUSTEP_USER_ROOT is not set "
"- using %s\n", [gnustep_user_root lossyCString]);
}
}
} }
[gnustep_global_lock unlock]; [gnustep_global_lock unlock];