From 40d40e3a1a180292936e8a3d017eb886014cf43a Mon Sep 17 00:00:00 2001 From: Richard Frith-MacDonald Date: Tue, 6 Mar 2007 11:40:17 +0000 Subject: [PATCH] Don't count '.exe' as part of program name on mswindows git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@24778 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 5 +++++ Source/NSUserDefaults.m | 12 +++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 7131fa11f..ff04d935e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-03-06 Richard Frith-Macdonald + + * Source/NSUserDefaults.m: On mswindows, don't count a '.exe' + extension as part of the process name when fetching defaults. + 2007-03-05 Nicola Pero * configure.ac: Fixed setting default GNUSTEP_*_ADMIN_APPS and diff --git a/Source/NSUserDefaults.m b/Source/NSUserDefaults.m index 309202707..b35815067 100644 --- a/Source/NSUserDefaults.m +++ b/Source/NSUserDefaults.m @@ -712,7 +712,17 @@ static BOOL setSharedDefaults = NO; /* Flag to prevent infinite recursion */ */ if (processName == nil) { - processName = RETAIN([[NSProcessInfo processInfo] processName]); + NSString *s = [[NSProcessInfo processInfo] processName]; + +#if defined(__MINGW32__) + NSString *e = [s pathExtension]; + + if (e != nil && [e caseInsensitiveCompare: @"EXE"] == NSOrderedSame) + { + s = [s stringByDeletingPathExtension]; + } +#endif + processName = [s copy]; } if (path == nil || [path isEqual: @""] == YES)