Fix for possibly missing config path ... use executable location

Author: rfm

Headers/Foundation/NSPathUtilities.h

@@ -73,7 +73,12 @@ GSSetUserName(NSString *aName);
  * to be read earlier.<br />
  * If you want to prevent the user specific config file from being
  * read, you must set the GNUSTEP_USER_CONFIG_FILE value in the
- * dictionary to be an empty string.
+ * dictionary to be an empty string.<br />
+ * Paths with a leading ./ or ../ in the config are interpreted
+ * relative to the config file location:  if you are supplying a
+ * dictionary to be used instead of the config file (so there is
+ * no path to the config file), you must either use absolute paths,
+ * or expect them to be relative to the program being executed.
  */
 GS_EXPORT NSMutableDictionary*
 GNUstepConfig(NSDictionary *newConfig);

Source/NSPathUtilities.m

@@ -959,10 +959,11 @@ static void ExtractValuesFromConfig(NSDictionary *config)
     {
       NS_DURING
 	{
+	  NSString	*path;
+
 	  if (newConfig == nil)
 	    {
 	      NSString		*file = nil;
-	      NSString		*path;
 	      NSEnumerator	*e;
 	      NSString      	*defs;
 	      BOOL		fromEnvironment = YES;
@@ -1022,9 +1023,7 @@ static void ExtractValuesFromConfig(NSDictionary *config)
 	      if ([file hasPrefix: @"./"] == YES
 	        || [file hasPrefix: @"../"] == YES)
 		{
-		  Class		c = [NSProcessInfo class];
-
-		  path = GSPrivateSymbolPath(c);
+		  path = GSPrivateSymbolPath([NSProcessInfo class]);
 		  // Remove library name from path
 		  path = [path stringByDeletingLastPathComponent];
 		  if (GSDebugSet(debugKey))
@@ -1132,7 +1131,15 @@ static void ExtractValuesFromConfig(NSDictionary *config)
 	  else
 	    {
 	      conf = [newConfig mutableCopy];
+
+	      /* As config came from the program rather than a file
+	       * we use the path to the executable as config path.
+	       */
+	      path = GSPrivateExecutablePath();
+	      path = [path stringByDeletingLastPathComponent];
+	      ASSIGN(gnustepConfigPath, path);
 	    }
+
 	  /* System admins may force the user and defaults paths by
 	   * setting GNUSTEP_USER_CONFIG_FILE to be an empty string.
 	   * If they simply don't define it at all, we assign a default.