gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-04-23 05:32:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Enhance unmount with eject support on certain platforms, generate NSWorkspaceWillUnmountNotification notification.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@39370 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Riccardo Mottola 2016-02-13 22:20:20 +00:00
parent 572d15360e
commit 2589ad3e7d
2 changed files with 63 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2016-02-13 Riccardo Mottola <rm@gnu.org>
* Source/NSWorkspace.m (unmountAndEjectDeviceAtPath:)
Enhance unmount with eject support on certain platforms, generate NSWorkspaceWillUnmountNotification notification.
2016-02-12 Riccardo Mottola <rm@gnu.org>
* Source/NSWorkspace.m

73
Source/NSWorkspace.m
View file

@ -1804,44 +1804,87 @@ launchIdentifiers: (NSArray **)identifiers
}
/*
* Unmounting a Device
* Unmounting a Device and eject if possible
*/
- (BOOL) unmountAndEjectDeviceAtPath: (NSString*)path
{
NSUInteger systype = [[NSProcessInfo processInfo] operatingSystem];
NSDictionary *userinfo;
NSTask *task;
BOOL flag = NO;
/* let's check if it is a local volume we may unmount */
if (![[self mountedLocalVolumePaths] containsObject:path])
{
NSLog(@"unmountAndEjectDeviceAtPath: Path %@ not mounted");
return NO;
}
userinfo = [NSDictionary dictionaryWithObject: path
forKey: @"NSDevicePath"];
[_workspaceCenter postNotificationName: NSWorkspaceWillUnmountNotification
object: self
userInfo: userinfo];
// FIXME This is system specific
task = [NSTask launchedTaskWithLaunchPath: @"eject"
task = [NSTask launchedTaskWithLaunchPath: @"umount"
arguments: [NSArray arrayWithObject: path]];
if (task != nil)
if (task)
{
[task waitUntilExit];
if ([task terminationStatus] != 0)
{
return NO;
}
else
{
flag = YES;
}
}
}
else
{
return NO;
}
[_workspaceCenter postNotificationName: NSWorkspaceDidUnmountNotification
object: self
userInfo: userinfo];
return flag;
[[self notificationCenter] postNotificationName: NSWorkspaceDidUnmountNotification
object: self
userInfo: userinfo];
/* this is system specific and we try our best
and the failure of eject doesn't mean unmount failed */
task = nil;
if (systype == NSGNULinuxOperatingSystem)
{
task = [NSTask launchedTaskWithLaunchPath: @"eject"
arguments: [NSArray arrayWithObject: path]];
}
else if (systype == NSBSDOperatingSystem || systype == NSSolarisOperatingSystem)
{
NSString *mountDir;
// Note: it would be better to check the device, not the mount point
mountDir = [path lastPathComponent];
if ([mountDir rangeOfString:@"cd"].location != NSNotFound ||
[mountDir rangeOfString:@"dvd"].location != NSNotFound)
{
task = [NSTask launchedTaskWithLaunchPath: @"eject"
arguments: [NSArray arrayWithObject: @"cdrom"]];
}
else if ([mountDir rangeOfString:@"fd"].location != NSNotFound ||
[mountDir rangeOfString:@"floppy"].location != NSNotFound)
{
task = [NSTask launchedTaskWithLaunchPath: @"eject"
arguments: [NSArray arrayWithObject: @"floppy"]];
}
}
else
{
NSLog(@"Don't know how to eject on %@", systype);
}
if (task != nil)
{
[task waitUntilExit];
if ([task terminationStatus] != 0)
{
NSLog(@"eject failed");
}
}
return YES;
}
/*