diff options
author | DongHun Kwak <dh0128.kwak@samsung.com> | 2021-10-29 10:31:18 +0900 |
---|---|---|
committer | DongHun Kwak <dh0128.kwak@samsung.com> | 2021-10-29 10:31:18 +0900 |
commit | c56d78b101fcc361d6cd5467c59aed4ec78c44af (patch) | |
tree | 60f4ffe43fd8b282f67f344c75648e53387695f6 /gio/glocalfile.c | |
parent | 12500068fcfd930af96d75506201fda8d829220b (diff) | |
download | glib-c56d78b101fcc361d6cd5467c59aed4ec78c44af.tar.gz glib-c56d78b101fcc361d6cd5467c59aed4ec78c44af.tar.bz2 glib-c56d78b101fcc361d6cd5467c59aed4ec78c44af.zip |
Imported Upstream version 2.67.1upstream/2.67.1
Diffstat (limited to 'gio/glocalfile.c')
-rw-r--r-- | gio/glocalfile.c | 27 |
1 files changed, 23 insertions, 4 deletions
diff --git a/gio/glocalfile.c b/gio/glocalfile.c index a87de9cc4..15738d8b8 100644 --- a/gio/glocalfile.c +++ b/gio/glocalfile.c @@ -1824,6 +1824,7 @@ _g_local_file_has_trash_dir (const char *dirname, dev_t dir_dev) { static gsize home_dev_set = 0; static dev_t home_dev; + static gboolean home_dev_valid = FALSE; char *topdir, *globaldir, *trashdir, *tmpname; uid_t uid; char uid_str[32]; @@ -1834,13 +1835,23 @@ _g_local_file_has_trash_dir (const char *dirname, dev_t dir_dev) { GStatBuf home_stat; - g_stat (g_get_home_dir (), &home_stat); - home_dev = home_stat.st_dev; + if (g_stat (g_get_home_dir (), &home_stat) == 0) + { + home_dev = home_stat.st_dev; + home_dev_valid = TRUE; + } + else + { + home_dev_valid = FALSE; + } + g_once_init_leave (&home_dev_set, 1); } /* Assume we can trash to the home */ - if (dir_dev == home_dev) + if (!home_dev_valid) + return FALSE; + else if (dir_dev == home_dev) return TRUE; topdir = find_mountpoint_for (dirname, dir_dev, TRUE); @@ -1972,7 +1983,15 @@ g_local_file_trash (GFile *file, } homedir = g_get_home_dir (); - g_stat (homedir, &home_stat); + if (g_stat (homedir, &home_stat) != 0) + { + errsv = errno; + + g_set_io_error (error, + _("Error trashing file %s: %s"), + file, errsv); + return FALSE; + } is_homedir_trash = FALSE; trashdir = NULL; |