Add -o disable_hardlink option (debian bug #670926)

Reported by Louis-David Mitterrand

3 files changed, 14 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index f694fd0..63c999b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-01-08  Miklos Szeredi <miklos@szeredi.hu>
+
+	* Add -o disable_hardlink option (debian bug #670926).  Reported
+	by Louis-David Mitterrand
+
 2014-01-07  Miklos Szeredi <miklos@szeredi.hu>
 
 	* Map SSH2_FX_FAILURE to ENOTEMPTY for rmdir.  Reported by Ross
diff --git a/sshfs.1 b/sshfs.1
index 8461fa6..4c18876 100644
--- a/sshfs.1
+++ b/sshfs.1
@@ -142,6 +142,11 @@ directly connect to PORT bypassing ssh
 \fB\-o\fR slave
 communicate over stdin and stdout bypassing network
 .TP
+\fB\-o\fR disable_hardlink
+link(2) will return with errno set to ENOSYS.  Hard links don't currently work
+perfectly on sshfs, and this confuses some programs.  If that happens try
+disabling hard links with this option.
+.TP
 \fB\-o\fR transform_symlinks
 transform absolute symlinks to relative
 .TP
diff --git a/sshfs.c b/sshfs.c
index 4d322f7..0e8d4cf 100644
--- a/sshfs.c
+++ b/sshfs.c
@@ -203,6 +203,7 @@ struct sshfs {
 	int detect_uid;
 	int idmap;
 	int nomap;
+	int disable_hardlink;
 	char *uid_file;
 	char *gid_file;
 	GHashTable *uid_map;
@@ -358,6 +359,7 @@ static struct fuse_opt sshfs_opts[] = {
 	SSHFS_OPT("password_stdin",    password_stdin, 1),
 	SSHFS_OPT("delay_connect",     delay_connect, 1),
 	SSHFS_OPT("slave",             slave, 1),
+	SSHFS_OPT("disable_hardlink",  disable_hardlink, 1),
 
 	FUSE_OPT_KEY("-p ",            KEY_PORT),
 	FUSE_OPT_KEY("-C",             KEY_COMPRESS),
@@ -2199,7 +2201,7 @@ static int sshfs_link(const char *from, const char *to)
 {
 	int err = -ENOSYS;
 
-	if (sshfs.ext_hardlink) {
+	if (sshfs.ext_hardlink && !sshfs.disable_hardlink) {
 		struct buffer buf;
 
 		buf_init(&buf, 0);
@@ -3197,6 +3199,7 @@ static void usage(const char *progname)
 "    -o sftp_server=SERV    path to sftp server or subsystem (default: sftp)\n"
 "    -o directport=PORT     directly connect to PORT bypassing ssh\n"
 "    -o slave               communicate over stdin and stdout bypassing network\n"
+"    -o disable_hardlink    link(2) will return with errno set to ENOSYS\n"
 "    -o transform_symlinks  transform absolute symlinks to relative\n"
 "    -o follow_symlinks     follow symlinks on the server\n"
 "    -o no_check_root       don't check for existence of 'dir' on server\n"