luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-12 23:46:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix-monitor-root-directory-fail' into 'main'

Browse Source 
inotify: Avoid empty root directory string

See merge request GNOME/glib!3241
This commit is contained in:
Philip Withnall 2023-03-16 12:12:01 +00:00
commit 9d7c796f1e
2 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gio/inotify/inotify-sub.c
View File

@ -36,7 +36,7 @@ dup_dirname (const gchar *dirname)
gchar *d_dirname = g_strdup (dirname); gchar *d_dirname = g_strdup (dirname);
size_t len = strlen (d_dirname); size_t len = strlen (d_dirname);
if (d_dirname[len - 1] == '/') if (len > 1 && d_dirname[len - 1] == '/')
d_dirname[len - 1] = '\0'; d_dirname[len - 1] = '\0';
return d_dirname; return d_dirname;

31
gio/tests/testfilemonitor.c
View File

@ -1087,6 +1087,36 @@ test_finalize_in_callback (Fixture *fixture,
g_object_unref (file); g_object_unref (file);
} }
static void
test_root (Fixture *fixture,
gconstpointer user_data)
{
GFile *file = NULL;
GFileMonitor *monitor = NULL;
GError *local_error = NULL;
g_test_summary ("Test that GFileMonitor can monitor the root directory.");
g_test_bug ("https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3241");
#if defined(G_OS_UNIX)
file = g_file_new_for_path ("/");
#elif defined(G_OS_WIN32)
file = g_file_new_for_path ("C:\\");
#else
g_test_skip ("Unsupported root directory");
return;
#endif
/* We can’t test for any monitor events, but we can at least check that this
* doesn’t crash or error. */
monitor = g_file_monitor_directory (file, G_FILE_MONITOR_NONE, NULL, &local_error);
g_assert_no_error (local_error);
g_assert_nonnull (monitor);
g_clear_object (&monitor);
g_clear_object (&file);
}
int int
main (int argc, char *argv[]) main (int argc, char *argv[])
{ {
@ -1099,6 +1129,7 @@ main (int argc, char *argv[])
g_test_add ("/monitor/cross-dir-moves", Fixture, NULL, setup, test_cross_dir_moves, teardown); g_test_add ("/monitor/cross-dir-moves", Fixture, NULL, setup, test_cross_dir_moves, teardown);
g_test_add ("/monitor/file/hard-links", Fixture, NULL, setup, test_file_hard_links, teardown); g_test_add ("/monitor/file/hard-links", Fixture, NULL, setup, test_file_hard_links, teardown);
g_test_add ("/monitor/finalize-in-callback", Fixture, NULL, setup, test_finalize_in_callback, teardown); g_test_add ("/monitor/finalize-in-callback", Fixture, NULL, setup, test_finalize_in_callback, teardown);
g_test_add ("/monitor/root", Fixture, NULL, setup, test_root, teardown);
return g_test_run (); return g_test_run ();
} }