DeforaOS/Browser
DeforaOS/Browser
2
0
Fork 0
Code Issues 2 Pull Requests Packages Projects Releases Wiki Activity

Hopefully improved portability when unmounting devices

Browse Source
This commit is contained in:
Pierre Pronchery 2014-01-08 21:28:02 -06:00
parent 9910649ad2
commit 96e55006b8
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/plugins/volumes.c
View File

@ -20,13 +20,20 @@
#include <string.h> #include <string.h>
#include <errno.h> #include <errno.h>
#include <libintl.h> #include <libintl.h>
#ifndef __GNU__ /* XXX hurd portability */
# include <sys/mount.h>
# if defined(__linux__) || defined(__CYGWIN__)
# define unmount(a, b) umount(a)
# endif
# ifndef unmount
# define unmount unmount
# endif
#endif
#if defined(__FreeBSD__) #if defined(__FreeBSD__)
# include <sys/param.h> # include <sys/param.h>
# include <sys/ucred.h> # include <sys/ucred.h>
# include <sys/mount.h>
#elif defined(__NetBSD__) #elif defined(__NetBSD__)
# include <sys/param.h> # include <sys/param.h>
# include <sys/mount.h>
# include <sys/types.h> # include <sys/types.h>
# include <sys/statvfs.h> # include <sys/statvfs.h>
#endif #endif
@ -454,13 +461,13 @@ static void _volumes_on_unmount(GtkWidget * widget, gpointer data)
gchar * mountpoint; gchar * mountpoint;
mountpoint = g_object_get_data(G_OBJECT(widget), "mountpoint"); mountpoint = g_object_get_data(G_OBJECT(widget), "mountpoint");
#ifdef MNT_FORCE #ifndef unmount
errno = ENOSYS;
#else
if(unmount(mountpoint, 0) != 0) if(unmount(mountpoint, 0) != 0)
#endif
volumes->helper->error(volumes->helper->browser, volumes->helper->error(volumes->helper->browser,
strerror(errno), 1); strerror(errno), 1);
#else
volumes->helper->error(volumes->helper->browser, strerror(ENOTSUP), 1);
#endif
g_free(mountpoint); g_free(mountpoint);
} }