197 lines
5.2 KiB
Text
197 lines
5.2 KiB
Text
$NetBSD: patch-ba,v 1.5 2008/12/01 15:27:52 dmcmahill Exp $
|
|
|
|
--- gio/gunixmounts.c.orig 2008-11-24 05:45:19.000000000 +0000
|
|
+++ gio/gunixmounts.c
|
|
@@ -38,6 +38,15 @@
|
|
#ifdef HAVE_POLL_H
|
|
#include <poll.h>
|
|
#endif
|
|
+
|
|
+#ifdef HAVE_SYS_TYPES_H
|
|
+#include <sys/types.h>
|
|
+#endif
|
|
+
|
|
+#ifdef HAVE_SYS_STATVFS_H
|
|
+#include <sys/statvfs.h>
|
|
+#endif
|
|
+
|
|
#include <stdio.h>
|
|
#include <unistd.h>
|
|
#include <sys/time.h>
|
|
@@ -129,6 +138,9 @@ struct _GUnixMountMonitor {
|
|
|
|
GFileMonitor *fstab_monitor;
|
|
GFileMonitor *mtab_monitor;
|
|
+
|
|
+ guint mount_poller_source;
|
|
+ GList *mount_poller_mounts;
|
|
};
|
|
|
|
struct _GUnixMountMonitorClass {
|
|
@@ -140,6 +152,8 @@ static GUnixMountMonitor *the_mount_moni
|
|
static GList *_g_get_unix_mounts (void);
|
|
static GList *_g_get_unix_mount_points (void);
|
|
|
|
+static guint64 mount_poller_time = 0;
|
|
+
|
|
G_DEFINE_TYPE (GUnixMountMonitor, g_unix_mount_monitor, G_TYPE_OBJECT);
|
|
|
|
#define MOUNT_POLL_INTERVAL 4000
|
|
@@ -166,6 +180,7 @@ G_DEFINE_TYPE (GUnixMountMonitor, g_unix
|
|
#endif
|
|
|
|
#if defined(HAVE_GETMNTINFO) && defined(HAVE_FSTAB_H) && defined(HAVE_SYS_MOUNT_H)
|
|
+#include <sys/param.h>
|
|
#include <sys/ucred.h>
|
|
#include <sys/mount.h>
|
|
#include <fstab.h>
|
|
@@ -216,20 +231,28 @@ g_unix_is_mount_path_system_internal (co
|
|
"/", /* we already have "Filesystem root" in Nautilus */
|
|
"/bin",
|
|
"/boot",
|
|
+ "/compat/linux/proc",
|
|
+ "/compat/linux/sys",
|
|
"/dev",
|
|
"/etc",
|
|
"/home",
|
|
"/lib",
|
|
"/lib64",
|
|
+ "/libexec",
|
|
"/media",
|
|
"/mnt",
|
|
"/opt",
|
|
+ "/rescue",
|
|
"/root",
|
|
"/sbin",
|
|
"/srv",
|
|
"/tmp",
|
|
"/usr",
|
|
+ "/usr/X11R6",
|
|
"/usr/local",
|
|
+ "/usr/obj",
|
|
+ "/usr/ports",
|
|
+ "/usr/src",
|
|
"/var",
|
|
"/var/log/audit", /* https://bugzilla.redhat.com/show_bug.cgi?id=333041 */
|
|
"/var/tmp", /* https://bugzilla.redhat.com/show_bug.cgi?id=335241 */
|
|
@@ -563,7 +586,11 @@ get_mtab_monitor_file (void)
|
|
static GList *
|
|
_g_get_unix_mounts (void)
|
|
{
|
|
+#ifdef __NetBSD__
|
|
+ struct statvfs *mntent = NULL;
|
|
+#else
|
|
struct statfs *mntent = NULL;
|
|
+#endif
|
|
int num_mounts, i;
|
|
GUnixMountEntry *mount_entry;
|
|
GList *return_list;
|
|
@@ -580,8 +607,18 @@ _g_get_unix_mounts (void)
|
|
|
|
mount_entry->mount_path = g_strdup (mntent[i].f_mntonname);
|
|
mount_entry->device_path = g_strdup (mntent[i].f_mntfromname);
|
|
+#if defined(__digital__)
|
|
+ mount_entry->filesystem_type = g_strdup ("unknown");
|
|
+#else
|
|
mount_entry->filesystem_type = g_strdup (mntent[i].f_fstypename);
|
|
+#endif
|
|
+#if defined(__NetBSD__)
|
|
+ if (mntent[i].f_flag & MNT_RDONLY)
|
|
+#elif defined(__digital__)
|
|
+ if (mntent[i].f_flags & M_RDONLY)
|
|
+#else
|
|
if (mntent[i].f_flags & MNT_RDONLY)
|
|
+#endif
|
|
mount_entry->is_read_only = TRUE;
|
|
|
|
mount_entry->is_system_internal =
|
|
@@ -990,6 +1027,10 @@ get_mounts_timestamp (void)
|
|
if (stat (monitor_file, &buf) == 0)
|
|
return (guint64)buf.st_mtime;
|
|
}
|
|
+ else
|
|
+ {
|
|
+ return mount_poller_time;
|
|
+ }
|
|
return 0;
|
|
}
|
|
|
|
@@ -1131,6 +1172,13 @@ g_unix_mount_monitor_finalize (GObject *
|
|
g_object_unref (monitor->mtab_monitor);
|
|
}
|
|
|
|
+ if (monitor->mount_poller_source > 0)
|
|
+ {
|
|
+ g_source_remove (monitor->mount_poller_source);
|
|
+ g_list_foreach (monitor->mount_poller_mounts, (GFunc)g_unix_mount_free, NULL);
|
|
+ g_list_free (monitor->mount_poller_mounts);
|
|
+ }
|
|
+
|
|
the_mount_monitor = NULL;
|
|
|
|
G_OBJECT_CLASS (g_unix_mount_monitor_parent_class)->finalize (object);
|
|
@@ -1209,6 +1257,51 @@ mtab_file_changed (GFileMonitor *mo
|
|
g_signal_emit (mount_monitor, signals[MOUNTS_CHANGED], 0);
|
|
}
|
|
|
|
+static gboolean
|
|
+mount_change_poller (gpointer user_data)
|
|
+{
|
|
+ GUnixMountMonitor *mount_monitor;
|
|
+ GList *current_mounts;
|
|
+ gboolean has_changed = FALSE;
|
|
+
|
|
+ mount_monitor = user_data;
|
|
+ current_mounts = _g_get_unix_mounts ();
|
|
+
|
|
+ if (g_list_length (current_mounts) != g_list_length (mount_monitor->mount_poller_mounts))
|
|
+ {
|
|
+ g_list_foreach (mount_monitor->mount_poller_mounts, (GFunc)g_unix_mount_free, NULL);
|
|
+ has_changed = TRUE;
|
|
+ }
|
|
+ else
|
|
+ {
|
|
+ int i;
|
|
+
|
|
+ for (i = 0; i < g_list_length (current_mounts); i++)
|
|
+ {
|
|
+ GUnixMountEntry *m1;
|
|
+ GUnixMountEntry *m2;
|
|
+
|
|
+ m1 = (GUnixMountEntry *)g_list_nth_data (current_mounts, i);
|
|
+ m2 = (GUnixMountEntry *)g_list_nth_data (mount_monitor->mount_poller_mounts, i);
|
|
+ if (! has_changed && g_unix_mount_compare (m1, m2) != 0)
|
|
+ has_changed = TRUE;
|
|
+
|
|
+ g_unix_mount_free (m2);
|
|
+ }
|
|
+ }
|
|
+
|
|
+ g_list_free (mount_monitor->mount_poller_mounts);
|
|
+ mount_monitor->mount_poller_mounts = current_mounts;
|
|
+
|
|
+ if (has_changed)
|
|
+ {
|
|
+ mount_poller_time = (guint64)time (NULL);
|
|
+ g_signal_emit (mount_monitor, signals[MOUNTS_CHANGED], 0);
|
|
+ }
|
|
+
|
|
+ return TRUE;
|
|
+}
|
|
+
|
|
static void
|
|
g_unix_mount_monitor_init (GUnixMountMonitor *monitor)
|
|
{
|
|
@@ -1231,6 +1324,12 @@ g_unix_mount_monitor_init (GUnixMountMon
|
|
|
|
g_signal_connect (monitor->mtab_monitor, "changed", (GCallback)mtab_file_changed, monitor);
|
|
}
|
|
+ else
|
|
+ {
|
|
+ monitor->mount_poller_mounts = _g_get_unix_mounts ();
|
|
+ mount_poller_time = (guint64)time (NULL);
|
|
+ monitor->mount_poller_source = g_timeout_add_seconds (3, (GSourceFunc)mount_change_poller, monitor);
|
|
+ }
|
|
}
|
|
|
|
/**
|