luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-26 05:56:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix-trashing-sandboxed-directories' into 'main'

Browse Source 
Fix trashing sandboxed directories

Closes #2629

See merge request GNOME/glib!2583
This commit is contained in:
Philip Withnall 2022-04-05 11:58:33 +00:00
commit 259c86909f
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gio/gtrashportal.c
View File

@ -89,8 +89,12 @@ g_trash_portal_trash_file (GFile *file,
fd = g_open (path, O_RDWR | O_CLOEXEC | O_NOFOLLOW);
if (fd == -1 && errno == EISDIR)
/* If it is a directory, fall back to O_PATH */
fd = g_open (path, O_PATH | O_CLOEXEC | O_RDONLY | O_NOFOLLOW);
/* If it is a directory, fall back to O_PATH.
* Remove O_NOFOLLOW since
* a) we know it is a directory, not a symlink, and
* b) the portal reject this combination
*/
fd = g_open (path, O_PATH | O_CLOEXEC | O_RDONLY);
errsv = errno;