Released 3.3.2

Newest Meson requires Python 3.5.which isn't available in Trusty.
Pip version pin no longer necessary.

.travis.yml

@@ -14,8 +14,6 @@ addons:
     - gcc-6
     - python-docutils
     - python3-pip
-before_install:
-   - sudo -H python3 -m pip install pip==8.1.1
 install: test/travis-install.sh
 script: test/travis-build.sh
 

AUTHORS

@@ -19,9 +19,11 @@ Anatol Pomozov <anatol.pomozov@gmail.com>
 Benjamin Fleischer <fleiben@gmail.com>
 Berserker <berserker.troll@yandex.com>
 Bill Zissimopoulos <billziss@navimatics.com>
+Brandon Carter <b-carter@users.noreply.github.com>
 Chris Wolfe <cwolfe@chromium.org>
 gala <gala132@users.noreply.github.com>
 George Vlahavas <vlahavas@gmail.com>
+G.raud Meyer <graud@gmx.com>
 harrim4n <git@harrim4n.com>
 Jakub Jelen <jjelen@redhat.com>
 Julio Merino <jmmv@google.com>
@@ -32,6 +34,8 @@ Miklos Szeredi <mszeredi@suse.cz>
 Nikolaus Rath <Nikolaus@rath.org>
 Percy Jahn <email@percyjahn.de>
 Qais Patankar <qaisjp@gmail.com>
+Reid Wagner <wagnerreid@gmail.com>
 Rian Hunter <rian@alum.mit.edu>
+Timo Savola <timo.savola@iki.fi>
 tpoindessous <thomas@poindessous.com>
 Zoltan Kuscsik <zoltan.kuscsik@linaro.org>

ChangeLog.rst

@@ -1,3 +1,16 @@
+Release 3.3.2 (2018-04-29)
+--------------------------
+
+* New `renamexdev` workaround.
+
+Release 3.3.1 (2017-10-25)
+--------------------------
+
+* Manpage is now installed in correct directory.
+* SSHFS now supports (or rather: ignores) some options that it may
+  receive as result of being mounted from ``/etc/mtab``. This includes
+  things like ``user``, ``netdev``, or ``auto``.
+
 SSHFS 3.3.0 (2017-09-20)
 ------------------------
 

README.rst

@@ -51,7 +51,7 @@ To build and install, we recommend to use Meson_ (version 0.38 or
 newer) and Ninja_.  After extracting the sshfs tarball, create a
 (temporary) build directory and run Meson::
 
-    $ md build; cd build
+    $ mkdir build; cd build
     $ meson ..
 
 Normally, the default build options will work fine. If you
@@ -85,8 +85,10 @@ https://lists.sourceforge.net/lists/listinfo/fuse-sshfs).
 Please report any bugs on the GitHub issue tracker at
 https://github.com/libfuse/libfuse/issues.
 
+
 Professional Support
 --------------------
 
-Professional support is available. Please contact Nikolaus Rath
-<Nikolaus@rath.org> for details.
+Professional support is offered via `Rath Consulting`_.
+
+.. _`Rath Consulting`: http://www.rath-consulting.biz

make_release_tarball.sh

@@ -19,7 +19,8 @@ git archive --format=tar "${TAG}" | tar -x "--directory=${TAG}"
 find "${TAG}" -name .gitignore -delete
 rm "${TAG}/make_release_tarball.sh" \
    "${TAG}/.travis.yml" \
-   "${TAG}/test/travis-*.sh"
+   "${TAG}/test/travis-build.sh" \
+   "${TAG}/test/travis-install.sh"
 tar -cJf "${TAG}.tar.xz" "${TAG}/"
 gpg --armor --detach-sign "${TAG}.tar.xz"
 

meson.build

