luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-11-22 10:19:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Issue #3819: G_FILE_MONITOR_WATCH_HARD_LINK does not monitor files on Windows.

Browse Source 
Current code was clearly considering the case of having only a filename
as a directory monitoring, instead of a hard-link monitoring. As I
assume that hard links don't exist on Windows, this case should simply
revert back to the basic file monitoring code path.
This commit is contained in:
Jehan
2025-11-07 12:09:43 +01:00
committed by Philip Withnall
parent 421fa1c9ad
commit d3a16bc03c
1 changed files with 76 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

147
gio/win32/gwin32fsmonitorutils.c
View File

@@ -245,9 +245,9 @@ g_win32_fs_monitor_init (GWin32FSMonitorPrivate *monitor,
const gchar *filename,
gboolean isfile)
{
wchar_t *wdirname_with_long_prefix = NULL;
gchar *dirname_with_long_prefix;
wchar_t *wdirname_with_long_prefix;
const gchar LONGPFX[] = "\\\\?\\";
gchar *fullpath_with_long_prefix, *dirname_with_long_prefix;
DWORD notify_filter = isfile ?
(FILE_NOTIFY_CHANGE_FILE_NAME |
FILE_NOTIFY_CHANGE_ATTRIBUTES |
@@ -260,82 +260,87 @@ g_win32_fs_monitor_init (GWin32FSMonitorPrivate *monitor,
gboolean success_attribs;
WIN32_FILE_ATTRIBUTE_DATA attrib_data = {0, };
g_return_if_fail ((filename && isfile) || (dirname && ! isfile));
if (dirname != NULL)
{
dirname_with_long_prefix = g_strconcat (LONGPFX, dirname, NULL);
wdirname_with_long_prefix = g_utf8_to_utf16 (dirname_with_long_prefix, -1, NULL, NULL, NULL);
if (isfile)
{
gchar *fullpath;
wchar_t wlongname[MAX_PATH_LONG];
wchar_t wshortname[MAX_PATH_LONG];
wchar_t *wfullpath, *wbasename_long, *wbasename_short;
fullpath = g_build_filename (dirname, filename, NULL);
fullpath_with_long_prefix = g_strconcat (LONGPFX, fullpath, NULL);
wfullpath = g_utf8_to_utf16 (fullpath, -1, NULL, NULL, NULL);
monitor->wfullpath_with_long_prefix =
g_utf8_to_utf16 (fullpath_with_long_prefix, -1, NULL, NULL, NULL);
/* ReadDirectoryChangesW() can return the normal filename or the
* "8.3" format filename, so we need to keep track of both these names
* so that we can check against them later when it returns
*/
if (GetLongPathNameW (monitor->wfullpath_with_long_prefix, wlongname, MAX_PATH_LONG) == 0)
{
wbasename_long = wcsrchr (monitor->wfullpath_with_long_prefix, L'\\');
monitor->wfilename_long = wbasename_long != NULL ?
wcsdup (wbasename_long + 1) :
wcsdup (wfullpath);
}
else
{
wbasename_long = wcsrchr (wlongname, L'\\');
monitor->wfilename_long = wbasename_long != NULL ?
wcsdup (wbasename_long + 1) :
wcsdup (wlongname);
}
if (GetShortPathNameW (monitor->wfullpath_with_long_prefix, wshortname, MAX_PATH_LONG) == 0)
{
wbasename_short = wcsrchr (monitor->wfullpath_with_long_prefix, L'\\');
monitor->wfilename_short = wbasename_short != NULL ?
wcsdup (wbasename_short + 1) :
wcsdup (wfullpath);
}
else
{
wbasename_short = wcsrchr (wshortname, L'\\');
monitor->wfilename_short = wbasename_short != NULL ?
wcsdup (wbasename_short + 1) :
wcsdup (wshortname);
}
g_free (wfullpath);
g_free (fullpath);
}
else
{
monitor->wfilename_short = NULL;
monitor->wfilename_long = NULL;
monitor->wfullpath_with_long_prefix = g_utf8_to_utf16 (dirname_with_long_prefix, -1, NULL, NULL, NULL);
}
monitor->isfile = isfile;
}
else
{
dirname_with_long_prefix = g_strconcat (LONGPFX, filename, NULL);
monitor->wfullpath_with_long_prefix = g_utf8_to_utf16 (dirname_with_long_prefix, -1, NULL, NULL, NULL);
monitor->wfilename_long = NULL;
monitor->wfilename_short = NULL;
monitor->isfile = FALSE;
gchar *tmp_dirname = g_path_get_dirname (filename);
dirname_with_long_prefix = g_strconcat (LONGPFX, tmp_dirname, NULL);
g_free (tmp_dirname);
}
wdirname_with_long_prefix = g_utf8_to_utf16 (dirname_with_long_prefix, -1, NULL, NULL, NULL);
if (isfile)
{
gchar *fullpath;
gchar *fullpath_with_long_prefix;
wchar_t wlongname[MAX_PATH_LONG];
wchar_t wshortname[MAX_PATH_LONG];
wchar_t *wfullpath, *wbasename_long, *wbasename_short;
if (dirname)
fullpath = g_build_filename (dirname, filename, NULL);
else
fullpath = g_strdup (filename);
fullpath_with_long_prefix = g_strconcat (LONGPFX, fullpath, NULL);
wfullpath = g_utf8_to_utf16 (fullpath, -1, NULL, NULL, NULL);
monitor->wfullpath_with_long_prefix =
g_utf8_to_utf16 (fullpath_with_long_prefix, -1, NULL, NULL, NULL);
/* ReadDirectoryChangesW() can return the normal filename or the
* "8.3" format filename, so we need to keep track of both these names
* so that we can check against them later when it returns
*/
if (GetLongPathNameW (monitor->wfullpath_with_long_prefix, wlongname, MAX_PATH_LONG) == 0)
{
wbasename_long = wcsrchr (monitor->wfullpath_with_long_prefix, L'\\');
monitor->wfilename_long = wbasename_long != NULL ?
wcsdup (wbasename_long + 1) :
wcsdup (wfullpath);
}
else
{
wbasename_long = wcsrchr (wlongname, L'\\');
monitor->wfilename_long = wbasename_long != NULL ?
wcsdup (wbasename_long + 1) :
wcsdup (wlongname);
}
if (GetShortPathNameW (monitor->wfullpath_with_long_prefix, wshortname, MAX_PATH_LONG) == 0)
{
wbasename_short = wcsrchr (monitor->wfullpath_with_long_prefix, L'\\');
monitor->wfilename_short = wbasename_short != NULL ?
wcsdup (wbasename_short + 1) :
wcsdup (wfullpath);
}
else
{
wbasename_short = wcsrchr (wshortname, L'\\');
monitor->wfilename_short = wbasename_short != NULL ?
wcsdup (wbasename_short + 1) :
wcsdup (wshortname);
}
g_free (wfullpath);
g_free (fullpath);
g_free (fullpath_with_long_prefix);
}
else
{
monitor->wfilename_short = NULL;
monitor->wfilename_long = NULL;
monitor->wfullpath_with_long_prefix = g_utf8_to_utf16 (dirname_with_long_prefix, -1, NULL, NULL, NULL);
}
monitor->isfile = isfile;
success_attribs = GetFileAttributesExW (monitor->wfullpath_with_long_prefix,
GetFileExInfoStandard,
@@ -345,7 +350,7 @@ g_win32_fs_monitor_init (GWin32FSMonitorPrivate *monitor,
else
monitor->file_attribs = INVALID_FILE_ATTRIBUTES;
monitor->pfni_prev = NULL;
monitor->hDirectory = CreateFileW (wdirname_with_long_prefix != NULL ? wdirname_with_long_prefix : monitor->wfullpath_with_long_prefix,
monitor->hDirectory = CreateFileW (wdirname_with_long_prefix,
FILE_LIST_DIRECTORY,
FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE,
NULL,