From 8a43fcaa0943de68ef6b28e2d24e4478c120f21c Mon Sep 17 00:00:00 2001 From: esersale Date: Thu, 13 May 2004 12:31:47 +0000 Subject: [PATCH] *** empty log message *** git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@19300 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 5 +++++ Source/NSWorkspace.m | 29 ++++++++++++++++++----------- 2 files changed, 23 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index ff791dc1a..36c44ca4d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-05-04 Enrico Sersale + + * Source/NSWorkspace.m ([NSWorkspace -mountedRemovableMedia]): + Doesn't consider a final empty line in mtab. + 2004-05-12 16:50 Alexander Malmberg * Source/NSParagraphStyle.m (+defaultWritingDirectionForLanguage:): diff --git a/Source/NSWorkspace.m b/Source/NSWorkspace.m index 57fd130db..886f7178e 100644 --- a/Source/NSWorkspace.m +++ b/Source/NSWorkspace.m @@ -1288,19 +1288,26 @@ inFileViewerRootedAtPath: (NSString*)rootFullpath for (i = 0; i < [mounts count]; i++) { - NSArray *parts; - NSString *type; - - parts = [[names objectAtIndex: i] componentsSeparatedByString: @" "]; - type = [parts objectAtIndex: 2]; - if ([type isEqualToString: @"proc"] == NO - && [type isEqualToString: @"devpts"] == NO - && [type isEqualToString: @"shm"] == NO) + NSString *mount = [mounts objectAtIndex: i]; + + if ([mount length]) { - [names addObject: [parts objectAtIndex: 1]]; - } + NSArray *parts = [mount componentsSeparatedByString: @" "]; + + if ([parts count] >= 2) + { + NSString *type = [parts objectAtIndex: 2]; + + if ([type isEqualToString: @"proc"] == NO + && [type isEqualToString: @"devpts"] == NO + && [type isEqualToString: @"shm"] == NO) + { + [names addObject: [parts objectAtIndex: 1]]; + } + } + } } - + return names; }