@@ -1,4 +1,4 @@
-project('sshfs', 'c', version: '3.3.0',
+project('sshfs', 'c', version: '3.3.2',
         meson_version: '>= 0.38',
         default_options: [ 'buildtype=debugoptimized' ])
 
@@ -58,7 +58,7 @@ executable('sshfs', sshfs_sources,
 if rst2man.found()
     custom_target('manpages', input: [ 'sshfs.rst' ], output: [ 'sshfs.1' ],
                   command: [rst2man, '@INPUT@', '@OUTPUT@'], install: true,
-                  install_dir: join_paths(get_option('mandir'), '1'))
+                  install_dir: join_paths(get_option('mandir'), 'man1'))
 else
     message('rst2man not found, not building manual page.')
 endif

sshfs.c

@@ -214,6 +214,7 @@ struct sshfs {
 	struct fuse_args ssh_args;
 	char *workarounds;
 	int rename_workaround;
+	int renamexdev_workaround;
 	int truncate_workaround;
 	int buflimit_workaround;
 	int unrel_append;
@@ -428,9 +429,15 @@ static struct fuse_opt sshfs_opts[] = {
 	FUSE_OPT_KEY("writeback_cache=no", FUSE_OPT_KEY_DISCARD),
 	FUSE_OPT_KEY("unreliable_append", FUSE_OPT_KEY_DISCARD),
 
-	
-	FUSE_OPT_END
+	/* These may come in from /etc/fstab - we just ignore them */
+	FUSE_OPT_KEY("auto", FUSE_OPT_KEY_DISCARD),
+	FUSE_OPT_KEY("noauto", FUSE_OPT_KEY_DISCARD),
+	FUSE_OPT_KEY("user", FUSE_OPT_KEY_DISCARD),
+	FUSE_OPT_KEY("nouser", FUSE_OPT_KEY_DISCARD),
+	FUSE_OPT_KEY("users", FUSE_OPT_KEY_DISCARD),
+	FUSE_OPT_KEY("_netdev", FUSE_OPT_KEY_DISCARD),
 
+	FUSE_OPT_END
 };
 
 static struct fuse_opt workaround_opts[] = {
@@ -440,6 +447,8 @@ static struct fuse_opt workaround_opts[] = {
 	SSHFS_OPT("none",       fstat_workaround, 0),
 	SSHFS_OPT("rename",     rename_workaround, 1),
 	SSHFS_OPT("norename",   rename_workaround, 0),
+	SSHFS_OPT("renamexdev",   renamexdev_workaround, 1),
+	SSHFS_OPT("norenamexdev", renamexdev_workaround, 0),
 	SSHFS_OPT("truncate",   truncate_workaround, 1),
 	SSHFS_OPT("notruncate", truncate_workaround, 0),
 	SSHFS_OPT("buflimit",   buflimit_workaround, 1),
@@ -2146,7 +2155,8 @@ static int sshfs_opendir(const char *path, struct fuse_file_info *fi)
 	if (!err) {
 		buf_finish(handle);
 		fi->fh = (unsigned long) handle;
-	}
+	} else
+		free(handle);
 	buf_free(&buf);
 	return err;
 }
@@ -2326,6 +2336,8 @@ static int sshfs_rename(const char *from, const char *to, unsigned int flags)
 			}
 		}
 	}
+	if (err == -EPERM && sshfs.renamexdev_workaround)
+		err = -EXDEV;
 	return err;
 }
 
@@ -3358,6 +3370,7 @@ static void usage(const char *progname)
 "    -o workaround=LIST     colon separated list of workarounds\n"
 "             none             no workarounds enabled\n"
 "             [no]rename       fix renaming to existing file (default: off)\n"
+"             [no]renamexdev   fix moving across filesystems (default: off)\n"
 "             [no]truncate     fix truncate for old servers (default: off)\n"
 "             [no]buflimit     fix buffer fillup bug in server (default: on)\n"
 "             [no]fstat        always use stat() instead of fstat() (default: off)\n"
@@ -3844,6 +3857,7 @@ int main(int argc, char *argv[])
 #else
 	sshfs.rename_workaround = 0;
 #endif
+	sshfs.renamexdev_workaround = 0;
 	sshfs.truncate_workaround = 0;
 	sshfs.buflimit_workaround = 1;
 	sshfs.ssh_ver = 2;

sshfs.rst

@@ -107,6 +107,8 @@ Options
 
    :rename: Emulate overwriting an existing file by deleting and
         renaming.
+   :renamexdev: Make rename fail with EXDEV instead of the default EPERM
+        to allow moving files across remote filesystems.
    :truncate: Work around servers that don't support truncate by
         coping the whole file, truncating it locally, and sending it
         back.
@@ -228,6 +230,17 @@ removed it, but before SSHFS had the time to rename the old file. In
 this case, the rename will still fail.
 
 
+Permission denied when moving files across remote filesystems
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Most SFTP servers return only a generic "failure" when failing to rename
+across filesystem boundaries (EXDEV).  sshfs normally converts this generic
+failure to a permission denied error (EPERM).  If the option ``-o
+workaround=renamexdev`` is given, generic failures will be considered EXDEV
+errors which will make programs like `mv(1)` attempt to actually move the
+file after the failed rename.
+
+
 SSHFS hangs
 ~~~~~~~~~~~
 

test/meson.build

@@ -2,7 +2,7 @@ test_scripts = [ 'conftest.py', 'pytest.ini', 'test_sshfs.py',
                  'util.py' ]
 custom_target('test_scripts', input: test_scripts,
               output: test_scripts, build_by_default: true,
-              command: ['cp', '-fP', '--preserve=mode',
+              command: ['cp', '-fPp', 
                         '@INPUT@', meson.current_build_dir() ])
 
 # Provide something helpful when running 'ninja test'

test/travis-install.sh

@@ -2,7 +2,8 @@
 
 set -e
 
-sudo python3 -m pip install pytest meson
+# Meson 0.45 requires Python 3.5 or newer
+sudo python3 -m pip install pytest meson==0.44
 wget https://github.com/ninja-build/ninja/releases/download/v1.7.2/ninja-linux.zip
 unzip ninja-linux.zip
 chmod 755 ninja