Map SSH2_FX_FAILURE to ENOTEMPTY for rmdir

Reported by Ross Lagerwall
libfuse · Jan 7, 2014 · 91c1f2b · 91c1f2b
1 parent c1d62f2
commit 91c1f2b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2014-01-07  Miklos Szeredi <[email protected]>
+
+	* Map SSH2_FX_FAILURE to ENOTEMPTY for rmdir.  Reported by Ross
+	Lagerwall
+
 2012-05-14  Miklos Szeredi <[email protected]>
 
 	* When checking root directory use LSTAT not STAT.  This prevents

diff --git 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);
 		}