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

clean up and comment last fix

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@34033 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rfm 2011-10-20 07:09:57 +00:00
parent 142034664f
commit ba1232afff
2 changed files with 21 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,8 @@
2011-10-20 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSPathUtilities.m:
Fix for bug #34603
2011-10-19 Richard Frith-Macdonald <rfm@gnu.org> 2011-10-19 Richard Frith-Macdonald <rfm@gnu.org>
* configure.ac: fixes for gnutls detection and to use the objc * configure.ac: fixes for gnutls detection and to use the objc
@ -19,7 +24,7 @@
2011-10-19 Richard Frith-Macdonald <rfm@gnu.org> 2011-10-19 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSPathUtilities.m * Source/NSPathUtilities.m:
Fix failure to load global defaults when system layout/config is Fix failure to load global defaults when system layout/config is
locked down (problem reported by Julian Mayer). locked down (problem reported by Julian Mayer).

21
Source/NSPathUtilities.m
View file

@ -677,13 +677,13 @@ addDefaults(NSString *defs, NSMutableDictionary *conf)
{ {
#if defined(__MINGW__) #if defined(__MINGW__)
fprintf(stderr, fprintf(stderr,
"The file '%S' is writable by someone other than" "\nThe file '%S' is writable by someone other than"
" its owner (permissions 0%lo).\nIgnoring it.\n", " its owner (permissions 0%lo).\nIgnoring it.\n",
[defs fileSystemRepresentation], [defs fileSystemRepresentation],
(long)[attributes filePosixPermissions]); (long)[attributes filePosixPermissions]);
#else #else
fprintf(stderr, fprintf(stderr,
"The file '%s' is writable by someone other than" "\nThe file '%s' is writable by someone other than"
" its owner (permissions 0%lo).\nIgnoring it.\n", " its owner (permissions 0%lo).\nIgnoring it.\n",
[defs fileSystemRepresentation], [defs fileSystemRepresentation],
(long)[attributes filePosixPermissions]); (long)[attributes filePosixPermissions]);
@ -694,6 +694,11 @@ addDefaults(NSString *defs, NSMutableDictionary *conf)
{ {
NSString *s; NSString *s;
/* Here we load the string and convert to a property list
* rather than using higher-level methods likely to raise
* an exception or otherwise use the NSUserDefaults
* system and cause recursion on error.
*/
s = [[NSString allocWithZone: NSDefaultMallocZone()] s = [[NSString allocWithZone: NSDefaultMallocZone()]
initWithContentsOfFile: defs]; initWithContentsOfFile: defs];
if (nil == s) if (nil == s)
@ -705,6 +710,10 @@ addDefaults(NSString *defs, NSMutableDictionary *conf)
NS_DURING NS_DURING
{ {
d = [s propertyList]; d = [s propertyList];
if (NO == [d isKindOfClass: [NSDictionary class]])
{
d = nil;
}
} }
NS_HANDLER NS_HANDLER
{ {
@ -717,13 +726,13 @@ addDefaults(NSString *defs, NSMutableDictionary *conf)
{ {
#if defined(__MINGW__) #if defined(__MINGW__)
fprintf(stderr, fprintf(stderr,
"The file '%S' is not readable as a propety list" "\nThe file '%S' is not parseable as a property list"
".\nIgnoring it.\n", " containing a dictionary.\nIgnoring it.\n",
[defs fileSystemRepresentation]); [defs fileSystemRepresentation]);
#else #else
fprintf(stderr, fprintf(stderr,
"The file '%s' is not readable as a propety list" "\nThe file '%s' is not parseable as a property list"
".\nIgnoring it.\n", " containing a dictionary.\nIgnoring it.\n",
[defs fileSystemRepresentation]); [defs fileSystemRepresentation]);
#endif #endif
} }