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

Further config enhancements ... fix a couple of static declarations,

Browse source 
use GNUstep.conf in defaults system, and allow external defaults to
be disabled.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@22518 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2006-02-19 21:49:21 +00:00
parent 96bb9c77af
commit 83e860fbcc
7 changed files with 91 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Source/NSPathUtilities.m
View file

@ -82,6 +82,11 @@
#include <sys/types.h>
#include <stdio.h>
NSMutableDictionary* GNUstepConfig(NSDictionary *newConfig);
void GNUstepUserConfig(NSMutableDictionary *config, NSString *userName);
/* The global configuration file. The real value is read from config.h */
#ifndef GNUSTEP_TARGET_CONFIG_FILE
# define GNUSTEP_TARGET_CONFIG_FILE "/etc/GNUstep/GNUstep.conf"
@ -155,14 +160,6 @@ static NSString *localResources = nil;
static NSString *localApps = nil;
static NSString *localLibs = nil;
/* ============================= */
/* Internal function prototypes. */
/* ============================= */
static NSMutableDictionary* GNUstepConfig(NSDictionary *newConfig);
static void UserConfig(NSMutableDictionary *config, NSString *userName);
static BOOL ParseConfigurationFile(NSString *name, NSMutableDictionary *dict,
NSString *userName);
@ -363,7 +360,7 @@ static void ExtractValuesFromConfig(NSDictionary *config)
}
}
static NSMutableDictionary*
NSMutableDictionary*
GNUstepConfig(NSDictionary *newConfig)
{
static NSDictionary *config = nil;
@ -510,8 +507,8 @@ GNUstepConfig(NSDictionary *newConfig)
return AUTORELEASE([config mutableCopy]);
}
static void
UserConfig(NSMutableDictionary *config, NSString *userName)
void
GNUstepUserConfig(NSMutableDictionary *config, NSString *userName)
{
#ifdef HAVE_GETEUID
if (userName != nil)
@ -568,7 +565,7 @@ static void InitialisePathUtilities(void)
[gnustep_global_lock lock];
userName = NSUserName();
config = GNUstepConfig(nil);
UserConfig(config, userName);
GNUstepUserConfig(config, userName);
ASSIGNCOPY(gnustepUserHome, NSHomeDirectoryForUser(userName));
ExtractValuesFromConfig(config);
@ -1154,7 +1151,7 @@ GSDefaultsRootForUser(NSString *userName)
NSMutableDictionary *config;
config = GNUstepConfig(nil);
UserConfig(config, userName);
GNUstepUserConfig(config, userName);
defaultsDir = [config objectForKey: @"GNUSTEP_USER_DEFAULTS_DIR"];
if (defaultsDir == nil)
{