Skip to content

Commit

Permalink
update SSHFS to latest upstream version (3.7.1)
Browse files Browse the repository at this point in the history
  • Loading branch information
billziss-gh committed Jan 12, 2021
1 parent 4c6041c commit d91f320
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 13 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
MyProductName = "SSHFS-Win"
MyCompanyName = "Navimatics LLC"
MyDescription = "SSHFS for Windows"
MyProductVersion = "2021.1 Beta"
MyVersion = 3.5.$(shell date '+%y%j')
MyProductVersion = "2021.1 Beta2"
MyVersion = 3.7.$(shell date '+%y%j')
ifeq ($(shell uname -m),x86_64)
MyArch = x64
else
Expand Down
12 changes: 6 additions & 6 deletions patches/00-passwd.patch
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/sshfs.c b/sshfs.c
index 06a1ef3..e1e39e2 100644
index ff40c81..5c8d4b8 100644
--- a/sshfs.c
+++ b/sshfs.c
@@ -273,7 +273,7 @@ struct sshfs {
@@ -365,7 +365,7 @@ struct sshfs {
unsigned outstanding_len;
unsigned max_outstanding_len;
pthread_cond_t outstanding_cond;
Expand All @@ -11,15 +11,15 @@ index 06a1ef3..e1e39e2 100644
char *password;
int ext_posix_rename;
int ext_statvfs;
@@ -403,6 +403,7 @@ static struct fuse_opt sshfs_opts[] = {
@@ -496,6 +496,7 @@ static struct fuse_opt sshfs_opts[] = {
SSHFS_OPT("follow_symlinks", follow_symlinks, 1),
SSHFS_OPT("no_check_root", no_check_root, 1),
SSHFS_OPT("password_stdin", password_stdin, 1),
+ SSHFS_OPT("password_stdout", password_stdout, 1),
SSHFS_OPT("delay_connect", delay_connect, 1),
SSHFS_OPT("slave", slave, 1),
SSHFS_OPT("disable_hardlink", disable_hardlink, 1),
@@ -1532,6 +1533,14 @@ static int sftp_init()
SSHFS_OPT("slave", passive, 1),
SSHFS_OPT("passive", passive, 1),
@@ -1691,6 +1692,14 @@ static int sftp_init(struct conn *conn)

out:
buf_free(&buf);
Expand Down
4 changes: 2 additions & 2 deletions patches/10-mountpoint.patch
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/sshfs.c b/sshfs.c
index 06a1ef3..dc772c7 100644
index 5c8d4b8..e253291 100644
--- a/sshfs.c
+++ b/sshfs.c
@@ -3446,6 +3446,9 @@ static int sshfs_opt_proc(void *data, const char *arg, int key,
@@ -3703,6 +3703,9 @@ static int sshfs_opt_proc(void *data, const char *arg, int key,
* Furthermore the mountpoint must NOT exist prior to mounting.
* So we cannot use realpath(3).
*/
Expand Down
4 changes: 3 additions & 1 deletion patches/20-mountmgr.patch
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
diff --git a/sshfs.c b/sshfs.c
index e253291..ae4955a 100644
--- a/sshfs.c
+++ b/sshfs.c
@@ -3462,6 +3462,15 @@
@@ -3710,6 +3710,15 @@ static int sshfs_opt_proc(void *data, const char *arg, int key,
&& ':' == arg[1] && '\0' == arg[2]) {
/* drive: make a copy */
sshfs.mountpoint = strdup(arg);
Expand Down
2 changes: 1 addition & 1 deletion sshfs
2 changes: 1 addition & 1 deletion sshfs-win.c
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* sshfs-win.c
*
* Copyright 2015-2019 Bill Zissimopoulos
* Copyright 2015-2021 Bill Zissimopoulos
*/
/*
* This file is part of SSHFS-Win.
Expand Down

0 comments on commit d91f320

Please sign in to comment.