From 91c1f2ba9e02a0eacb2ac46e87230a2709df2038 Mon Sep 17 00:00:00 2001 From: Miklos Szeredi Date: Tue, 7 Jan 2014 18:52:51 +0100 Subject: Map SSH2_FX_FAILURE to ENOTEMPTY for rmdir Reported by Ross Lagerwall --- ChangeLog | 5 +++++ sshfs.c | 7 +++++++ 2 files changed, 12 insertions(+) diff --git a/ChangeLog b/ChangeLog index c855c7d..f694fd0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2014-01-07 Miklos Szeredi + + * Map SSH2_FX_FAILURE to ENOTEMPTY for rmdir. Reported by Ross + Lagerwall + 2012-05-14 Miklos Szeredi * When checking root directory use LSTAT not STAT. This prevents diff --git a/sshfs.c b/sshfs.c index 125a368..4d322f7 100644 --- a/sshfs.c +++ b/sshfs.c @@ -1790,6 +1790,13 @@ static int sftp_request_wait(struct request *req, uint8_t type, err = -EIO; break; + case SSH_FX_FAILURE: + if (type == SSH_FXP_RMDIR) + err = -ENOTEMPTY; + else + err = -EPERM; + break; + default: err = -sftp_error_to_errno(serr); } -- cgit v1.2.3