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

Don't include empty paths in search list

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@24949 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rfm 2007-03-30 07:03:35 +00:00
parent a6420322d0
commit cb9df62166
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ChangeLog
View file

@ -3,6 +3,8 @@
* Source/NSPredicate.m: ([-parseOr]) Use orPredicateWithSubpredicates * Source/NSPredicate.m: ([-parseOr]) Use orPredicateWithSubpredicates
rather than andPredicateWithSubpredicates. Fix for bug #19446. rather than andPredicateWithSubpredicates. Fix for bug #19446.
* Source/unix/NSStream.m: Fix memory leak. * Source/unix/NSStream.m: Fix memory leak.
* Source/NSPathUtilities.m: NSSearchPathForDirectoriesInDomains()
Don't include empty paths.
2007-03-25 Richard Frith-Macdonald <rfm@gnu.org> 2007-03-25 Richard Frith-Macdonald <rfm@gnu.org>

4
Source/NSPathUtilities.m
View file

@ -1622,13 +1622,13 @@ NSSearchPathForDirectoriesInDomains(NSSearchPathDirectory directoryKey,
if (domainMask & mask) \ if (domainMask & mask) \
{ \ { \
path = [base_dir stringByAppendingPathComponent: add_dir]; \ path = [base_dir stringByAppendingPathComponent: add_dir]; \
if (path != nil && [paths containsObject: path] == NO) \ if ([path length] > 0 && [paths containsObject: path] == NO) \
[paths addObject: path]; \ [paths addObject: path]; \
} }
#define ADD_PLATFORM_PATH(mask, add_dir) \ #define ADD_PLATFORM_PATH(mask, add_dir) \
if (domainMask & mask) \ if (domainMask & mask) \
{ \ { \
if (add_dir != nil && [paths containsObject: add_dir] == NO) \ if ([add_dir length] > 0 && [paths containsObject: add_dir] == NO) \
[paths addObject: add_dir]; \ [paths addObject: add_dir]; \
} }