Changeset View
Changeset View
Standalone View
Standalone View
devel/glib20/files/patch-gio_gunixmount.c
--- gio/gunixmount.c.orig 2014-09-21 13:00:08.875162804 +0200 | --- gio/gunixmount.c.orig 2020-05-20 10:46:43 UTC | ||||
+++ gio/gunixmount.c 2014-09-21 13:00:14.327163623 +0200 | +++ gio/gunixmount.c | ||||
@@ -353,12 +353,17 @@ | @@ -356,12 +356,22 @@ g_unix_mount_eject (GMount *mount, | ||||
gpointer user_data) | gpointer user_data) | ||||
{ | { | ||||
GUnixMount *unix_mount = G_UNIX_MOUNT (mount); | GUnixMount *unix_mount = G_UNIX_MOUNT (mount); | ||||
+#ifndef __FreeBSD__ | +#ifdef __FreeBSD__ | ||||
+ char *argv[] = {"cdcontrol", "-f", NULL, "eject", NULL}; | |||||
+ | |||||
+ if (unix_mount->mount_path != NULL) | |||||
+ argv[2] = unix_mount->mount_path; | |||||
+ else | |||||
+ argv[2] = unix_mount->device_path; | |||||
+#else | |||||
+ | |||||
char *argv[] = {"eject", NULL, NULL}; | char *argv[] = {"eject", NULL, NULL}; | ||||
if (unix_mount->mount_path != NULL) | if (unix_mount->mount_path != NULL) | ||||
argv[1] = unix_mount->mount_path; | argv[1] = unix_mount->mount_path; | ||||
else | else | ||||
argv[1] = unix_mount->device_path; | argv[1] = unix_mount->device_path; | ||||
+#else | |||||
+ char *argv[] = {"cdcontrol", "-f", NULL, "eject", NULL}; | |||||
+ argv[2] = unix_mount->device_path; | |||||
+#endif | +#endif | ||||
eject_unmount_do (mount, cancellable, callback, user_data, argv); | eject_unmount_do (mount, cancellable, callback, user_data, argv); | ||||
} | } |