* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Public License along with this library; if not, see <http://www.gnu.org/licenses/>.
*
* Author: Alexander Larsson <alexl@redhat.com>
*/
#ifdef HAVE_SYS_PARAM_H
#include <sys/param.h>
#endif
-#ifdef HAVE_SYS_POLL_H
-#include <sys/poll.h>
#endif
-#endif
-#ifdef HAVE_POLL_H
+#ifdef HAVE_POLL
#include <poll.h>
#endif
#include <stdio.h>
*
* Routines for managing mounted UNIX mount points and paths.
*
- * Note that <filename><gio/gunixmounts.h></filename> belongs to the
- * UNIX-specific GIO interfaces, thus you have to use the
- * <filename>gio-unix-2.0.pc</filename> pkg-config file when using it.
+ * Note that `<gio/gunixmounts.h>` belongs to the UNIX-specific GIO
+ * interfaces, thus you have to use the `gio-unix-2.0.pc` pkg-config
+ * file when using it.
*/
-/*
+/**
* GUnixMountType:
* @G_UNIX_MOUNT_TYPE_UNKNOWN: Unknown UNIX mount type.
* @G_UNIX_MOUNT_TYPE_FLOPPY: Floppy disk UNIX mount type.
GFileMonitor *fstab_monitor;
GFileMonitor *mtab_monitor;
+ GList *mount_poller_mounts;
+
GSource *proc_mounts_watch_source;
};
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
#endif
#if (defined(HAVE_GETVFSSTAT) || defined(HAVE_GETFSSTAT)) && defined(HAVE_FSTAB_H) && defined(HAVE_SYS_MOUNT_H)
+#include <sys/param.h>
#include <sys/ucred.h>
#include <sys/mount.h>
#include <fstab.h>
/**
* g_unix_is_mount_path_system_internal:
- * @mount_path: a mount path, e.g. <filename>/media/disk</filename>
- * or <filename>/usr</filename>
+ * @mount_path: a mount path, e.g. `/media/disk` or `/usr`
*
* Determines if @mount_path is considered an implementation of the
* OS. This is primarily used for hiding mountable and mounted volumes
"/", /* we already have "Filesystem root" in Nautilus */
"/bin",
"/boot",
+ "/compat/linux/proc",
+ "/compat/linux/sys",
"/dev",
"/etc",
"/home",
"/lib",
"/lib64",
+ "/libexec",
"/live/cow",
"/live/image",
"/media",
"/mnt",
"/opt",
+ "/rescue",
"/root",
"/sbin",
"/srv",
"/tmp",
"/usr",
+ "/usr/X11R6",
"/usr/local",
+ "/usr/obj",
+ "/usr/ports",
+ "/usr/src",
+ "/usr/xobj",
"/var",
"/var/crash",
"/var/local",
"devfs",
"devpts",
"ecryptfs",
+ "fdescfs",
"kernfs",
"linprocfs",
+ "mfs",
+ "nullfs",
"proc",
"procfs",
"ptyfs",
# else
return _PATH_MOUNTED;
# endif
-#else
+#else
return "/etc/mtab";
#endif
}
# else
return _PATH_MOUNTED;
# endif
-#else
+#else
return "/etc/mtab";
#endif
}
static GList *
_g_get_unix_mounts (void)
{
-#if defined(HAVE_GETVFSSTAT)
+#if defined(USE_STATVFS)
struct statvfs *mntent = NULL;
-#elif defined(HAVE_GETFSSTAT)
+#elif defined(USE_STATFS)
struct statfs *mntent = NULL;
#else
#error statfs juggling failed
GList *return_list;
/* Pass NOWAIT to avoid blocking trying to update NFS mounts. */
-#if defined(HAVE_GETVFSSTAT)
+#if defined(USE_STATVFS) && defined(HAVE_GETVFSSTAT)
num_mounts = getvfsstat (NULL, 0, ST_NOWAIT);
-#elif defined(HAVE_GETFSSTAT)
+#elif defined(USE_STATFS) && defined(HAVE_GETFSSTAT)
num_mounts = getfsstat (NULL, 0, MNT_NOWAIT);
#endif
if (num_mounts == -1)
bufsize = num_mounts * sizeof (*mntent);
mntent = g_malloc (bufsize);
-#if defined(HAVE_GETVFSSTAT)
+#if defined(USE_STATVFS) && defined(HAVE_GETVFSSTAT)
num_mounts = getvfsstat (mntent, bufsize, ST_NOWAIT);
-#elif defined(HAVE_GETFSSTAT)
+#elif defined(USE_STATFS) && defined(HAVE_GETFSSTAT)
num_mounts = getfsstat (mntent, bufsize, MNT_NOWAIT);
#endif
if (num_mounts == -1)
mount_entry->mount_path = g_strdup (mntent[i].f_mntonname);
mount_entry->device_path = g_strdup (mntent[i].f_mntfromname);
mount_entry->filesystem_type = g_strdup (mntent[i].f_fstypename);
-#if defined(HAVE_GETVFSSTAT)
+
+#if defined(USE_STATVFS)
if (mntent[i].f_flag & ST_RDONLY)
-#elif defined(HAVE_GETFSSTAT)
+#elif defined(USE_STATFS)
if (mntent[i].f_flags & MNT_RDONLY)
+#else
+ #error statfs juggling failed
#endif
mount_entry->is_read_only = TRUE;
if (monitor_file)
{
if (stat (monitor_file, &buf) == 0)
- return (guint64)buf.st_mtime;
+ return (guint64)buf.st_mtime;
+ }
+ else
+ {
+ return mount_poller_time;
}
return 0;
}
if (monitor_file)
{
if (stat (monitor_file, &buf) == 0)
- return (guint64)buf.st_mtime;
+ return (guint64)buf.st_mtime;
}
return 0;
}
mount_entry = l->data;
if (!found && strcmp (mount_path, mount_entry->mount_path) == 0)
- found = mount_entry;
+ found = mount_entry;
else
- g_unix_mount_free (mount_entry);
+ g_unix_mount_free (mount_entry);
}
g_list_free (mounts);
g_object_unref (monitor->mtab_monitor);
}
+ g_list_free_full (monitor->mount_poller_mounts, (GDestroyNotify)g_unix_mount_free);
+
the_mount_monitor = NULL;
G_OBJECT_CLASS (g_unix_mount_monitor_parent_class)->finalize (object);
return TRUE;
}
+static gboolean
+mount_change_poller (gpointer user_data)
+{
+ GUnixMountMonitor *mount_monitor;
+ GList *current_mounts, *new_it, *old_it;
+ gboolean has_changed = FALSE;
+
+ mount_monitor = user_data;
+ current_mounts = _g_get_unix_mounts ();
+
+ for ( new_it = current_mounts, old_it = mount_monitor->mount_poller_mounts;
+ new_it != NULL && old_it != NULL;
+ new_it = g_list_next (new_it), old_it = g_list_next (old_it) )
+ {
+ if (g_unix_mount_compare (new_it->data, old_it->data) != 0)
+ {
+ has_changed = TRUE;
+ break;
+ }
+ }
+ if (!(new_it == NULL && old_it == NULL))
+ has_changed = TRUE;
+
+ g_list_free_full (mount_monitor->mount_poller_mounts,
+ (GDestroyNotify)g_unix_mount_free);
+
+ mount_monitor->mount_poller_mounts = current_mounts;
+
+ if (has_changed)
+ {
+ mount_poller_time = (guint64)g_get_monotonic_time ();
+ g_signal_emit (mount_monitor, signals[MOUNTS_CHANGED], 0);
+ }
+
+ return TRUE;
+}
+
static void
g_unix_mount_monitor_init (GUnixMountMonitor *monitor)
{
g_signal_connect (monitor->mtab_monitor, "changed", (GCallback)mtab_file_changed, monitor);
}
}
+ else
+ {
+ monitor->proc_mounts_watch_source = g_timeout_source_new_seconds (3);
+ monitor->mount_poller_mounts = _g_get_unix_mounts ();
+ mount_poller_time = (guint64)g_get_monotonic_time ();
+ g_source_set_callback (monitor->proc_mounts_watch_source,
+ (GSourceFunc)mount_change_poller,
+ monitor, NULL);
+ g_source_attach (monitor->proc_mounts_watch_source,
+ g_main_context_get_thread_default ());
+ g_source_unref (monitor->proc_mounts_watch_source);
+ }
}
/**
return type;
}
-/*
+/**
* g_unix_mount_guess_type:
* @mount_entry: a #GUnixMount.
*
mount_entry->filesystem_type);
}
-/*
+/**
* g_unix_mount_point_guess_type:
* @mount_point: a #GUnixMountPoint.
*
projects / platform / upstream / glib.git / blobdiff