Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Workaround for mkdir on existing directory #242

Merged
merged 2 commits into from
Jan 19, 2021
Merged

Workaround for mkdir on existing directory #242

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8e6bd20
Workaround for mkdir on existing directory
peter-belm-da Jan 16, 2021
cdb18ff
Update ChangeLog.rst
peter-belm-da Jan 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Workaround for mkdir on existing directory 
Added a secondary check so if a mkdir request fails with EPERM an access request will be tried - returning EEXIST if the access was successful. This matches the correct behaviour expected by applications such as git.
  • Loading branch information
@peter-belm-da
peter-belm-da committed Jan 16, 2021
commit 8e6bd20d4bad30546e7a334b43f084ecc3eb09a6
7 changes: 7 additions & 0 deletions sshfs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2377,6 +2377,13 @@ static int sshfs_mkdir(const char *path, mode_t mode)
// Commutes with pending write(), so we can use any connection
err = sftp_request(get_conn(NULL, NULL), SSH_FXP_MKDIR, &buf, SSH_FXP_STATUS, NULL);
buf_free(&buf);

if (err == -EPERM) {
if (sshfs.op->access(path, R_OK) == 0) {
return -EEXIST;
}
}

return err;
}

Expand Down