aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikolaus Rath <Nikolaus@rath.org>2016-06-23 12:10:11 -0400
committerGitHub <noreply@github.com>2016-06-23 12:10:11 -0400
commit1167c119015e79d9edc4be2f40ae7d7cf1ff32b3 (patch)
tree8c5cd5eba20638f27e00f26abfb627e533633a30
parentb2fa7593586b141298e6159f40f521d2b0f4f894 (diff)
parentf51d7b0c6a54df2bc4a61295a17b721ea0e9d00a (diff)
downloadsshfs-1167c119015e79d9edc4be2f40ae7d7cf1ff32b3.tar
sshfs-1167c119015e79d9edc4be2f40ae7d7cf1ff32b3.tar.gz
sshfs-1167c119015e79d9edc4be2f40ae7d7cf1ff32b3.tar.bz2
sshfs-1167c119015e79d9edc4be2f40ae7d7cf1ff32b3.zip
Merge pull request #20 from rianhunter/master
Require paths for truncate/fstat workarounds
-rw-r--r--sshfs.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/sshfs.c b/sshfs.c
index f41d987..ce38925 100644
--- a/sshfs.c
+++ b/sshfs.c
@@ -3996,6 +3996,14 @@ int main(int argc, char *argv[])
parse_workarounds() == -1)
exit(1);
+#if FUSE_VERSION >= 29
+ // These workarounds require the "path" argument.
+ if (sshfs.truncate_workaround || sshfs.fstat_workaround) {
+ sshfs_oper.oper.flag_nullpath_ok = 0;
+ sshfs_oper.oper.flag_nopath = 0;
+ }
+#endif
+
if (sshfs.idmap == IDMAP_USER)
sshfs.detect_uid = 1;
else if (sshfs.idmap == IDMAP_FILE) {