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

On trash, if rename fails with EXDEV, return G_IO_ERROR_NOT_SUPPORTED

Browse Source 
Sometimes it seems like the trash dir and the file are on the same
filesystem but the rename fails with EXDEV anyway (can happen
e.g. with bind mounts or multiple mounts of the same device). In this
case we want to return the right error so that apps can fallback to
regular delete.
This commit is contained in:
Alexander Larsson 2009-04-02 19:01:56 +02:00
parent 20df6b6e88
commit 1ce74b0dd3
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
gio/glocalfile.c
View File

@ -1921,11 +1921,20 @@ g_local_file_trash (GFile *file,
g_free (trashname); g_free (trashname);
g_free (infofile); g_free (infofile);
g_free (trashfile); g_free (trashfile);
g_set_error (error, G_IO_ERROR, if (errsv == EXDEV)
g_io_error_from_errno (errsv), /* The trash dir was actually on another fs anyway!?
_("Unable to trash file: %s"), This can happen when the same device is mounted multiple
g_strerror (errsv)); times, or with bind mounts of the same fs. */
g_set_error (error, G_IO_ERROR,
G_IO_ERROR_NOT_SUPPORTED,
_("Unable to trash file: %s"),
g_strerror (errsv));
else
g_set_error (error, G_IO_ERROR,
g_io_error_from_errno (errsv),
_("Unable to trash file: %s"),
g_strerror (errsv));
return FALSE; return FALSE;
} }