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

Simplify and make behavior more consistent on ms-windows

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@21886 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-Macdonald 2005-10-27 08:39:53 +00:00
parent 6fd11aeb72
commit 971715a9b0
2 changed files with 7 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -3,6 +3,9 @@
* Tools/AGSParser.m: Fix error setting version numbers for the
various standards. Was causing generation of html erroneously
saying that things were in neither openstep nor macos-x
* Source/NSPathUtilities.m: Remove windows-specific hack which
got a few values from the registry ... we want to make use of
the GNUstep.conf file simple/consistent across all platforms.
2005-10-26 Richard Frith-Macdonald <rfm@gnu.org>

29
Source/NSPathUtilities.m
View file

@ -389,12 +389,12 @@ GNUstepConfig(void)
NS_DURING
{
NSString *file;
NSString *file = nil;
conf = [[NSMutableDictionary alloc] initWithCapacity: 32];
/* Now we source the configuration file if it exists */
#ifndef OPTION_NO_ENVIRONMENT
#if !defined(OPTION_NO_ENVIRONMENT)
file = [[[NSProcessInfo processInfo] environment]
objectForKey: @"GNUSTEP_CONFIG_FILE"];
#endif
@ -515,27 +515,6 @@ static void InitialisePathUtilities(void)
ExtractValuesFromConfig(userConfig);
DESTROY(userConfig);
#if defined(__WIN32__)
{
HKEY regkey;
/* Initialise Win32 things if on that platform */
Win32Initialise(); // should be called by DLL_PROCESS_ATTACH
regkey = Win32OpenRegistry(HKEY_LOCAL_MACHINE,
"\\Software\\GNU\\GNUstep");
if (regkey != (HKEY)NULL)
{
TEST_ASSIGN(gnustepSystemRoot,
Win32NSStringFromRegistry(regkey, @"GNUSTEP_SYSTEM_ROOT"));
TEST_ASSIGN(gnustepNetworkRoot,
Win32NSStringFromRegistry(regkey, @"GNUSTEP_NETWORK_ROOT"));
TEST_ASSIGN(gnustepLocalRoot,
Win32NSStringFromRegistry(regkey, @"GNUSTEP_LOCAL_ROOT"));
RegCloseKey(regkey);
}
}
#endif
[gnustep_global_lock unlock];
}
NS_HANDLER
@ -602,7 +581,7 @@ static void ShutdownPathUtilities(void)
* A backslash followed immediately by a newline (except in a singly
* quoted string) is removed completely along with the newline ... it
* thus serves to join lines so that they are treated as a single line.<br />
* NB. Since windows uses backslash characters in paths, it is a good
* NB. Since ms-windows uses backslash characters in paths, it is a good
* idea to specify path values in the config file as singly quoted
* strings to avoid having to double all occurrances of the backslash.<br />
* Returns a dictionary of the (key,value) pairs.<br/ >
@ -905,7 +884,7 @@ GSSetUserName(NSString *aName)
* Return the caller's login name as an NSString object.<br/ >
* Under unix-like systems, the name associated with the current
* effective user ID is used.<br/ >
* Under ms-windows, the 'LOGNAME' environemnt is used, or if that fails, the
* Under ms-windows, the 'LOGNAME' environment is used, or if that fails, the
* GetUserName() call is used to find the user name.
*/
/* NOTE FOR DEVELOPERS.