luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-01 15:03:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

fileinfo: make UNIX_IS_MOUNTPOINT be TRUE for /

Browse Source 
The previously implementation considered a file to be a mountpoint if
its parent is on a different device. / is its own parent, so by this
definition it is not a mountpoint.

But / is (generally) listed in fstab, and fstab(5) defines the
directories it contains to be mountpoints. This attribute should follow
that definition (and reasonable expectation): the root directory is a
mountpoint.

So, add a special-case for the case where the file's parent has the same
st_dev and st_ino as the file, which is true only at the root.

Test this attribute at / (only on POSIX), /proc (but only on Linux), and
at many files and directories created by the test suite (which cannot be
mountpoints).
This commit is contained in:
Will Thompson
2018-06-01 15:43:27 +01:00
parent e0f82b9494
commit 0c5f084200
4 changed files with 54 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
gio/tests/live-g-file.c
View File

@@ -417,6 +417,15 @@ test_attributes (struct StructureItem item, GFileInfo * info)
G_FILE_ATTRIBUTE_STANDARD_IS_HIDDEN);
g_assert_cmpint (is_hidden, ==, TRUE);
}
/* unix::is-mountpoint */
if (posix_compat)
{
gboolean is_mountpoint =
g_file_info_get_attribute_boolean (info,
G_FILE_ATTRIBUTE_UNIX_IS_MOUNTPOINT);
g_assert_false (is_mountpoint);
}
}
static void
@@ -853,6 +862,33 @@ test_copy_move (gconstpointer test_data)
g_object_unref (root);
}
/* Test that G_FILE_ATTRIBUTE_UNIX_IS_MOUNTPOINT is TRUE for / and for another
* known mountpoint. The FALSE case is tested for many directories and files by
* test_initial_structure(), via test_attributes().
*/
static void
test_unix_is_mountpoint (gconstpointer data)
{
const gchar *path = data;
GFile *file = g_file_new_for_path (path);
GFileInfo *info;
gboolean is_mountpoint;
GError *error = NULL;
info = g_file_query_info (file, G_FILE_ATTRIBUTE_UNIX_IS_MOUNTPOINT,
G_FILE_QUERY_INFO_NONE, NULL, &error);
g_assert_no_error (error);
g_assert_nonnull (info);
is_mountpoint =
g_file_info_get_attribute_boolean (info,
G_FILE_ATTRIBUTE_UNIX_IS_MOUNTPOINT);
g_assert_true (is_mountpoint);
g_clear_object (&info);
g_clear_object (&file);
}
static void
test_create (gconstpointer test_data)
{
@@ -1342,6 +1378,18 @@ main (int argc, char *argv[])
if (!only_create_struct)
g_test_add_data_func ("/live-g-file/test_open", target_path, test_open);
if (posix_compat)
{
g_test_add_data_func ("/live-g-file/test_unix_is_mountpoint/sysroot",
"/",
test_unix_is_mountpoint);
#ifdef __linux__
g_test_add_data_func ("/live-g-file/test_unix_is_mountpoint/proc",
"/proc",
test_unix_is_mountpoint);
#endif
}
/* Write test - create */
if (write_test && (!only_create_struct))
g_test_add_data_func ("/live-g-file/test_create", target_path,