summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoss Lagerwall <rosslagerwall@gmail.com>2014-08-09 23:14:18 +0100
committerRoss Lagerwall <rosslagerwall@gmail.com>2014-08-09 23:14:18 +0100
commit232d6d76029dc1cbc0c76c2459f9db26b7717d28 (patch)
tree01372b9f457c3ee42f66e8f3a05e570f28bd51c3
parent4341cf2b36e408c3598bc533d9510ff6ff5b0f84 (diff)
downloadgvfs-232d6d76029dc1cbc0c76c2459f9db26b7717d28.tar.gz
fuse: Don't map EISDIR to EXDEV when renaming
vfs_rename incorrectly maps EISDIR to EXDEV when renaming. However, EISDIR occurs when the source is a file and the destination is a directory and it shouldn't be remapped. (G_IO_ERROR_WOULD_RECURSE is mapped to EXDEV instead.) https://bugzilla.gnome.org/show_bug.cgi?id=734568
-rw-r--r--client/gvfsfusedaemon.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/client/gvfsfusedaemon.c b/client/gvfsfusedaemon.c
index 12bcebb3..35719306 100644
--- a/client/gvfsfusedaemon.c
+++ b/client/gvfsfusedaemon.c
@@ -1651,12 +1651,6 @@ vfs_rename (const gchar *old_path, const gchar *new_path)
g_mutex_unlock (&fh->mutex);
file_handle_unref (fh);
}
-
- if (result == -EISDIR)
- {
- /* This makes e.g. 'mv' fall back to a recursive copy + delete operation */
- result = -EXDEV;
- }
}
else
{