Released 2.10

Travis: use alternative workaround suggested by support.
Travis: disable trusty workaround
2017-08-03 18:00:34 +02:00 · 2017-08-03 18:00:34 +02:00 · 2017-08-03 18:00:34 +02:00 · 2017-08-03 18:00:34 +02:00 · 2017-07-13 15:55:51 +02:00 · 2017-07-12 17:10:18 +02:00
28 changed files with 1782 additions and 275 deletions
@@ -0,0 +1,25 @@
+((python-mode . ((indent-tabs-mode . nil)))
+ (autoconf-mode . ((indent-tabs-mode . t)))
+ (c-mode . ((c-file-style . "stroustrup")
+	    (indent-tabs-mode . t)
+	    (tab-width . 8)
+	    (c-basic-offset . 8)
+	    (c-file-offsets .
+			    ((block-close . 0)
+			     (brace-list-close . 0)
+			     (brace-list-entry . 0)
+			     (brace-list-intro . +)
+			     (case-label . 0)
+			     (class-close . 0)
+			     (defun-block-intro . +)
+			     (defun-close . 0)
+			     (defun-open . 0)
+			     (else-clause . 0)
+			     (inclass . +)
+			     (label . 0)
+			     (statement . 0)
+			     (statement-block-intro . +)
+			     (statement-case-intro . +)
+			     (statement-cont . +)
+			     (substatement . +)
+			     (topmost-intro . 0))))))
@@ -6,8 +6,6 @@
 # NOTE! Please use 'git ls-files -i --exclude-standard'
 # command after changing this file, to see if there are
 # any tracked files which get ignored after the change.
-.*
-!.gitignore
 *.o
 *.lo
 *.la
@@ -20,6 +18,7 @@ Makefile
 *.m4
 stamp-h*
 config.*
+sshfs.1
 /sshfs
 /ltmain.sh
 /configure
@@ -34,3 +33,4 @@ config.*
 /.pc
 /patches
 /m4
+.deps/
@@ -0,0 +1,22 @@
+sudo: required
+dist: trusty
+
+language:
+    - c
+addons:
+  apt:
+    sources:
+    - ubuntu-toolchain-r-test
+    packages:
+    - valgrind
+    - clang
+    - gcc
+    - gcc-6
+    - fuse
+    - libfuse2
+    - libfuse-dev
+before_install:
+   - pip install pip==8.1.1 && pip3 install pip==8.1.1
+install: test/travis-install.sh
+script: test/travis-build.sh
+
@@ -15,8 +15,21 @@ Contributors (autogenerated list)

 Alan Jenkins <alan.christopher.jenkins@gmail.com>
 Alexander Neumann <alexander@bumpern.de>
+Benjamin Fleischer <fleiben@gmail.com>
+Berserker <berserker.troll@yandex.com>
+Bill Zissimopoulos <billziss@navimatics.com>
 Chris Wolfe <cwolfe@chromium.org>
+gala <gala132@users.noreply.github.com>
+George Vlahavas <vlahavas@gmail.com>
+Jakub Jelen <jjelen@redhat.com>
+Julio Merino <jmmv@google.com>
+Julio Merino <jmmv@meroh.net>
 Mike Kelly <mike@pair.com>
 Miklos Szeredi <miklos@szeredi.hu>
+Miklos Szeredi <mszeredi@suse.cz>
 Nikolaus Rath <Nikolaus@rath.org>
 Percy Jahn <email@percyjahn.de>
+Qais Patankar <qaisjp@gmail.com>
+Rian Hunter <rian@alum.mit.edu>
+tpoindessous <thomas@poindessous.com>
+Zoltan Kuscsik <zoltan.kuscsik@linaro.org>
@@ -1,10 +1,49 @@
-Release 2.7 (2015-01-28)
+Release 2.10 (2017-08-03)
+-------------------------
+
+* Fixed a crash due to a race condition when listing
+  directory contents.
+* Added unit tests
+* Documented limited hardlink support.
+* Added support for building with Meson.
+* Added support for more SSH options.
+* Dropped support for the *nodelay* workaround - the last OpenSSH
+  version for which this was useful was released in 2006.
+* Dropped support for the *nodelaysrv* workaround. The same effect
+  (enabling NODELAY on the server side *and* enabling X11 forwarding)
+  can be achieved by explicitly passing `-o ForwardX11`
+* Removed support for `-o workaround=all`. Workarounds should always
+  enabled explicitly and only when needed. There is no point in always
+  enabling a potentially changing set of workarounds.
+  
+Release 2.9 (2017-04-17)
+------------------------
+
+* Improved support for Cygwin.
+* Various small bugfixes.
+
+Release 2.8 (2016-06-22)
+------------------------
+
+* Added support for the "fsync" extension.
+* Fixed a build problem with bitbake
+
+Release 2.7 (2016-03-01)
+------------------------
+
+* Integrated osxfuse's copy of sshfs, which means that sshfs now works
+  on OS X out of the box.
+* Added -o cache_max_size=N option to let users tune the maximum size of
+  the cache in number of entries.
+* Added -o cache_clean_interval=N and -o cache_min_clean_interval=N
+  options to let users tune the cleaning behavior of the cache.
+
+Release 2.6 (2015-01-28)
 ------------------------

 * New maintainer (Nikolaus Rath <Nikolaus@rath.org>)

-
-Release 2.6 (2014-01-14)
+Release 2.5 (2014-01-14)
 ------------------------

 * Some performance improvements for large directories.
@@ -0,0 +1,263 @@
+SSHFS FAQ
+=========
+
+1.     I've found a bug and there's no solution in this FAQ, what
+       should I do?
+2.     Advantage of sshfs over NFS and Samba
+3.     Create the device node
+4.     mv fails with "Operation not permitted"
+5.     cvs fails with "cvs [status aborted]: cannot get working
+       directory: No such file or directory" in a sshfs mounted directory
+6.     Changes on the server are not immediately visible in the
+       mounted directory.
+7.     Configuring the ssh connection
+8.     What are the no_readahead and sshfs_sync options for?
+9.    Why does df return strange values on partitions mounted via
+       sshfs?
+10.    How do I specify the remote mount point (since the example
+       defaults to the home directory)
+11.    sshfs hangs after a while
+12.    Following symlinks on the server side
+13.    Making absolute symlinks work
+14.    Mounting as root
+15.    Exporting via NFS
+16.    Automatical mounting using /etc/fstab
+17.    Why does SVN (etc...) fail with permission denied?
+18.    Why does SVN (etc...) fail to rename files?
+19.    Is there some neat way to do it in reverse?
+20.    Might it be reasonable to disallow loops?
+21.    How to mount through an intermediary ssh server, eg:
+       localhost -> A -> B; mount B from localhost
+22.    Alternative Solution
+23.    I seem to have successfully mounted a remote directory, but
+       performing an `ls -l` on the directory above the mount point shows
+       the mount point's attributes as `? ? ? ? ? ?`. Nothing shows up in
+       the directory either. What am I doing wrong?
+
+--------------------------------------------------------------------------
+
+1. I've found a bug and there's no solution in this FAQ, what should I do?
+
+   Please report the bug in the Github issue tracker:
+   https://github.com/libfuse/sshfs/issues
+
+   Also logs with debugging output can be useful for diagnosing the
+   problem. Try running sshfs with the following options:
+     sshfs -odebug,sshfs_debug,loglevel=debug ...
+
+   Doing strace on the application which fails may also sometimes help:
+     strace -f -o /tmp/strace application args ...
+
+   Note that large messages (over 40k) will be rejected from the mailing
+   list. So try to keep the logs as short as possible.
+
+
+2. Advantage of sshfs over NFS and Samba
+
+   Users can mount remote resources they already have ssh access to,
+   without requiring the remote machine to export the resource.
+
+   The remote resource can be mounted when it is needed in a location
+   that is convenient for the user at that time, without needing to rely
+   on a central, root-controlled file system table.
+
+   Automatic mounting, if desired, can be added to a shell script such as
+   .bashrc (provided authentication is done using RSA/DSA keys).
+
+   Resources can be mounted over slow and unreliable (distant)
+   connections.
+
+3. Create the device node
+
+   If you don't use udev, you may get this error message:
+
+   fusermount: failed to open /dev/fuse: No such device or address
+
+   Before loading the fuse kernel module, create the device node
+   manually:
+
+     mknod -m 666 /dev/fuse c 10 229
+
+4. mv fails with "Operation not permitted".
+
+   Use -o workaround=rename (requires sshfs version >= 1.3).
+
+5. cvs fails with "cvs status aborted?: cannot get working directory: No such
+   file or directory" in a sshfs mounted directory
+
+   Use the -oreaddir_ino option. Example:
+     sshfs -oreaddir_ino hostname:remote_dir mount_point
+
+6. Changes on the server are not immediately visible in the mounted directory.
+
+   By default, sshfs caches things for 20 seconds, use -o cache_timeout=N
+   to change the default cache timeout (in seconds) or -o cache=no for
+   disabling the cache.
+
+   You can also control cache timeouts for directory listing etc with
+   -o cache_stat_timeout=N,
+   -o cache_dir_timout=N, and
+   -o cache_link_timout=N.
+
+7. Configuring the ssh connection
+
+   In addition to flags like -C, -p, and -o SSHOPT...=, you may find it
+   easier to edit your /.ssh/config file. You can add an entry with any
+   customization you want, test it with ssh, and finally use it with
+   sshfs. As a bonus, you get a short mnemonic for your configuration.
+
+8. What are the no_readahead and sshfs_sync options for?
+
+   These disable read and write optimizations respectively. They don't
+   really make sense unless you're doing something special.
+
+9. Why does df return strange values on partitions mounted via sshfs?
+
+   Because the SFTP protocol doesn't have a statfs operation this is
+   currently not possible to display proper usage on remote partition.
+
+10. How do I specfy the remote mount point (since the example defaults to the
+    home directory)
+
+    The example shows:
+      sshfs hostname: mountpoint
+
+    To specify a remote mount point use:
+      sshfs hostname:remotemountpoint mountpoint
+
+    This might be obvious to others, but I ended up looking up the
+    interface to sftp to see if I could learn how to specify the remote
+    mount point, then thought about the way that scp specifies the remote
+    directory, and it worked.
+
+11. sshfs hangs after a while
+
+    Mounting works fine, I can use the files in Mountpoint as good as any
+    other files on my system, but after bit of time, changing nothing on
+    the remote files sshfs crashes. This means, I can not cd into the
+    Mountpoint (xterm hangs, nautilus hangs... every program trying to
+    access the Mountpoint gets stuck, and won't return).
+
+    Solution: add
+      ServerAliveInterval 15
+
+    in your .ssh/config (or use -o ServerAliveInterval=15 on the sshfs
+    command line but I did not test that solution). This will force the
+    ssh connection to stay alive even if you have no activity.
+
+12. Following symlinks on the server side
+
+    The -o follow_symlinks option will enable this.
+
+13. Making absolute symlinks work
+
+    Use the -o transform_symlinks option, which will transform absolute
+    symlinks (ones which point somewhere inside the mount) into relative
+    ones.
+
+14. Mounting as root
+
+    Generally it's not possible to use an sshfs mount as a "real"
+    filesystem shared between multiple users. Some of this functionality
+    can be enabled with the -o allow_other and -o default_permissions
+    options, but files will not be created with the correct ownership,
+    etc...
+
+15. Exporting via NFS
+
+    Use the userspace NFS daemon http://sourceforge.net/projects/unfs
+
+16. Automatical mounting using /etc/fstab
+
+    A line in /etc/fstab has the following format:
+      sshfs#USERNAME@REMOTE_HOST:REMOTE_PATH MOUNT_POINT fuse SSHFS_OPTIONS 0 0
+
+    eg.
+      sshfs#guest@guest.login.com:data /mnt/guest fuse \
+        uid=1003,gid=100,umask=0,allow_other 0 0
+
+17. Why does SVN (etc...) fail with permission denied?
+
+    This is a bug that happens when an application creates a read-only
+    file opened for writing (e.g. open("foo", O_WRONLY|O_CREAT, 0444))
+
+    It has been fixed in sshfs version 1.3, but also requires FUSE version
+    >=2.5.X and Linux kernel version >=2.6.15.
+
+18. Why does SVN (etc...) fail to rename files?
+
+    $ svn co svn://anonsvn.kde.org/home/kde/trunk/KDE/kdelibs
+    svn: Can't move 'kdelibs/.svn/tmp/entries' to 'kdelibs/.svn/entries':
+    Operation not permitted
+
+    The reason is that SFTP protocol version 3 (which is implemented by
+    OpenSSH's sftp-server) defines the rename operation slightly
+    differently than POSIX. The difference is that renaming to an existing
+    file or directory will fail instead of atomically replacing the old
+    file.
+
+    The -o workaround=rename option will try to emulate POSIX rename
+    semantics, but it cannot guarantee atomicity. In most of the cases
+    this doesn't matter, and things will work fine with this option.
+
+19. Is there some neat way to do it in reverse?
+
+    You want to mount a USB thumb drive onto a file server that is rather
+    remote.
+
+    Assuming this is difficult because the laptop with the thumb drive is
+    sitting behind NAT, firewalls, etc. then you need to create a
+    port-forward:
+      client$ ssh -R 2222:localhost:22 server
+      server$ sshfs -p 2222 localhost:/media/usb1 myusb1
+
+    (Now, is there is there a smarter way that does not involve port
+    opening login permissions in an undesireable direction?)
+
+20. Might it be reasonable to disallow loops?
+
+    sshfs localhost:/mnt /mnt
+
+    This seems to produce undesirable results. --JoshuaRodman
+
+21. How to mount through an intermediary ssh server, eg: localhost -> A -> B;
+    mount B from localhost
+
+    Start by mounting the folder you need that is on "a" to a folder on
+    "b" then mount the new folder that is on "a" to a folder on localhost.
+
+    IE: (These are NOT real commands, but a sequence of steps.
+    A mounts B:/home/x on /mnt/Bx
+    localhost mounts A:/mnt/Bx on ~/mydir
+
+22. Alternative Solution:
+
+    1) Create a shell script to wrap the tunneling of one ssh command over
+    another,
+      $ cat >Atunnel <<EOF
+      #!/bin/bash
+      ssh -q A ssh -q "$@"
+      EOF
+      $ chmod u+x Atunnel
+
+    N.B. make sure to put this somewhere on your path. 2) sshfs mount as
+    normal but using this script as the ssh command.
+      $ sshfs -o ssh_command='Atunnel' B: ~/mydir
+
+23. I seem to have successfully mounted a remote directory, but performing an
+    `ls -l` on the directory above the mount point shows the mount point's
+    attributes as `? ? ? ? ? ?`. Nothing shows up in the directory either. What
+    am I doing wrong?
+
+    You probably specified a remote path with the tilde (~) in it. This
+    doesn't seem to work. Instead, specify an absolute remote path:
+      sshfs username@remote.host:/home/username/whatever my/mount
+
+    What options do i use to make playing media files (music) over sshfs more
+    efficient?
+
+    MacFUSE doesn't seem to let me move files from one directory to another. It
+    first asks for my local user password (i.e. the password on my Macbook Pro)
+    and then produces the error message "The operation cannot be completed
+    because one or more required items cannot be found. (Error code -120).
+
@@ -2,30 +2,29 @@

 bin_PROGRAMS = sshfs

+SUBDIRS = test
+
 sshfs_SOURCES = sshfs.c cache.c cache.h
 if FUSE_OPT_COMPAT
 sshfs_SOURCES += compat/fuse_opt.c compat/fuse_opt.h
 endif
+if DARWIN_COMPAT
+sshfs_SOURCES += compat/darwin_compat.c compat/darwin_compat.h
+endif

 sshfs_LDADD = $(SSHFS_LIBS)
 sshfs_CFLAGS = $(SSHFS_CFLAGS)
-sshfs_CPPFLAGS = -D_REENTRANT -DFUSE_USE_VERSION=26 -DLIBDIR=\"$(libdir)\"
+sshfs_CPPFLAGS = -D_REENTRANT -DFUSE_USE_VERSION=26 -DLIBDIR=\"$(libdir)\" \
+                 -DIDMAP_DEFAULT="\"$(IDMAP_DEFAULT)\""

-EXTRA_DIST = sshnodelay.c
-CLEANFILES = sshnodelay.so
+EXTRA_DIST = sshfs.1.in meson.build
+CLEANFILES = sshfs.1 sshfs.1.tmp

 dist_man_MANS = sshfs.1

-if SSH_NODELAY_SO
-all-local: sshnodelay.so
-
-install-exec-local: sshnodelay.so
-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
-	$(INSTALL) -m 755 sshnodelay.so "$(DESTDIR)$(libdir)/sshnodelay.so"
-
-uninstall-local:
-	rm -f "$(DESTDIR)$(libdir)/sshnodelay.so"
-
-sshnodelay.so:
-	$(CC) -Wall -W -s --shared -fPIC $(sshnodelay_libs) sshnodelay.c -o sshnodelay.so
-endif
+sshfs.1: sshfs.1.in
+	$(AM_V_GEN)sed \
+	    -e 's/[@]IDMAP_DEFAULT@/$(IDMAP_DEFAULT)/g' \
+	    -e 's/[@]UNMOUNT_COMMAND@/$(UNMOUNT_COMMAND)/g' \
+	    <$(srcdir)/sshfs.1.in >sshfs.1.tmp || exit 1; \
+	mv sshfs.1.tmp sshfs.1
@@ -1,72 +0,0 @@
-Abstract
-========
-
-This is a filesystem client based on the SSH File Transfer Protocol.
-Since most SSH servers already support this protocol it is very easy
-to set up: i.e. on the server side there's nothing to do.  On the
-client side mounting the filesystem is as easy as logging into the
-server with ssh.
-
-The idea of sshfs was taken from the SSHFS filesystem distributed with
-LUFS, which I found very useful.  There were some limitations of that
-codebase, so I rewrote it.  Features of this implementation are:
-
-  - Based on FUSE (the best userspace filesystem framework for Linux ;)
-
-  - Multithreading: more than one request can be on it's way to the
-    server
-
-  - Allowing large reads (max 64k)
-
-  - Caching directory contents
-
-  - Reconnect on failure
-
-Latest version
-==============
-
-The latest version and more information can be found on
-http://github.com/libfuse/sshfs
-
-
-How to mount a filesystem
-=========================
-
-Once sshfs is installed (see next section) running it is very simple:
-
-    sshfs hostname: mountpoint
-
-Note, that it's recommended to run it as user, not as root.  For this
-to work the mountpoint must be owned by the user.  If the username is
-different on the host you are connecting to, then use the
-"username@host:" form.  If you need to enter a password sshfs will ask
-for it (actually it just runs ssh which ask for the password if
-needed).  You can also specify a directory after the ":".  The default
-is the home directory.
-
-Also many ssh options can be specified (see the manual pages for
-sftp(1) and ssh_config(5)), including the remote port number
-(`-oport=PORT`)
-
-To unmount the filesystem:
-
-    fusermount -u moutpoint
-
-
-Installing
-==========
-
-First you need to download FUSE 2.2 or later from
-http://github.com/libfuse/libfuse.
-
-You also need to install the devel package for glib2.0.  After
-installing FUSE, compile sshfs the usual way:
-
-    ./configure
-    make
-    make install (as root)
-
-And you are ready to go.
-
-If checking out from git for the first time also do `autoreconf -i`
-before doing `./configure`.
@@ -0,0 +1,132 @@
+SSHFS
+=====
+
+
+About
+-----
+
+SSHFS allows you to mount a remote filesystem using SFTP. Most SSH
+servers support and enable this SFTP access by default, so SSHFS is
+very simple to use - there's nothing to do on the server-side.
+
+
+How to use
+----------
+
+Once sshfs is installed (see next section) running it is very simple::
+
+    sshfs [user@]hostname:[directory] mountpoint
+
+It is recommended to run SSHFS as regular user (not as root).  For
+this to work the mountpoint must be owned by the user.  If username is
+omitted SSHFS will use the local username. If the directory is
+omitted, SSHFS will mount the (remote) home directory.  If you need to
+enter a password sshfs will ask for it (actually it just runs ssh
+which ask for the password if needed).
+
+Also many ssh options can be specified (see the manual pages for
+*sftp(1)* and *ssh_config(5)*), including the remote port number
+(``-oport=PORT``)
+
+To unmount the filesystem::
+
+    fusermount -u mountpoint
+
+On BSD and OS-X, to unmount the filesystem::
+
+    umount mountpoint
+
+
+Installation
+------------
+
+First, download the latest SSHFS release from
+https://github.com/libfuse/sshfs/releases. On Linux and BSD, you will
+also need to have libfuse_ installed. On OS-X, you need OSXFUSE_
+instead. Finally, you need the Glib_ development package (which should
+be available from your operating system's package manager).
+
+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
+    $ meson ..
+
+Normally, the default build options will work fine. If you
+nevertheless want to adjust them, you can do so with the *mesonconf*
+command::
+
+    $ mesonconf                  # list options 
+    $ mesonconf -D strip=true    # set an option
+
+To build, test and install SSHFS, you then use Ninja (running the
+tests requires the `py.test`_ Python module)::
+
+    $ ninja
+    $ python3 -m pytest test/    # optional, but recommended
+    $ sudo ninja install
+
+.. _libfuse: http://github.com/libfuse/libfuse
+.. _OSXFUSE: https://osxfuse.github.io/
+.. _Glib: https://developer.gnome.org/glib/stable/
+.. _Meson: http://mesonbuild.com/
+.. _Ninja: https://ninja-build.org/
+.. _`py.test`: http://www.pytest.org/
+
+Alternate Installation
+----------------------
+
+If you are not able to use Meson and Ninja, please report this to the
+sshfs mailing list. Until the problem is resolved, you may fall back
+to an in-source build using autotools::
+
+    $ ./configure
+    $ make
+    $ sudo make install
+
+Note that support for building with autotools may disappear at some
+point, so if you depend on using autotools for some reason please let
+the sshfs developers know!
+
+
+Caveats
+-------
+
+Rename
+~~~~~~
+
+Some SSH servers do not support atomically overwriting the destination
+when renaming a file. In this case you will get an error when you
+attempt to rename a file and the destination already exists. A
+workaround is to first remove the destination file, and then do the
+rename. SSHFS can do this automatically if you call it with `-o
+workaround=rename`. However, in this case it is still possible that
+someone (or something) recreates the destination file after SSHFS has
+removed it, but before SSHFS had the time to rename the old file. In
+this case, the rename will still fail.
+
+Hardlinks
+~~~~~~~~~
+
+If the SSH server supports the *hardlinks* extension, SSHFS will allow
+you to create hardlinks. However, hardlinks will always appear as
+individual files when seen through an SSHFS mount, i.e. they will
+appear to have different inodes and an *st_nlink* value of 1.
+
+
+Getting Help
+------------
+
+If you need help, please ask on the <fuse-sshfs@lists.sourceforge.net>
+mailing list (subscribe at
+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.
@@ -14,16 +14,19 @@
 #include <glib.h>
 #include <pthread.h>

-#define DEFAULT_CACHE_TIMEOUT 20
-#define MAX_CACHE_SIZE 10000
-#define MIN_CACHE_CLEAN_INTERVAL 5
-#define CACHE_CLEAN_INTERVAL 60
+#define DEFAULT_CACHE_TIMEOUT_SECS 20
+#define DEFAULT_MAX_CACHE_SIZE 10000
+#define DEFAULT_CACHE_CLEAN_INTERVAL_SECS 60
+#define DEFAULT_MIN_CACHE_CLEAN_INTERVAL_SECS 5

 struct cache {
 	int on;
-	unsigned stat_timeout;
-	unsigned dir_timeout;
-	unsigned link_timeout;
+	unsigned int stat_timeout_secs;
+	unsigned int dir_timeout_secs;
+	unsigned int link_timeout_secs;
+	unsigned int max_size;
+	unsigned int clean_interval_secs;
+	unsigned int min_clean_interval_secs;
 	struct fuse_cache_operations *next_oper;
 	GHashTable *table;
 	pthread_mutex_t lock;
@@ -70,9 +73,9 @@ static int cache_clean_entry(void *key_, struct node *node, time_t *now)
 static void cache_clean(void)
 {
 	time_t now = time(NULL);
-	if (now > cache.last_cleaned + MIN_CACHE_CLEAN_INTERVAL &&
-	    (g_hash_table_size(cache.table) > MAX_CACHE_SIZE ||
-	     now > cache.last_cleaned + CACHE_CLEAN_INTERVAL)) {
+	if (now > cache.last_cleaned + cache.min_clean_interval_secs &&
+	    (g_hash_table_size(cache.table) > cache.max_size ||
+	     now > cache.last_cleaned + cache.clean_interval_secs)) {
 		g_hash_table_foreach_remove(cache.table,
 					    (GHRFunc) cache_clean_entry, &now);
 		cache.last_cleaned = now;
@@ -172,7 +175,7 @@ void cache_add_attr(const char *path, const struct stat *stbuf, uint64_t wrctr)
 	if (wrctr == cache.write_ctr) {
 		node = cache_get(path);
 		node->stat = *stbuf;
-		node->stat_valid = time(NULL) + cache.stat_timeout;
+		node->stat_valid = time(NULL) + cache.stat_timeout_secs;
 		if (node->stat_valid > node->valid)
 			node->valid = node->stat_valid;
 		cache_clean();
@@ -188,7 +191,7 @@ static void cache_add_dir(const char *path, char **dir)
 	node = cache_get(path);
 	g_strfreev(node->dir);
 	node->dir = dir;
-	node->dir_valid = time(NULL) + cache.dir_timeout;
+	node->dir_valid = time(NULL) + cache.dir_timeout_secs;
 	if (node->dir_valid > node->valid)
 		node->valid = node->dir_valid;
 	cache_clean();
@@ -210,7 +213,7 @@ static void cache_add_link(const char *path, const char *link, size_t size)
 	node = cache_get(path);
 	g_free(node->link);
 	node->link = g_strndup(link, my_strnlen(link, size-1));
-	node->link_valid = time(NULL) + cache.link_timeout;
+	node->link_valid = time(NULL) + cache.link_timeout_secs;
 	if (node->link_valid > node->valid)
 		node->valid = node->link_valid;
 	cache_clean();
@@ -520,6 +523,10 @@ static void cache_unity_fill(struct fuse_cache_operations *oper,
 	cache_oper->ftruncate   = oper->oper.ftruncate;
 	cache_oper->fgetattr    = oper->oper.fgetattr;
 #endif
+#if FUSE_VERSION >= 29
+	cache_oper->flag_nullpath_ok = oper->oper.flag_nullpath_ok;
+	cache_oper->flag_nopath  = oper->oper.flag_nopath;
+#endif
 }

 static void cache_fill(struct fuse_cache_operations *oper,
@@ -545,6 +552,10 @@ static void cache_fill(struct fuse_cache_operations *oper,
 	cache_oper->ftruncate = oper->oper.ftruncate ? cache_ftruncate : NULL;
 	cache_oper->fgetattr = oper->oper.fgetattr ? cache_fgetattr : NULL;
 #endif
+#if FUSE_VERSION >= 29
+	cache_oper->flag_nullpath_ok = 0;
+	cache_oper->flag_nopath = 0;
+#endif

 }

@@ -570,20 +581,28 @@ struct fuse_operations *cache_init(struct fuse_cache_operations *oper)
 static const struct fuse_opt cache_opts[] = {
 	{ "cache=yes", offsetof(struct cache, on), 1 },
 	{ "cache=no", offsetof(struct cache, on), 0 },
-	{ "cache_timeout=%u", offsetof(struct cache, stat_timeout), 0 },
-	{ "cache_timeout=%u", offsetof(struct cache, dir_timeout), 0 },
-	{ "cache_timeout=%u", offsetof(struct cache, link_timeout), 0 },
-	{ "cache_stat_timeout=%u", offsetof(struct cache, stat_timeout), 0 },
-	{ "cache_dir_timeout=%u", offsetof(struct cache, dir_timeout), 0 },
-	{ "cache_link_timeout=%u", offsetof(struct cache, link_timeout), 0 },
+	{ "cache_timeout=%u", offsetof(struct cache, stat_timeout_secs), 0 },
+	{ "cache_timeout=%u", offsetof(struct cache, dir_timeout_secs), 0 },
+	{ "cache_timeout=%u", offsetof(struct cache, link_timeout_secs), 0 },
+	{ "cache_stat_timeout=%u", offsetof(struct cache, stat_timeout_secs), 0 },
+	{ "cache_dir_timeout=%u", offsetof(struct cache, dir_timeout_secs), 0 },
+	{ "cache_link_timeout=%u", offsetof(struct cache, link_timeout_secs), 0 },
+	{ "cache_max_size=%u", offsetof(struct cache, max_size), 0 },
+	{ "cache_clean_interval=%u", offsetof(struct cache,
+	                                      clean_interval_secs), 0 },
+	{ "cache_min_clean_interval=%u", offsetof(struct cache,
+	                                          min_clean_interval_secs), 0 },
 	FUSE_OPT_END
 };

 int cache_parse_options(struct fuse_args *args)
 {
-	cache.stat_timeout = DEFAULT_CACHE_TIMEOUT;
-	cache.dir_timeout = DEFAULT_CACHE_TIMEOUT;
-	cache.link_timeout = DEFAULT_CACHE_TIMEOUT;
+	cache.stat_timeout_secs = DEFAULT_CACHE_TIMEOUT_SECS;
+	cache.dir_timeout_secs = DEFAULT_CACHE_TIMEOUT_SECS;
+	cache.link_timeout_secs = DEFAULT_CACHE_TIMEOUT_SECS;
+	cache.max_size = DEFAULT_MAX_CACHE_SIZE;
+	cache.clean_interval_secs = DEFAULT_CACHE_CLEAN_INTERVAL_SECS;
+	cache.min_clean_interval_secs = DEFAULT_MIN_CACHE_CLEAN_INTERVAL_SECS;
 	cache.on = 1;

 	return fuse_opt_parse(args, &cache, cache_opts, NULL);
@@ -0,0 +1,246 @@
+/*
+ * Copyright (c) 2006-2008 Amit Singh/Google Inc.
+ * Copyright (c) 2012 Anatol Pomozov
+ * Copyright (c) 2011-2013 Benjamin Fleischer
+ */
+
+#include "darwin_compat.h"
+
+#include <assert.h>
+#include <errno.h>
+#include <sys/types.h>
+
+/*
+ * Semaphore implementation based on:
+ *
+ * Copyright (C) 2000,02 Free Software Foundation, Inc.
+ * This file is part of the GNU C Library.
+ * Written by Ga<EB>l Le Mignot <address@hidden>
+ *
+ * The GNU C Library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * The GNU C Library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with the GNU C Library; see the file COPYING.LIB.  If not,
+ * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+/* Semaphores */
+
+#define __SEM_ID_NONE  ((int)0x0)
+#define __SEM_ID_LOCAL ((int)0xcafef00d)
+
+/* http://www.opengroup.org/onlinepubs/007908799/xsh/sem_init.html */
+int
+darwin_sem_init(darwin_sem_t *sem, int pshared, unsigned int value)
+{
+    if (pshared) {
+        errno = ENOSYS;
+        return -1;
+    }
+
+    sem->id = __SEM_ID_NONE;
+
+    if (pthread_cond_init(&sem->__data.local.count_cond, NULL)) {
+        goto cond_init_fail;
+    }
+
+    if (pthread_mutex_init(&sem->__data.local.count_lock, NULL)) {
+        goto mutex_init_fail;
+    }
+
+    sem->__data.local.count = value;
+    sem->id = __SEM_ID_LOCAL;
+
+    return 0;
+
+mutex_init_fail:
+
+    pthread_cond_destroy(&sem->__data.local.count_cond);
+
+cond_init_fail:
+
+    return -1;
+}
+
+/* http://www.opengroup.org/onlinepubs/007908799/xsh/sem_destroy.html */
+int
+darwin_sem_destroy(darwin_sem_t *sem)
+{
+    int res = 0;
+
+    pthread_mutex_lock(&sem->__data.local.count_lock);
+
+    sem->id = __SEM_ID_NONE;
+    pthread_cond_broadcast(&sem->__data.local.count_cond);
+
+    if (pthread_cond_destroy(&sem->__data.local.count_cond)) {
+        res = -1;
+    }
+
+    pthread_mutex_unlock(&sem->__data.local.count_lock);
+
+    if (pthread_mutex_destroy(&sem->__data.local.count_lock)) {
+        res = -1;
+    }
+
+    return res;
+}
+
+int
+darwin_sem_getvalue(darwin_sem_t *sem, unsigned int *sval)
+{
+    int res = 0;
+
+    pthread_mutex_lock(&sem->__data.local.count_lock);
+
+    if (sem->id != __SEM_ID_LOCAL) {
+        res = -1;
+        errno = EINVAL;
+    } else {
+        *sval = sem->__data.local.count;
+    }
+
+    pthread_mutex_unlock(&sem->__data.local.count_lock);
+
+    return res;
+}
+
+/* http://www.opengroup.org/onlinepubs/007908799/xsh/sem_post.html */
+int
+darwin_sem_post(darwin_sem_t *sem)
+{
+    int res = 0;
+
+    pthread_mutex_lock(&sem->__data.local.count_lock);
+
+    if (sem->id != __SEM_ID_LOCAL) {
+        res = -1;
+        errno = EINVAL;
+    } else if (sem->__data.local.count < DARWIN_SEM_VALUE_MAX) {
+        sem->__data.local.count++;
+        if (sem->__data.local.count == 1) {
+            pthread_cond_signal(&sem->__data.local.count_cond);
+        }
+    } else {
+        errno = ERANGE;
+        res = -1;
+    }
+
+    pthread_mutex_unlock(&sem->__data.local.count_lock);
+
+    return res;
+}
+
+/* http://www.opengroup.org/onlinepubs/009695399/functions/sem_timedwait.html */
+int
+darwin_sem_timedwait(darwin_sem_t *sem, const struct timespec *abs_timeout)
+{
+    int res = 0;
+
+    if (abs_timeout &&
+        (abs_timeout->tv_nsec < 0 || abs_timeout->tv_nsec >= 1000000000)) {
+        errno = EINVAL;
+        return -1;
+    }
+
+    pthread_cleanup_push((void(*)(void*))&pthread_mutex_unlock,
+                 &sem->__data.local.count_lock);
+
+    pthread_mutex_lock(&sem->__data.local.count_lock);
+
+    if (sem->id != __SEM_ID_LOCAL) {
+        errno = EINVAL;
+        res = -1;
+    } else {
+        if (!sem->__data.local.count) {
+            res = pthread_cond_timedwait(&sem->__data.local.count_cond,
+                             &sem->__data.local.count_lock,
+                             abs_timeout);
+        }
+        if (res) {
+            assert(res == ETIMEDOUT);
+            res = -1;
+            errno = ETIMEDOUT;
+        } else if (sem->id != __SEM_ID_LOCAL) {
+            res = -1;
+            errno = EINVAL;
+        } else {
+            sem->__data.local.count--;
+        }
+    }
+
+    pthread_cleanup_pop(1);
+
+    return res;
+}
+
+/* http://www.opengroup.org/onlinepubs/007908799/xsh/sem_trywait.html */
+int
+darwin_sem_trywait(darwin_sem_t *sem)
+{
+    int res = 0;
+
+    pthread_mutex_lock(&sem->__data.local.count_lock);
+
+    if (sem->id != __SEM_ID_LOCAL) {
+        res = -1;
+        errno = EINVAL;
+    } else if (sem->__data.local.count) {
+        sem->__data.local.count--;
+    } else {
+        res = -1;
+        errno = EAGAIN;
+    }
+
+    pthread_mutex_unlock (&sem->__data.local.count_lock);
+
+    return res;
+}
+
+/* http://www.opengroup.org/onlinepubs/007908799/xsh/sem_wait.html */
+int
+darwin_sem_wait(darwin_sem_t *sem)
+{
+    int res = 0;
+
+    pthread_cleanup_push((void(*)(void*))&pthread_mutex_unlock,
+                 &sem->__data.local.count_lock);
+
+    pthread_mutex_lock(&sem->__data.local.count_lock);
+
+    if (sem->id != __SEM_ID_LOCAL) {
+        errno = EINVAL;
+        res = -1;
+    } else {
+        if (!sem->__data.local.count) {
+            pthread_cond_wait(&sem->__data.local.count_cond,
+                      &sem->__data.local.count_lock);
+            if (!sem->__data.local.count) {
+                /* spurious wakeup, assume it is an interruption */
+                res = -1;
+                errno = EINTR;
+                goto out;
+            }
+        }
+        if (sem->id != __SEM_ID_LOCAL) {
+            res = -1;
+            errno = EINVAL;
+        } else {
+            sem->__data.local.count--;
+        }
+    }
+
+out:
+    pthread_cleanup_pop(1);
+
+    return res;
+}
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2006-2008 Amit Singh/Google Inc.
+ * Copyright (c) 2011-2013 Benjamin Fleischer
+ */
+
+#ifndef _DARWIN_COMPAT_
+#define _DARWIN_COMPAT_
+
+#include <pthread.h>
+
+/* Semaphores */
+
+typedef struct darwin_sem {
+    int id;
+    union {
+        struct
+        {
+            unsigned int    count;
+            pthread_mutex_t count_lock;
+            pthread_cond_t  count_cond;
+        } local;
+    } __data;
+} darwin_sem_t;
+
+#define DARWIN_SEM_VALUE_MAX ((int32_t)32767)
+
+int darwin_sem_init(darwin_sem_t *sem, int pshared, unsigned int value);
+int darwin_sem_destroy(darwin_sem_t *sem);
+int darwin_sem_getvalue(darwin_sem_t *sem, unsigned int *value);
+int darwin_sem_post(darwin_sem_t *sem);
+int darwin_sem_timedwait(darwin_sem_t *sem, const struct timespec *abs_timeout);
+int darwin_sem_trywait(darwin_sem_t *sem);
+int darwin_sem_wait(darwin_sem_t *sem);
+
+/* Caller must not include <semaphore.h> */
+
+typedef darwin_sem_t sem_t;
+
+#define sem_init(s, p, v)   darwin_sem_init(s, p, v)
+#define sem_destroy(s)      darwin_sem_destroy(s)
+#define sem_getvalue(s, v)  darwin_sem_getvalue(s, v)
+#define sem_post(s)         darwin_sem_post(s)
+#define sem_timedwait(s, t) darwin_sem_timedwait(s, t)
+#define sem_trywait(s)      darwin_sem_trywait(s)
+#define sem_wait(s)         darwin_sem_wait(s)
+
+#define SEM_VALUE_MAX       DARWIN_SEM_VALUE_MAX
+
+#endif /* _DARWIN_COMPAT_ */
@@ -1,4 +1,5 @@
-AC_INIT(sshfs, 2.6)
+AC_INIT(sshfs, 2.10)
+AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE([foreign subdir-objects])
 AM_CONFIG_HEADER(config.h)

@@ -7,46 +8,37 @@ AM_PROG_CC_C_O
 CFLAGS="$CFLAGS -Wall -W"
 LIBS=
 AC_SEARCH_LIBS(dlsym, [dl])
-sshnodelay_libs=$LIBS
-AC_SUBST(sshnodelay_libs)
 LIBS=

-AC_ARG_ENABLE(sshnodelay,
-	[  --disable-sshnodelay    Don't compile NODELAY workaround for ssh])
-
-if test -z "$enable_sshnodelay"; then
-	AC_MSG_CHECKING([OpenSSH version])
-	[eval `ssh -V 2>&1 | sed -n 's/^OpenSSH_\([1-9][0-9]*\)\.\([0-9][0-9]*\).*/ssh_major=\1 ssh_minor=\2/p'`]
-	if test "x$ssh_major" != x -a "x$ssh_minor" != x; then
-		if test $ssh_major -gt 4 -o \( $ssh_major = 4 -a $ssh_minor -ge 4 \); then
-			AC_MSG_RESULT([$ssh_major.$ssh_minor >= 4.4, disabling NODELAY workaround])
-			enable_sshnodelay=no
-		else
-			AC_MSG_RESULT([$ssh_major.$ssh_minor < 4.4, enabling NODELAY workaround])
-			enable_sshnodelay=yes
-		fi
-	else
-		AC_MSG_RESULT([not found])
-	fi
-fi
-
-if test "$enable_sshnodelay" = "yes"; then
-	AC_DEFINE(SSH_NODELAY_WORKAROUND, 1, [Compile ssh NODELAY workaround])
-fi
-
-AM_CONDITIONAL(SSH_NODELAY_SO, test "$enable_sshnodelay" = "yes")
+case "$target_os" in
+    *linux*) osname=linux;;
+    *darwin*) osname=darwin;;
+    *) osname=unknown;;
+esac

 export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH
-PKG_CHECK_MODULES(SSHFS, [fuse >= 2.3 glib-2.0 gthread-2.0])
+PKG_CHECK_MODULES([SSHFS], [fuse >= 2.3 glib-2.0 gthread-2.0])
 have_fuse_opt_parse=no
 oldlibs="$LIBS"
 LIBS="$LIBS $SSHFS_LIBS"
 AC_CHECK_FUNC([fuse_opt_parse], [have_fuse_opt_parse=yes])
 LIBS="$oldlibs"
-if test "$have_fuse_opt_parse" = no; then
-	CFLAGS="$CFLAGS -Icompat"
+if test "$have_fuse_opt_parse" = no -o "$osname" = darwin; then
+	CFLAGS="$CFLAGS -I${srcdir}/compat"
 fi
 AM_CONDITIONAL(FUSE_OPT_COMPAT, test "$have_fuse_opt_parse" = no)
+AM_CONDITIONAL(DARWIN_COMPAT, test "$osname" = darwin)

-AC_CONFIG_FILES([Makefile])
+AC_CHECK_PROG(UNMOUNT_COMMAND, fusermount, fusermount -u, umount)
+
+# TODO: Figure out why we special-case this in Darwin.  Would be nice if
+# the default setting was consistent across platforms so we wouldn't need
+# to care about it here.
+case "$osname" in
+    darwin) IDMAP_DEFAULT=user ;;
+    *) IDMAP_DEFAULT=none ;;
+esac
+AC_SUBST(IDMAP_DEFAULT)
+
+AC_CONFIG_FILES([Makefile test/Makefile])
 AC_OUTPUT
@@ -0,0 +1,64 @@
+project('sshfs', 'c', version: '2.10.0',
+        meson_version: '>= 0.38',
+        default_options: [ 'buildtype=plain' ])
+
+add_global_arguments('-D_REENTRANT', '-DHAVE_CONFIG_H', '-O2', '-g',
+                     '-Wall', '-Wextra', '-Wno-sign-compare',
+                     '-Wmissing-declarations', '-Wwrite-strings',
+                     language: 'c')
+
+# Some (stupid) GCC versions warn about unused return values even when they are
+# casted to void. This makes -Wunused-result pretty useless, since there is no
+# way to suppress the warning when we really *want* to ignore the value.
+cc = meson.get_compiler('c')
+code = '''
+__attribute__((warn_unused_result)) int get_4() {
+    return 4;
+}
+int main(void) {
+    (void) get_4();
+    return 0;
+}'''
+if not cc.compiles(code, args: [ '-O0', '-Werror=unused-result' ])
+     message('Compiler warns about unused result even when casting to void')
+     add_global_arguments('-Wno-unused-result', language: 'c')
+endif
+
+
+cfg = configuration_data()
+
+cfg.set_quoted('PACKAGE_VERSION', meson.project_version())
+
+include_dirs = [ include_directories('.') ]
+sshfs_sources = ['sshfs.c', 'cache.c']
+if target_machine.system() == 'darwin'
+  cfg.set_quoted('IDMAP_DEFAULT', 'user')
+  sshfs_sources += [ 'compat/fuse_opt.c', 'compat/darwin_compat.c' ]
+  include_dirs += [ include_directories('compat') ]
+else
+  cfg.set_quoted('IDMAP_DEFAULT', 'none')
+endif
+
+configure_file(input: 'sshfs.1.in',
+               output: 'sshfs.1',
+               configuration : cfg)
+configure_file(output: 'config.h',
+               configuration : cfg)
+
+sshfs_deps = [ dependency('fuse', version: '>= 2.3'),
+               dependency('glib-2.0'),
+               dependency('gthread-2.0') ]
+
+executable('sshfs', sshfs_sources,
+           include_directories: include_dirs,
+           dependencies: sshfs_deps,
+           c_args: ['-DFUSE_USE_VERSION=26'],
+           install: true,
+           install_dir: get_option('bindir'))
+
+# This is a little ugly. Is there a better way to tell Meson that the
+# manpage is in the build directory?
+install_man(join_paths(meson.current_build_dir(), 'sshfs.1'))
+
+subdir('test')
+
@@ -7,7 +7,7 @@ SSHFS \- filesystem client based on ssh
 \fBsshfs\fP [\fIuser\fP@]\fBhost\fP:[\fIdir\fP] \fBmountpoint\fP [\fIoptions\fP]
 .SS unmounting
 .TP
-\fBfusermount -u mountpoint\fP
+\fB@UNMOUNT_COMMAND@ mountpoint\fP
 .SH DESCRIPTION
 SSHFS (Secure SHell FileSystem) is a file system for Linux (and other
 operating systems with a FUSE implementation, such as Mac OS X or FreeBSD)
@@ -97,14 +97,14 @@ fix buffer fillup bug in server (default: on)
 .RE
 .TP
 \fB\-o\fR idmap=TYPE
-user/group ID mapping, possible types are:
+user/group ID mapping (default: @IDMAP_DEFAULT@)
 .RS 8
 .TP
 none
-no translation of the ID space (default)
+no translation of the ID space
 .TP
 user
-only translate UID of connecting user
+only translate UID/GID of connecting user
 .TP
 file
 translate UIDs/GIDs based upon the contents of \fBuidfile \fR and
@@ -282,5 +282,3 @@ SSHFS has been written by Miklos Szeredi <miklos@szeredi.hu>.
 .LP
 This man page was written by Bartosz Fenski <fenio@debian.org> for the
 Debian GNU/Linux distribution (but it may be used by others).
-
-
@@ -11,7 +11,12 @@

 #include <fuse.h>
 #include <fuse_opt.h>
+#if !defined(__CYGWIN__)
 #include <fuse_lowlevel.h>
+#endif
+#ifdef __APPLE__
+#  include <fuse_darwin.h>
+#endif
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -20,7 +25,9 @@
 #include <string.h>
 #include <stdint.h>
 #include <errno.h>
-#include <semaphore.h>
+#ifndef __APPLE__
+#  include <semaphore.h>
+#endif
 #include <pthread.h>
 #include <netdb.h>
 #include <signal.h>
@@ -38,6 +45,11 @@
 #include <pwd.h>
 #include <grp.h>
 #include <limits.h>
+#ifdef __APPLE__
+#  include <strings.h>
+#  include <libgen.h>
+#  include <darwin_compat.h>
+#endif

 #include "cache.h"

@@ -108,6 +120,7 @@
 #define SFTP_EXT_POSIX_RENAME "posix-rename@openssh.com"
 #define SFTP_EXT_STATVFS "statvfs@openssh.com"
 #define SFTP_EXT_HARDLINK "hardlink@openssh.com"
+#define SFTP_EXT_FSYNC "fsync@openssh.com"

 #define PROTO_VERSION 3

@@ -119,14 +132,16 @@

 #define SFTP_SERVER_PATH "/usr/lib/sftp-server"

-#define SSHNODELAY_SO "sshnodelay.so"
-
 /* Asynchronous readdir parameters */
 #define READDIR_START 2
 #define READDIR_MAX 32

 #define MAX_PASSWORD 1024

+#ifdef __APPLE__
+static char sshfs_program_path[PATH_MAX] = { 0 };
+#endif /* __APPLE__ */
+
 struct buffer {
 	uint8_t *p;
 	size_t len;
@@ -199,8 +214,6 @@ struct sshfs {
 	struct fuse_args ssh_args;
 	char *workarounds;
 	int rename_workaround;
-	int nodelay_workaround;
-	int nodelaysrv_workaround;
 	int truncate_workaround;
 	int buflimit_workaround;
 	int fstat_workaround;
@@ -243,6 +256,10 @@ struct sshfs {
 	int server_version;
 	unsigned remote_uid;
 	unsigned local_uid;
+#ifdef __APPLE__
+	unsigned remote_gid;
+	unsigned local_gid;
+#endif
 	int remote_uid_detected;
 	unsigned blksize;
 	char *progname;
@@ -255,6 +272,7 @@ struct sshfs {
 	int ext_posix_rename;
 	int ext_statvfs;
 	int ext_hardlink;
+	int ext_fsync;
 	mode_t mnt_mode;
 	struct fuse_operations *op;

@@ -275,6 +293,7 @@ static const char *ssh_opts[] = {
 	"AddressFamily",
 	"BatchMode",
 	"BindAddress",
+	"CertificateFile",
 	"ChallengeResponseAuthentication",
 	"CheckHostIP",
 	"Cipher",
@@ -285,28 +304,40 @@ static const char *ssh_opts[] = {
 	"ConnectTimeout",
 	"ControlMaster",
 	"ControlPath",
+	"ControlPersist",
+	"FingerprintHash",
 	"GlobalKnownHostsFile",
 	"GSSAPIAuthentication",
 	"GSSAPIDelegateCredentials",
 	"HostbasedAuthentication",
+	"HostbasedKeyTypes",
 	"HostKeyAlgorithms",
 	"HostKeyAlias",
 	"HostName",
 	"IdentitiesOnly",
 	"IdentityFile",
+	"IdentityAgent",
+	"IPQoS",
 	"KbdInteractiveAuthentication",
 	"KbdInteractiveDevices",
+	"KexAlgorithms",
 	"LocalCommand",
 	"LogLevel",
 	"MACs",
 	"NoHostAuthenticationForLocalhost",
 	"NumberOfPasswordPrompts",
 	"PasswordAuthentication",
+	"PermitLocalCommand",
+	"PKCS11Provider",
 	"Port",
 	"PreferredAuthentications",
 	"ProxyCommand",
+	"ProxyJump",
+	"ProxyUseFdpass",
+	"PubkeyAcceptedKeyTypes"
 	"PubkeyAuthentication",
 	"RekeyLimit",
+	"RevokedHostKeys",
 	"RhostsRSAAuthentication",
 	"RSAAuthentication",
 	"ServerAliveCountMax",
@@ -314,9 +345,11 @@ static const char *ssh_opts[] = {
 	"SmartcardDevice",
 	"StrictHostKeyChecking",
 	"TCPKeepAlive",
+	"UpdateHostKeys",
 	"UsePrivilegedPort",
 	"UserKnownHostsFile",
 	"VerifyHostKeyDNS",
+	"VisualHostKey",
 	NULL,
 };

@@ -386,23 +419,11 @@ static struct fuse_opt sshfs_opts[] = {

 static struct fuse_opt workaround_opts[] = {
 	SSHFS_OPT("none",       rename_workaround, 0),
-	SSHFS_OPT("none",       nodelay_workaround, 0),
-	SSHFS_OPT("none",       nodelaysrv_workaround, 0),
 	SSHFS_OPT("none",       truncate_workaround, 0),
 	SSHFS_OPT("none",       buflimit_workaround, 0),
 	SSHFS_OPT("none",       fstat_workaround, 0),
-	SSHFS_OPT("all",        rename_workaround, 1),
-	SSHFS_OPT("all",        nodelay_workaround, 1),
-	SSHFS_OPT("all",        nodelaysrv_workaround, 1),
-	SSHFS_OPT("all",        truncate_workaround, 1),
-	SSHFS_OPT("all",        buflimit_workaround, 1),
-	SSHFS_OPT("all",        fstat_workaround, 1),
 	SSHFS_OPT("rename",     rename_workaround, 1),
 	SSHFS_OPT("norename",   rename_workaround, 0),
-	SSHFS_OPT("nodelay",    nodelay_workaround, 1),
-	SSHFS_OPT("nonodelay",  nodelay_workaround, 0),
-	SSHFS_OPT("nodelaysrv", nodelaysrv_workaround, 1),
-	SSHFS_OPT("nonodelaysrv", nodelaysrv_workaround, 0),
 	SSHFS_OPT("truncate",   truncate_workaround, 1),
 	SSHFS_OPT("notruncate", truncate_workaround, 0),
 	SSHFS_OPT("buflimit",   buflimit_workaround, 1),
@@ -739,8 +760,17 @@ static int buf_get_attrs(struct buffer *buf, struct stat *stbuf, int *flagsp)
 		}
 	}

+#ifdef __APPLE__
+	if (sshfs.remote_uid_detected) {
+		if (uid == sshfs.remote_uid)
+			uid = sshfs.local_uid;
+		if (gid == sshfs.remote_gid)
+			gid = sshfs.local_gid;
+	}
+#else /* !__APPLE__ */
 	if (sshfs.remote_uid_detected && uid == sshfs.remote_uid)
 		uid = sshfs.local_uid;
+#endif /* __APPLE__ */
 	if (sshfs.idmap == IDMAP_FILE && sshfs.uid_map)
 		if (translate_id(&uid, sshfs.uid_map) == -1)
 			return -EPERM;
@@ -846,52 +876,6 @@ static void ssh_add_arg(const char *arg)
 		_exit(1);
 }

-#ifdef SSH_NODELAY_WORKAROUND
-static int do_ssh_nodelay_workaround(void)
-{
-	char *oldpreload = getenv("LD_PRELOAD");
-	char *newpreload;
-	char sopath[PATH_MAX];
-	int res;
-
-	snprintf(sopath, sizeof(sopath), "%s/%s", LIBDIR, SSHNODELAY_SO);
-	res = access(sopath, R_OK);
-	if (res == -1) {
-		char *s;
-		if (!realpath(sshfs.progname, sopath))
-			return -1;
-
-		s = strrchr(sopath, '/');
-		if (!s)
-			s = sopath;
-		else
-			s++;
-
-		if (s + strlen(SSHNODELAY_SO) >= sopath + sizeof(sopath))
-			return -1;
-
-		strcpy(s, SSHNODELAY_SO);
-		res = access(sopath, R_OK);
-		if (res == -1) {
-			fprintf(stderr, "sshfs: cannot find %s\n",
-				SSHNODELAY_SO);
-			return -1;
-		}
-	}
-
-	newpreload = g_strdup_printf("%s%s%s",
-				     oldpreload ? oldpreload : "",
-				     oldpreload ? " " : "",
-				     sopath);
-
-	if (!newpreload || setenv("LD_PRELOAD", newpreload, 1) == -1) {
-		fprintf(stderr, "warning: failed set LD_PRELOAD "
-			"for ssh nodelay workaround\n");
-	}
-	g_free(newpreload);
-	return 0;
-}
-#endif

 static int pty_expect_loop(void)
 {
@@ -1025,29 +1009,6 @@ static int start_ssh(void)
 	} else if (pid == 0) {
 		int devnull;

-#ifdef SSH_NODELAY_WORKAROUND
-		if (sshfs.nodelay_workaround &&
-		    do_ssh_nodelay_workaround() == -1) {
-			fprintf(stderr,
-				"warning: ssh nodelay workaround disabled\n");
-		}
-#endif
-
-		if (sshfs.nodelaysrv_workaround) {
-			int i;
-			/*
-			 * Hack to work around missing TCP_NODELAY
-			 * setting in sshd
-			 */
-			for (i = 1; i < sshfs.ssh_args.argc; i++) {
-				if (strcmp(sshfs.ssh_args.argv[i], "-x") == 0) {
-					replace_arg(&sshfs.ssh_args.argv[i],
-						    "-X");
-					break;
-				}
-			}
-		}
-
 		devnull = open("/dev/null", O_WRONLY);

 		if (dup2(sockpair[1], 0) == -1 || dup2(sockpair[1], 1) == -1) {
@@ -1488,6 +1449,9 @@ static int sftp_init_reply_ok(struct buffer *buf, uint32_t *version)
 			if (strcmp(ext, SFTP_EXT_HARDLINK) == 0 &&
 			    strcmp(extdata, "1") == 0)
 				sshfs.ext_hardlink = 1;
+			if (strcmp(ext, SFTP_EXT_FSYNC) == 0 &&
+			    strcmp(extdata, "1") == 0)
+				sshfs.ext_fsync = 1;
 		} while (buf2.len < buf2.size);
 		buf_free(&buf2);
 	}
@@ -1607,6 +1571,10 @@ static void sftp_detect_uid()

 	sshfs.remote_uid = stbuf.st_uid;
 	sshfs.local_uid = getuid();
+#ifdef __APPLE__
+	sshfs.remote_gid = stbuf.st_gid;
+	sshfs.local_gid = getgid();
+#endif
 	sshfs.remote_uid_detected = 1;
 	DEBUG("remote_uid = %i\n", sshfs.remote_uid);

@@ -1929,6 +1897,9 @@ static int sshfs_getattr(const char *path, struct stat *stbuf)
 			   &buf, SSH_FXP_ATTRS, &outbuf);
 	if (!err) {
 		err = buf_get_attrs(&outbuf, stbuf, NULL);
+#ifdef __APPLE__
+		stbuf->st_blksize = 0;
+#endif
 		buf_free(&outbuf);
 	}
 	buf_free(&buf);
@@ -2104,11 +2075,16 @@ static int sftp_readdir_async(struct buffer *handle, fuse_cache_dirh_t h,
 			outstanding--;

 			if (done) {
+				/* We need to cache want_reply, since processing
+				   thread may free req right after unlock() if
+				   want_reply == 0 */
+				int want_reply;
 				pthread_mutex_lock(&sshfs.lock);
 				if (sshfs_req_pending(req))
 					req->want_reply = 0;
+				want_reply = req->want_reply;
 				pthread_mutex_unlock(&sshfs.lock);
-				if (!req->want_reply)
+				if (!want_reply)
 					continue;
 			}

@@ -2364,8 +2340,17 @@ static int sshfs_chown(const char *path, uid_t uid, gid_t gid)
 	int err;
 	struct buffer buf;

+#ifdef __APPLE__
+	if (sshfs.remote_uid_detected) {
+		if (uid == sshfs.local_uid)
+			uid = sshfs.remote_uid;
+		if (gid == sshfs.local_gid)
+			gid = sshfs.remote_gid;
+	}
+#else /* !__APPLE__ */
 	if (sshfs.remote_uid_detected && uid == sshfs.local_uid)
 		uid = sshfs.remote_uid;
+#endif /* __APPLE__ */
 	if (sshfs.idmap == IDMAP_FILE && sshfs.r_uid_map)
 		if(translate_id(&uid, sshfs.r_uid_map) == -1)
 			return -EPERM;
@@ -2559,8 +2544,26 @@ static int sshfs_flush(const char *path, struct fuse_file_info *fi)
 static int sshfs_fsync(const char *path, int isdatasync,
                       struct fuse_file_info *fi)
 {
+	int err;
 	(void) isdatasync;
-	return sshfs_flush(path, fi);
+
+        err = sshfs_flush(path, fi);
+        if (err)
+		return err;
+
+	if (!sshfs.ext_fsync)
+		return err;
+
+	{
+		struct buffer buf;
+		struct sshfs_file *sf = get_sshfs_file(fi);
+		buf_init(&buf, 0);
+		buf_add_string(&buf, SFTP_EXT_FSYNC);
+		buf_add_buf(&buf, &sf->handle);
+		err = sftp_request(SSH_FXP_EXTENDED, &buf, SSH_FXP_STATUS, NULL);
+		buf_free(&buf);
+		return err;
+	}
 }

 static void sshfs_file_put(struct sshfs_file *sf)
@@ -3106,6 +3109,9 @@ static int sshfs_fgetattr(const char *path, struct stat *stbuf,
 	err = sftp_request(SSH_FXP_FSTAT, &buf, SSH_FXP_ATTRS, &outbuf);
 	if (!err) {
 		err = buf_get_attrs(&outbuf, stbuf, NULL);
+#ifdef __APPLE__
+		stbuf->st_blksize = 0;
+#endif
 		buf_free(&outbuf);
 	}
 	buf_free(&buf);
@@ -3277,6 +3283,10 @@ static struct fuse_cache_operations sshfs_oper = {
 		.create     = sshfs_create,
 		.ftruncate  = sshfs_ftruncate,
 		.fgetattr   = sshfs_fgetattr,
+#endif
+#if FUSE_VERSION >= 29
+		.flag_nullpath_ok = 1,
+		.flag_nopath = 1,
 #endif
 	},
 	.cache_getdir = sshfs_getdir,
@@ -3304,21 +3314,24 @@ static void usage(const char *progname)
 "    -o sync_readdir        synchronous readdir\n"
 "    -o sshfs_debug         print some debugging information\n"
 "    -o cache=BOOL          enable caching {yes,no} (default: yes)\n"
+"    -o cache_max_size=N    sets the maximum size of the cache (default: 10000)\n"
 "    -o cache_timeout=N     sets timeout for caches in seconds (default: 20)\n"
 "    -o cache_X_timeout=N   sets timeout for {stat,dir,link} cache\n"
+"    -o cache_clean_interval=N\n"
+"                           sets the interval for automatic cleaning of the\n"
+"                           cache (default: 60)\n"
+"    -o cache_min_clean_interval=N\n"
+"                           sets the interval for forced cleaning of the\n"
+"                           cache if full (default: 5)\n"
 "    -o workaround=LIST     colon separated list of workarounds\n"
 "             none             no workarounds enabled\n"
-"             all              all workarounds enabled\n"
 "             [no]rename       fix renaming to existing file (default: off)\n"
-#ifdef SSH_NODELAY_WORKAROUND
-"             [no]nodelay      set nodelay tcp flag in ssh (default: on)\n"
-#endif
-"             [no]nodelaysrv   set nodelay tcp flag in sshd (default: off)\n"
 "             [no]truncate     fix truncate for old servers (default: off)\n"
 "             [no]buflimit     fix buffer fillup bug in server (default: on)\n"
-"    -o idmap=TYPE          user/group ID mapping, possible types are:\n"
-"             none             no translation of the ID space (default)\n"
-"             user             only translate UID of connecting user\n"
+"             [no]fstat        fix fstat for old servers (default: off)\n"
+"    -o idmap=TYPE          user/group ID mapping (default: " IDMAP_DEFAULT ")\n"
+"             none             no translation of the ID space\n"
+"             user             only translate UID/GID of connecting user\n"
 "             file             translate UIDs/GIDs contained in uidfile/gidfile\n"
 "    -o uidfile=FILE        file containing username:remote_uid mappings\n"
 "    -o gidfile=FILE        file containing groupname:remote_gid mappings\n"
@@ -3435,10 +3448,14 @@ static int workaround_opt_proc(void *data, const char *arg, int key,
 	return -1;
 }

-int parse_workarounds(void)
+static int parse_workarounds(void)
 {
 	int res;
-	char *argv[] = { "", "-o", sshfs.workarounds, NULL };
+        /* Need separate variables because literals are const
+           char */
+        char argv0[] = "";
+        char argv1[] = "-o";
+	char *argv[] = { argv0, argv1, sshfs.workarounds, NULL };
 	struct fuse_args args = FUSE_ARGS_INIT(3, argv);
 	char *s = sshfs.workarounds;
 	if (!s)
@@ -3494,6 +3511,13 @@ static int read_password(void)
 		perror("Failed to allocate locked page for password");
 		return -1;
 	}
+	if (mlock(sshfs.password, size) != 0) {
+		memset(sshfs.password, 0, size);
+		munmap(sshfs.password, size);
+		sshfs.password = NULL;
+		perror("Failed to allocate locked page for password");
+		return -1;
+	}

 	/* Don't use fgets() because password might stay in memory */
 	for (n = 0; n < max_password; n++) {
@@ -3819,7 +3843,11 @@ static inline void load_gid_map(void)
 	read_id_map(sshfs.gid_file, &groupname_to_gid, "gid", &sshfs.gid_map, &sshfs.r_gid_map);
 }

+#ifdef __APPLE__
+int main(int argc, char *argv[], __unused char *envp[], char **exec_path)
+#else
 int main(int argc, char *argv[])
+#endif
 {
 	int res;
 	struct fuse_args args = FUSE_ARGS_INIT(argc, argv);
@@ -3828,15 +3856,21 @@ int main(int argc, char *argv[])
 	const char *sftp_server;
 	int libver;

-	g_thread_init(NULL);
+#ifdef __APPLE__
+	if (!realpath(*exec_path, sshfs_program_path)) {
+		memset(sshfs_program_path, 0, PATH_MAX);
+	}
+#endif /* __APPLE__ */

 	sshfs.blksize = 4096;
 	/* SFTP spec says all servers should allow at least 32k I/O */
 	sshfs.max_read = 32768;
 	sshfs.max_write = 32768;
-	sshfs.nodelay_workaround = 1;
-	sshfs.nodelaysrv_workaround = 0;
+#ifdef __APPLE__
+	sshfs.rename_workaround = 1;
+#else
 	sshfs.rename_workaround = 0;
+#endif
 	sshfs.truncate_workaround = 0;
 	sshfs.buflimit_workaround = 1;
 	sshfs.ssh_ver = 2;
@@ -3848,7 +3882,15 @@ int main(int argc, char *argv[])
 	sshfs.delay_connect = 0;
 	sshfs.slave = 0;
 	sshfs.detect_uid = 0;
-	sshfs.idmap = IDMAP_NONE;
+	if (strcmp(IDMAP_DEFAULT, "none") == 0) {
+		sshfs.idmap = IDMAP_NONE;
+	} else if (strcmp(IDMAP_DEFAULT, "user") == 0) {
+		sshfs.idmap = IDMAP_USER;
+	} else {
+		fprintf(stderr, "bad idmap default value built into sshfs; "
+		    "assuming none (bad logic in configure script?)\n");
+		sshfs.idmap = IDMAP_NONE;
+	}
 	sshfs.nomap = NOMAP_ERROR;
 	ssh_add_arg("ssh");
 	ssh_add_arg("-x");
@@ -3859,6 +3901,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) {
@@ -3971,7 +4021,9 @@ int main(int argc, char *argv[])
 		char *mountpoint;
 		int multithreaded;
 		int foreground;
+#if !defined(__APPLE__) && !defined(__CYGWIN__)
 		struct stat st;
+#endif

 		res = fuse_parse_cmdline(&args, &mountpoint, &multithreaded,
 					 &foreground);
@@ -3983,20 +4035,26 @@ int main(int argc, char *argv[])
 			foreground = 1;
 		}

+#if !defined(__APPLE__) && !defined(__CYGWIN__)
 		res = stat(mountpoint, &st);
 		if (res == -1) {
 			perror(mountpoint);
 			exit(1);
 		}
 		sshfs.mnt_mode = st.st_mode;
+#else
+		sshfs.mnt_mode = S_IFDIR | 0755;
+#endif

 		ch = fuse_mount(mountpoint, &args);
 		if (!ch)
 			exit(1);

+#if !defined(__CYGWIN__)
 		res = fcntl(fuse_chan_fd(ch), F_SETFD, FD_CLOEXEC);
 		if (res == -1)
 			perror("WARNING: failed to set FD_CLOEXEC on fuse device");
+#endif

 		sshfs.op = cache_init(&sshfs_oper);
 		fuse = fuse_new(ch, &args, sshfs.op,
@@ -4006,6 +4064,13 @@ int main(int argc, char *argv[])
 			exit(1);
 		}

+                res = fuse_set_signal_handlers(fuse_get_session(fuse));
+		if (res == -1) {
+			fuse_unmount(mountpoint, ch);
+			fuse_destroy(fuse);
+			exit(1);
+		}
+
 		/*
 		 * FIXME: trim $PATH so it doesn't contain anything inside the
 		 * mountpoint, which would deadlock.
@@ -4018,9 +4083,6 @@ int main(int argc, char *argv[])
 		}

 		res = fuse_daemonize(foreground);
-		if (res != -1)
-			res = fuse_set_signal_handlers(fuse_get_session(fuse));
-
 		if (res == -1) {
 			fuse_unmount(mountpoint, ch);
 			fuse_destroy(fuse);
@@ -1,18 +0,0 @@
-#define _GNU_SOURCE
-#include <dlfcn.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netinet/tcp.h>
-
-int connect(int sock, const struct sockaddr *addr, socklen_t addrlen)
-{
-	int (*next_connect)(int, const struct sockaddr *, socklen_t) =
-		dlsym(RTLD_NEXT, "connect");
-	int res = next_connect(sock, addr, addrlen);
-	if (!res && addr->sa_family == AF_INET) {
-		int opt = 1;
-		setsockopt(sock, IPPROTO_TCP, TCP_NODELAY, &opt, sizeof(opt));
-	}
-	return res;
-}
@@ -0,0 +1 @@
+__pycache__/
@@ -0,0 +1,4 @@
+## Process this file with automake to produce Makefile.in
+
+EXTRA_DIST = meson.build conftest.py pytest.ini test_sshfs.py \
+	     util.py wrong_command.c
@@ -0,0 +1,89 @@
+import sys
+import pytest
+import time
+import re
+
+# If a test fails, wait a moment before retrieving the captured
+# stdout/stderr. When using a server process, this makes sure that we capture
+# any potential output of the server that comes *after* a test has failed. For
+# example, if a request handler raises an exception, the server first signals an
+# error to FUSE (causing the test to fail), and then logs the exception. Without
+# the extra delay, the exception will go into nowhere.
+@pytest.mark.hookwrapper
+def pytest_pyfunc_call(pyfuncitem):
+    outcome = yield
+    failed = outcome.excinfo is not None
+    if failed:
+        time.sleep(1)
+
+@pytest.fixture()
+def pass_capfd(request, capfd):
+    '''Provide capfd object to UnitTest instances'''
+    request.instance.capfd = capfd
+
+def check_test_output(capfd):
+    (stdout, stderr) = capfd.readouterr()
+
+    # Write back what we've read (so that it will still be printed.
+    sys.stdout.write(stdout)
+    sys.stderr.write(stderr)
+
+    # Strip out false positives
+    for (pattern, flags, count) in capfd.false_positives:
+        cp = re.compile(pattern, flags)
+        (stdout, cnt) = cp.subn('', stdout, count=count)
+        if count == 0 or count - cnt > 0:
+            stderr = cp.sub('', stderr, count=count - cnt)
+
+    patterns = [ r'\b{}\b'.format(x) for x in
+                 ('exception', 'error', 'warning', 'fatal', 'traceback',
+                    'fault', 'crash(?:ed)?', 'abort(?:ed)',
+                    'uninitiali[zs]ed') ]
+    patterns += ['^==[0-9]+== ']
+    for pattern in patterns:
+        cp = re.compile(pattern, re.IGNORECASE | re.MULTILINE)
+        hit = cp.search(stderr)
+        if hit:
+            raise AssertionError('Suspicious output to stderr (matched "%s")' % hit.group(0))
+        hit = cp.search(stdout)
+        if hit:
+            raise AssertionError('Suspicious output to stdout (matched "%s")' % hit.group(0))
+
+def register_output(self, pattern, count=1, flags=re.MULTILINE):
+    '''Register *pattern* as false positive for output checking
+
+    This prevents the test from failing because the output otherwise
+    appears suspicious.
+    '''
+
+    self.false_positives.append((pattern, flags, count))
+
+# This is a terrible hack that allows us to access the fixtures from the
+# pytest_runtest_call hook. Among a lot of other hidden assumptions, it probably
+# relies on tests running sequential (i.e., don't dare to use e.g. the xdist
+# plugin)
+current_capfd = None
+@pytest.yield_fixture(autouse=True)
+def save_cap_fixtures(request, capfd):
+    global current_capfd
+    capfd.false_positives = []
+
+    # Monkeypatch in a function to register false positives
+    type(capfd).register_output = register_output
+
+    if request.config.getoption('capture') == 'no':
+        capfd = None
+    current_capfd = capfd
+    bak = current_capfd
+    yield
+
+    # Try to catch problems with this hack (e.g. when running tests
+    # simultaneously)
+    assert bak is current_capfd
+    current_capfd = None
+
+@pytest.hookimpl(trylast=True)
+def pytest_runtest_call(item):
+    capfd = current_capfd
+    if capfd is not None:
+        check_test_output(capfd)
@@ -0,0 +1,11 @@
+# Suppression file for address sanitizer.
+
+# There are some leaks in command line option parsing. They should be
+# fixed at some point, but are harmless since the consume just a small,
+# constant amount of memory and do not grow.
+leak:fuse_opt_parse
+
+
+# Leaks in fusermount3 are harmless as well (it's a short-lived
+# process) - but patches are welcome!
+leak:fusermount.c
@@ -0,0 +1,11 @@
+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', '-fPu', '--preserve=mode',
+                        '@INPUT@', meson.current_build_dir() ])
+
+# Provide something helpful when running 'ninja test'
+wrong_cmd = executable('wrong_command', 'wrong_command.c',
+                       install: false)
+test('wrong_cmd', wrong_cmd)
@@ -0,0 +1,2 @@
+[pytest]
+addopts = --verbose --assert=rewrite --tb=native -x -r a
@@ -0,0 +1,378 @@
+#!/usr/bin/env python3
+
+if __name__ == '__main__':
+    import pytest
+    import sys
+    sys.exit(pytest.main([__file__] + sys.argv[1:]))
+
+import subprocess
+import os
+import sys
+import pytest
+import stat
+import shutil
+import filecmp
+import errno
+from tempfile import NamedTemporaryFile
+from util import (wait_for_mount, umount, cleanup, base_cmdline,
+                  basename, fuse_test_marker, safe_sleep)
+from os.path import join as pjoin
+
+TEST_FILE = __file__
+
+pytestmark = fuse_test_marker()
+
+with open(TEST_FILE, 'rb') as fh:
+    TEST_DATA = fh.read()
+
+def name_generator(__ctr=[0]):
+    __ctr[0] += 1
+    return 'testfile_%d' % __ctr[0]
+
+@pytest.mark.parametrize("debug", (False, True))
+@pytest.mark.parametrize("cache_timeout", (0, 1))
+def test_sshfs(tmpdir, debug, cache_timeout, capfd):
+    
+    # Avoid false positives from debug messages
+    #if debug:
+    #    capfd.register_output(r'^   unique: [0-9]+, error: -[0-9]+ .+$',
+    #                          count=0)
+
+    # Test if we can ssh into localhost without password
+    try:
+        res = subprocess.call(['ssh', '-o', 'KbdInteractiveAuthentication=no',
+                               '-o', 'ChallengeResponseAuthentication=no',
+                               '-o', 'PasswordAuthentication=no',
+                               'localhost', '--', 'true'], stdin=subprocess.DEVNULL,
+                              timeout=10)
+    except subprocess.TimeoutExpired:
+        res = 1
+    if res != 0:
+        pytest.fail('Unable to ssh into localhost without password prompt.')
+
+    mnt_dir = str(tmpdir.mkdir('mnt'))
+    src_dir = str(tmpdir.mkdir('src'))
+
+    cmdline = base_cmdline + [ pjoin(basename, 'sshfs'),
+                               '-f', 'localhost:' + src_dir, mnt_dir ]
+    if debug:
+        cmdline += [ '-o', 'sshfs_debug' ]
+
+    # SSHFS Cache
+    if cache_timeout == 0:
+        cmdline += [ '-o', 'cache=no' ]
+    else:
+        cmdline += [ '-o', 'cache_timeout=%d' % cache_timeout ]
+
+    # FUSE Cache
+    cmdline += [ '-o', 'entry_timeout=0',
+                 '-o', 'attr_timeout=0' ]
+
+    
+    new_env = dict(os.environ) # copy, don't modify
+
+    # Abort on warnings from glib
+    new_env['G_DEBUG'] = 'fatal-warnings'
+    
+    mount_process = subprocess.Popen(cmdline, env=new_env)
+    try:
+        wait_for_mount(mount_process, mnt_dir)
+
+        tst_statvfs(mnt_dir)
+        tst_readdir(src_dir, mnt_dir)
+        tst_open_read(src_dir, mnt_dir)
+        tst_open_write(src_dir, mnt_dir)
+        tst_create(mnt_dir)
+        tst_passthrough(src_dir, mnt_dir, cache_timeout)
+        tst_mkdir(mnt_dir)
+        tst_rmdir(src_dir, mnt_dir, cache_timeout)
+        tst_unlink(src_dir, mnt_dir, cache_timeout)
+        tst_symlink(mnt_dir)
+        if os.getuid() == 0:
+            tst_chown(mnt_dir)
+
+        # SSHFS only supports one second resolution when setting
+        # file timestamps.
+        tst_utimens(mnt_dir, tol=1)
+
+        tst_link(mnt_dir)
+        tst_truncate_path(mnt_dir)
+        tst_truncate_fd(mnt_dir)
+        tst_open_unlink(mnt_dir)
+    except:
+        cleanup(mnt_dir)
+        raise
+    else:
+        umount(mount_process, mnt_dir)
+
+def tst_unlink(src_dir, mnt_dir, cache_timeout):
+    name = name_generator()
+    fullname = mnt_dir + "/" + name
+    with open(pjoin(src_dir, name), 'wb') as fh:
+        fh.write(b'hello')
+    if cache_timeout:
+        safe_sleep(cache_timeout+1)
+    assert name in os.listdir(mnt_dir)
+    os.unlink(fullname)
+    with pytest.raises(OSError) as exc_info:
+        os.stat(fullname)
+    assert exc_info.value.errno == errno.ENOENT
+    assert name not in os.listdir(mnt_dir)
+    assert name not in os.listdir(src_dir)
+
+def tst_mkdir(mnt_dir):
+    dirname = name_generator()
+    fullname = mnt_dir + "/" + dirname
+    os.mkdir(fullname)
+    fstat = os.stat(fullname)
+    assert stat.S_ISDIR(fstat.st_mode)
+    assert os.listdir(fullname) ==  []
+    assert fstat.st_nlink in (1,2)
+    assert dirname in os.listdir(mnt_dir)
+
+def tst_rmdir(src_dir, mnt_dir, cache_timeout):
+    name = name_generator()
+    fullname = mnt_dir + "/" + name
+    os.mkdir(pjoin(src_dir, name))
+    if cache_timeout:
+        safe_sleep(cache_timeout+1)
+    assert name in os.listdir(mnt_dir)
+    os.rmdir(fullname)
+    with pytest.raises(OSError) as exc_info:
+        os.stat(fullname)
+    assert exc_info.value.errno == errno.ENOENT
+    assert name not in os.listdir(mnt_dir)
+    assert name not in os.listdir(src_dir)
+
+def tst_symlink(mnt_dir):
+    linkname = name_generator()
+    fullname = mnt_dir + "/" + linkname
+    os.symlink("/imaginary/dest", fullname)
+    fstat = os.lstat(fullname)
+    assert stat.S_ISLNK(fstat.st_mode)
+    assert os.readlink(fullname) == "/imaginary/dest"
+    assert fstat.st_nlink == 1
+    assert linkname in os.listdir(mnt_dir)
+
+def tst_create(mnt_dir):
+    name = name_generator()
+    fullname = pjoin(mnt_dir, name)
+    with pytest.raises(OSError) as exc_info:
+        os.stat(fullname)
+    assert exc_info.value.errno == errno.ENOENT
+    assert name not in os.listdir(mnt_dir)
+
+    fd = os.open(fullname, os.O_CREAT | os.O_RDWR)
+    os.close(fd)
+
+    assert name in os.listdir(mnt_dir)
+    fstat = os.lstat(fullname)
+    assert stat.S_ISREG(fstat.st_mode)
+    assert fstat.st_nlink == 1
+    assert fstat.st_size == 0
+
+def tst_chown(mnt_dir):
+    filename = pjoin(mnt_dir, name_generator())
+    os.mkdir(filename)
+    fstat = os.lstat(filename)
+    uid = fstat.st_uid
+    gid = fstat.st_gid
+
+    uid_new = uid + 1
+    os.chown(filename, uid_new, -1)
+    fstat = os.lstat(filename)
+    assert fstat.st_uid == uid_new
+    assert fstat.st_gid == gid
+
+    gid_new = gid + 1
+    os.chown(filename, -1, gid_new)
+    fstat = os.lstat(filename)
+    assert fstat.st_uid == uid_new
+    assert fstat.st_gid == gid_new
+
+def tst_open_read(src_dir, mnt_dir):
+    name = name_generator()
+    with open(pjoin(src_dir, name), 'wb') as fh_out, \
+         open(TEST_FILE, 'rb') as fh_in:
+        shutil.copyfileobj(fh_in, fh_out)
+
+    assert filecmp.cmp(pjoin(mnt_dir, name), TEST_FILE, False)
+
+def tst_open_write(src_dir, mnt_dir):
+    name = name_generator()
+    fd = os.open(pjoin(src_dir, name),
+                 os.O_CREAT | os.O_RDWR)
+    os.close(fd)
+    fullname = pjoin(mnt_dir, name)
+    with open(fullname, 'wb') as fh_out, \
+         open(TEST_FILE, 'rb') as fh_in:
+        shutil.copyfileobj(fh_in, fh_out)
+
+    assert filecmp.cmp(fullname, TEST_FILE, False)
+
+def tst_open_unlink(mnt_dir):
+    name = pjoin(mnt_dir, name_generator())
+    data1 = b'foo'
+    data2 = b'bar'
+    fullname = pjoin(mnt_dir, name)
+    with open(fullname, 'wb+', buffering=0) as fh:
+        fh.write(data1)
+        os.unlink(fullname)
+        with pytest.raises(OSError) as exc_info:
+            os.stat(fullname)
+            assert exc_info.value.errno == errno.ENOENT
+        assert name not in os.listdir(mnt_dir)
+        fh.write(data2)
+        fh.seek(0)
+        assert fh.read() == data1+data2
+
+def tst_statvfs(mnt_dir):
+    os.statvfs(mnt_dir)
+
+def tst_link(mnt_dir):
+    name1 = pjoin(mnt_dir, name_generator())
+    name2 = pjoin(mnt_dir, name_generator())
+    shutil.copyfile(TEST_FILE, name1)
+    assert filecmp.cmp(name1, TEST_FILE, False)
+
+    fstat1 = os.lstat(name1)
+    assert fstat1.st_nlink == 1
+
+    os.link(name1, name2)
+
+    fstat1 = os.lstat(name1)
+    fstat2 = os.lstat(name2)
+    for attr in ('st_mode', 'st_dev', 'st_uid', 'st_gid',
+                 'st_size', 'st_atime', 'st_mtime', 'st_ctime'):
+        assert getattr(fstat1, attr) == getattr(fstat2, attr)
+    assert os.path.basename(name2) in os.listdir(mnt_dir)
+    assert filecmp.cmp(name1, name2, False)
+
+    os.unlink(name2)
+
+    assert os.path.basename(name2) not in os.listdir(mnt_dir)
+    with pytest.raises(FileNotFoundError):
+        os.lstat(name2)
+
+    os.unlink(name1)
+
+def tst_readdir(src_dir, mnt_dir):
+    newdir = name_generator()
+    src_newdir = pjoin(src_dir, newdir)
+    mnt_newdir = pjoin(mnt_dir, newdir)
+    file_ = src_newdir + "/" + name_generator()
+    subdir = src_newdir + "/" + name_generator()
+    subfile = subdir + "/" + name_generator()
+
+    os.mkdir(src_newdir)
+    shutil.copyfile(TEST_FILE, file_)
+    os.mkdir(subdir)
+    shutil.copyfile(TEST_FILE, subfile)
+
+    listdir_is = os.listdir(mnt_newdir)
+    listdir_is.sort()
+    listdir_should = [ os.path.basename(file_), os.path.basename(subdir) ]
+    listdir_should.sort()
+    assert listdir_is == listdir_should
+
+    os.unlink(file_)
+    os.unlink(subfile)
+    os.rmdir(subdir)
+    os.rmdir(src_newdir)
+
+def tst_truncate_path(mnt_dir):
+    assert len(TEST_DATA) > 1024
+
+    filename = pjoin(mnt_dir, name_generator())
+    with open(filename, 'wb') as fh:
+        fh.write(TEST_DATA)
+
+    fstat = os.stat(filename)
+    size = fstat.st_size
+    assert size == len(TEST_DATA)
+
+    # Add zeros at the end
+    os.truncate(filename, size + 1024)
+    assert os.stat(filename).st_size == size + 1024
+    with open(filename, 'rb') as fh:
+        assert fh.read(size) == TEST_DATA
+        assert fh.read(1025) == b'\0' * 1024
+
+    # Truncate data
+    os.truncate(filename, size - 1024)
+    assert os.stat(filename).st_size == size - 1024
+    with open(filename, 'rb') as fh:
+        assert fh.read(size) == TEST_DATA[:size-1024]
+
+    os.unlink(filename)
+
+def tst_truncate_fd(mnt_dir):
+    assert len(TEST_DATA) > 1024
+    with NamedTemporaryFile('w+b', 0, dir=mnt_dir) as fh:
+        fd = fh.fileno()
+        fh.write(TEST_DATA)
+        fstat = os.fstat(fd)
+        size = fstat.st_size
+        assert size == len(TEST_DATA)
+
+        # Add zeros at the end
+        os.ftruncate(fd, size + 1024)
+        assert os.fstat(fd).st_size == size + 1024
+        fh.seek(0)
+        assert fh.read(size) == TEST_DATA
+        assert fh.read(1025) == b'\0' * 1024
+
+        # Truncate data
+        os.ftruncate(fd, size - 1024)
+        assert os.fstat(fd).st_size == size - 1024
+        fh.seek(0)
+        assert fh.read(size) == TEST_DATA[:size-1024]
+
+def tst_utimens(mnt_dir, tol=0):
+    filename = pjoin(mnt_dir, name_generator())
+    os.mkdir(filename)
+    fstat = os.lstat(filename)
+
+    atime = fstat.st_atime + 42.28
+    mtime = fstat.st_mtime - 42.23
+    if sys.version_info < (3,3):
+        os.utime(filename, (atime, mtime))
+    else:
+        atime_ns = fstat.st_atime_ns + int(42.28*1e9)
+        mtime_ns = fstat.st_mtime_ns - int(42.23*1e9)
+        os.utime(filename, None, ns=(atime_ns, mtime_ns))
+
+    fstat = os.lstat(filename)
+
+    assert abs(fstat.st_atime - atime) < tol
+    assert abs(fstat.st_mtime - mtime) < tol
+    if sys.version_info >= (3,3):
+        assert abs(fstat.st_atime_ns - atime_ns) < tol*1e9
+        assert abs(fstat.st_mtime_ns - mtime_ns) < tol*1e9
+
+def tst_passthrough(src_dir, mnt_dir, cache_timeout):
+    name = name_generator()
+    src_name = pjoin(src_dir, name)
+    mnt_name = pjoin(src_dir, name)
+    assert name not in os.listdir(src_dir)
+    assert name not in os.listdir(mnt_dir)
+    with open(src_name, 'w') as fh:
+        fh.write('Hello, world')
+    assert name in os.listdir(src_dir)
+    if cache_timeout:
+        safe_sleep(cache_timeout+1)
+    assert name in os.listdir(mnt_dir)
+    assert os.stat(src_name) == os.stat(mnt_name)
+
+    name = name_generator()
+    src_name = pjoin(src_dir, name)
+    mnt_name = pjoin(src_dir, name)
+    assert name not in os.listdir(src_dir)
+    assert name not in os.listdir(mnt_dir)
+    with open(mnt_name, 'w') as fh:
+        fh.write('Hello, world')
+    assert name in os.listdir(src_dir)
+    if cache_timeout:
+        safe_sleep(cache_timeout+1)
+    assert name in os.listdir(mnt_dir)
+    assert os.stat(src_name) == os.stat(mnt_name)
@@ -0,0 +1,48 @@
+#!/bin/bash
+
+set -e
+
+# Disable leak checking for now, there are some issues (or false positives)
+# that we still need to fix
+export ASAN_OPTIONS="detect_leaks=0"
+
+export LSAN_OPTIONS="suppressions=$(pwd)/test/lsan_suppress.txt"
+export CC
+
+TEST_CMD="python3 -m pytest --maxfail=99 test/"
+
+# Standard build with Valgrind
+for CC in gcc gcc-6 clang; do
+    mkdir build-${CC}; cd build-${CC}
+    if [ ${CC} == 'gcc-6' ]; then
+        build_opts='-D b_lundef=false'
+    else
+        build_opts=''
+    fi
+    meson -D werror=true ${build_opts} ../
+    ninja
+
+    TEST_WITH_VALGRIND=true ${TEST_CMD}
+    cd ..
+done
+(cd build-$CC; sudo ninja install)
+
+# Sanitized build
+CC=clang
+for san in undefined address; do
+    mkdir build-${san}; cd build-${san}
+    # b_lundef=false is required to work around clang
+    # bug, cf. https://groups.google.com/forum/#!topic/mesonbuild/tgEdAXIIdC4
+    meson -D b_sanitize=${san} -D b_lundef=false -D werror=true ..
+    ninja
+    ${TEST_CMD}
+    cd ..
+done
+
+# Autotools build
+CC=gcc
+autoreconf -i
+./configure
+make
+${TEST_CMD}
+sudo make install
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+set -e
+
+sudo ln -svf $(which python3) /usr/bin/python3
+sudo python3 -m pip install pytest meson
+wget https://github.com/ninja-build/ninja/releases/download/v1.7.2/ninja-linux.zip
+unzip ninja-linux.zip
+chmod 755 ninja
+sudo chown root:root ninja
+sudo mv -fv ninja /usr/local/bin
+valgrind --version
+ninja --version
+meson --version
+
+# Setup ssh
+ssh-keygen -b 768 -t rsa -f ~/.ssh/id_rsa -P ''
+cat ~/.ssh/id_rsa.pub >> ~/.ssh/authorized_keys
+chmod 600 ~/.ssh/authorized_keys
+ssh -o "StrictHostKeyChecking=no" localhost echo "SSH connection succeeded"
+
@@ -0,0 +1,100 @@
+#!/usr/bin/env python3
+import subprocess
+import pytest
+import os
+import stat
+import time
+from os.path import join as pjoin
+
+basename = pjoin(os.path.dirname(__file__), '..')
+
+def wait_for_mount(mount_process, mnt_dir,
+                   test_fn=os.path.ismount):
+    elapsed = 0
+    while elapsed < 30:
+        if test_fn(mnt_dir):
+            return True
+        if mount_process.poll() is not None:
+            pytest.fail('file system process terminated prematurely')
+        time.sleep(0.1)
+        elapsed += 0.1
+    pytest.fail("mountpoint failed to come up")
+
+def cleanup(mnt_dir):
+    subprocess.call(['fusermount', '-z', '-u', mnt_dir],
+                    stdout=subprocess.DEVNULL,
+                    stderr=subprocess.STDOUT)
+
+def umount(mount_process, mnt_dir):
+    subprocess.check_call(['fusermount', '-z', '-u', mnt_dir ])
+    assert not os.path.ismount(mnt_dir)
+
+    # Give mount process a little while to terminate. Popen.wait(timeout)
+    # was only added in 3.3...
+    elapsed = 0
+    while elapsed < 30:
+        code = mount_process.poll()
+        if code is not None:
+            if code == 0:
+                return
+            pytest.fail('file system process terminated with code %s' % (code,))
+        time.sleep(0.1)
+        elapsed += 0.1
+    pytest.fail('mount process did not terminate')
+
+def safe_sleep(secs):
+    '''Like time.sleep(), but sleep for at least *secs*
+
+    `time.sleep` may sleep less than the given period if a signal is
+    received. This function ensures that we sleep for at least the
+    desired time.
+    '''
+
+    now = time.time()
+    end = now + secs
+    while now < end:
+        time.sleep(end - now)
+        now = time.time()
+
+def fuse_test_marker():
+    '''Return a pytest.marker that indicates FUSE availability
+
+    If system/user/environment does not support FUSE, return
+    a `pytest.mark.skip` object with more details. If FUSE is
+    supported, return `pytest.mark.uses_fuse()`.
+    '''
+
+    skip = lambda x: pytest.mark.skip(reason=x)
+
+    with subprocess.Popen(['which', 'fusermount'], stdout=subprocess.PIPE,
+                          universal_newlines=True) as which:
+        fusermount_path = which.communicate()[0].strip()
+
+    if not fusermount_path or which.returncode != 0:
+        return skip("Can't find fusermount executable")
+
+    if not os.path.exists('/dev/fuse'):
+        return skip("FUSE kernel module does not seem to be loaded")
+
+    if os.getuid() == 0:
+        return pytest.mark.uses_fuse()
+
+    mode = os.stat(fusermount_path).st_mode
+    if mode & stat.S_ISUID == 0:
+        return skip('fusermount executable not setuid, and we are not root.')
+
+    try:
+        fd = os.open('/dev/fuse', os.O_RDWR)
+    except OSError as exc:
+        return skip('Unable to open /dev/fuse: %s' % exc.strerror)
+    else:
+        os.close(fd)
+
+    return pytest.mark.uses_fuse()
+
+# Use valgrind if requested
+if os.environ.get('TEST_WITH_VALGRIND', 'no').lower().strip() \
+   not in ('no', 'false', '0'):
+    base_cmdline = [ 'valgrind', '-q', '--' ]
+else:
+    base_cmdline = []
@@ -0,0 +1,9 @@
+#include <stdio.h>
+
+int main(void) {
+	fprintf(stderr, "\x1B[31m\e[1m"
+		"This is not the command you are looking for.\n"
+		"You probably want to run 'python3 -m pytest test/' instead"
+		"\e[0m\n");
+	return 1;
+}
Author	SHA1	Message	Date
Nikolaus Rath	42dfaf9a5b	Released 2.10	2017-08-03 18:00:34 +02:00
Nikolaus Rath	e14f6c68f3	Travis: use alternative workaround suggested by support.	2017-08-03 18:00:34 +02:00
Nikolaus Rath	f30b051ca3	Travis: disable trusty workaround According to Travis support, this should be working now. We will see...	2017-08-03 18:00:34 +02:00
Nikolaus Rath	d58d73c501	Include test files in "make dist"	2017-08-03 18:00:34 +02:00
Nikolaus Rath	8d9bccb987	Merge remote-tracking branch 'osxfuse/master' into sshfs_2.x	2017-07-13 15:55:51 +02:00
Nikolaus Rath	cc5d6bbbc5	sftp_readdir_async(): don't access request when it may have been freed Fixes: #7	2017-07-12 17:10:18 +02:00
Nikolaus Rath	2aced1f7a4	Abort on glib assertion errors.	2017-07-12 17:10:18 +02:00
Nikolaus Rath	9620ad0f73	Travis: use sudo-enabled environment.	2017-07-12 17:10:18 +02:00
Nikolaus Rath	2463943abb	Added information about professional support.	2017-07-12 17:10:18 +02:00
Nikolaus Rath	4828a8a59c	Added unit tests and travis integration	2017-07-12 17:10:18 +02:00
Nikolaus Rath	7ad9156d4d	Fix Meson manpage install Without this, Meson is looking for sshfs.1 in the source directory. However, since that is a generated file it is in the build directory.	2017-07-12 17:10:18 +02:00
Nikolaus Rath	b13abaef12	Compile with -g -O2 by default.	2017-07-12 17:10:18 +02:00
Nikolaus Rath	af97a9f4c7	Added .rst suffix to ChangeLog. That way, programs are more likely to highlight the file correctly.	2017-07-12 17:10:18 +02:00
Nikolaus Rath	63e65aeaeb	Document hardlink limitation.	2017-07-12 17:10:17 +02:00
Nikolaus Rath	70575040b4	Converted README from Markdown to Restructured Text.	2017-07-12 17:10:17 +02:00
Nikolaus Rath	ca8ba022ef	Added .dir-locals.el to setup correct indentation in Emacs	2017-07-12 17:10:17 +02:00
Nikolaus Rath	bd2ab82ea7	Updated mailing list information.	2017-07-12 17:10:17 +02:00
Nikolaus Rath	3805f365fa	Fixed compiler warnings	2017-07-12 17:10:17 +02:00
Benjamin Fleischer	f187961c7a	Don't require mount point to exists on macOS By default volumes are mounted under /Volumes on macOS. Since macOS 10.12 the /Volumes directory is root-owned. In order to allow non- privileged users to mount FUSE volumes under /Volumes FUSE will create non-existent mount points automatically. Fixes osxfuse/sshfs#27	2017-07-07 23:30:17 +02:00
Benjamin Fleischer	5c0dbfe3eb	Fall back to global I/O size on macOS The st_blksize value of struct stat represents the optimal block size for file I/O operations. FUSE for macOS will use this value when preforming read or write operations on the file. The smaller st_blksize is the more context switches are required to complete the operation. Setting st_blksize to 0 results in FUSE for macOS falling back to the global I/O size, that can be specified through the "-o iosize=..." mount-time option. Fixes osxfuse/osxfuse#389 and osxfuse/sshfs#33	2017-07-07 23:30:14 +02:00
Benjamin Fleischer	eb1b7b1b6f	Merge tag 'sshfs-2.9' Tagged release	2017-07-07 20:10:53 +02:00
Nikolaus Rath	8999210c93	Remove support for "all" workarounds This should never be used. We may add new workarounds in the future, and they should only be enabled explicitly when needed.	2017-06-06 16:45:15 -04:00
Nikolaus Rath	5ed2cf8a8b	Add fstat workaround to help output.	2017-06-06 16:45:15 -04:00
Nikolaus Rath	9f2eb04371	Document rename workaround.	2017-06-06 16:45:15 -04:00
Nikolaus Rath	6c301e043b	Dropped nodelaysrv workaround The same effect (enabling NODELAY on the server side and enabling X11 forwarding) can be achieved by explicitly passing `-o ForwardX11`	2017-06-06 16:45:15 -04:00
Nikolaus Rath	6d7ce1607a	Added support for building with Meson.	2017-06-06 16:45:15 -04:00
Nikolaus Rath	5659d0d2ea	Don't call g_thread_init() No longer required since glib 2.32.	2017-06-06 11:03:14 -04:00
Nikolaus Rath	fe3ce10ff8	Fixed compiler warning	2017-06-06 11:02:11 -04:00
Nikolaus Rath	132dd88755	Dropped nodelay workaround This was a performance improvement for SSH versions prior to 4.4. There is no reason to continue to support this.	2017-06-06 11:01:21 -04:00
Nikolaus Rath	af1f3c6235	Fixed Markdown markup.	2017-06-06 10:05:21 -04:00
Nikolaus Rath	8cc069f666	Reworked README Now also includes mailing list.	2017-06-06 10:03:15 -04:00
Nikolaus Rath	d7cb098f1d	main(): setup signal handlers before connecting Otherwise, aborting the password prompt with Ctrl+C will also kill the sshfs process and leave the mountpoint inaccessible. Fixes: #9.	2017-06-05 17:28:44 -04:00
Nikolaus Rath	c7d8500634	Added changelog entry for commit d93f1.	2017-05-31 13:54:18 -07:00
Nikolaus Rath	2896aed825	Merge branch 'master' of github.com:libfuse/sshfs	2017-05-31 13:52:44 -07:00
tpoindessous	110163d8d1	Update README.md for macOS On macOS, we don't have fusermount, so we use umount command. Thanks.	2017-05-31 13:51:30 -07:00
Jakub Jelen	d93f137c8f	Update the missing options (that make sense from ssh_config)	2017-05-31 13:51:09 -07:00
Nikolaus Rath	1dbda31786	Released 2.9	2017-04-17 13:13:38 -07:00
Nikolaus Rath	33667f2a56	Fixed up version numbers in ChangeLog	2017-04-17 13:09:35 -07:00
Nikolaus Rath	f627055bc7	Merge pull request #23 from billziss-gh/master Port SSHFS to Cygwin	2017-01-12 14:57:45 -08:00
Bill Zissimopoulos	efeed71295	remove no longer useful check for fsp_fuse_opt_parse from configure.ac	2017-01-12 11:24:08 -08:00
Nikolaus Rath	96c6138978	Merge pull request #38 from BerserkerTroll/master sshfs.1.in: remove duplicate "slave" option description	2016-12-30 11:07:57 -08:00
Berserker	1afaef8f46	sshfs.1.in: remove duplicate "slave" option description	2016-12-30 20:52:47 +03:00
Nikolaus Rath	e5acfce8ed	Merge pull request #27 from benesch/master Remove call to g_slice_set_config()	2016-07-28 16:22:16 -07:00
Benjamin Fleischer	e178150a72	Remove call to g_slice_set_config() It is unclear why G_SLICE_CONFIG_ALWAYS_MALLOC has been set before but doing so with the latest version of GLib (2.46.2) results in the following warning: GLib-CRITICAL **: g_slice_set_config: assertion 'sys_page_size == 0' failed This fixes issue osxfuse/sshfs#17	2016-07-28 12:25:37 -04:00
Nikolaus Rath	c63acf3dd7	Merge pull request #24 from kuscsik/master Makefile: fix path for sshfs.1	2016-07-01 15:09:32 -04:00
Zoltan Kuscsik	e3cd445a4e	Makefile: fix path for sshfs.1 Fix source path when build directory differs from the source dir.	2016-07-01 09:30:31 +02:00
Nikolaus Rath	1167c11901	Merge pull request #20 from rianhunter/master Require paths for truncate/fstat workarounds	2016-06-23 12:10:11 -04:00
Bill Zissimopoulos	a175c2876a	port sshfs to cygwin	2016-06-22 17:02:30 -07:00
Nikolaus Rath	b2fa759358	Released 2.8	2016-06-22 11:38:53 -07:00
Nikolaus Rath	1756abe6fd	Fixed release year of version 2.7	2016-06-22 11:37:40 -07:00
Rian Hunter	f51d7b0c6a	Require paths for truncate/fstat workarounds Commit `74bfa3850a` allowed sshfs to run without requiring a non-NULL path argument for certain operations. This was erroneous in the case of using certain workarounds.	2016-06-06 00:12:42 -07:00
Nikolaus Rath	df10d96ac2	Add extra quoting for increased compatibility. Fixes: #15.	2016-06-05 14:18:49 -04:00
Nikolaus Rath	a2dda962c4	Merge branch 'rianhunter-master'	2016-06-05 14:15:52 -04:00
Nikolaus Rath	504e26f938	Added ChangeLog entry for fsync extension	2016-06-05 14:15:36 -04:00
Rian Hunter	74bfa3850a	Support the lack of paths when cache is off Before FUSE 2.9, FUSE had to emulate unlink() if a file was still open via renaming to a hidden file. This was due to the requirement that a valid "path" argument must be submitted for many FUSE operations. FUSE 2.9 introduced the flag_nullpath_ok and flag_nopath flags that allow a FUSE file system to signal to FUSE that the "path" argument may be NULL in certain operations. sshfs doesn't require paths if the cache isn't used so communicate that information to the FUSE layer.	2016-06-01 23:27:01 -07:00
Rian Hunter	0f6f33b1b4	Implement support for "fsync@openssh.com" OpenSSH implements fsync() via the extension "fsync@openssh.com". This change uses that extension when receiving a FUSE fsync request.	2016-06-01 22:34:36 -07:00
Nikolaus Rath	a9a1cc0046	Released 2.7	2016-03-01 08:49:53 -08:00
Nikolaus Rath	b5983a0ce8	Merge pull request #8 from gapan/master Restore FAQ file	2016-02-25 08:52:49 -08:00
George Vlahavas	adc55c9d2b	Restore FAQ file This commit restores the FAQ file present in sshfs versions up to 2.5. Changes since the version in the 2.5 release: - Remove most wiki markup - Edit question about bug reports to point to the Github issue tracker - Remove unanswered questions - Minor formatting	2016-02-25 15:10:50 +02:00
Benjamin Fleischer	8589b149fd	Remove call to g_slice_set_config() It is unclear why G_SLICE_CONFIG_ALWAYS_MALLOC has been set before but doing so with the latest version of GLib (2.46.2) results in the following warning: GLib-CRITICAL **: g_slice_set_config: assertion 'sys_page_size == 0' failed This fixes issue osxfuse/sshfs#17	2016-02-18 21:18:02 +01:00
Nikolaus Rath	451f2075f2	Merge pull request #6 from jmmv/cache-options Make cache parameters configurable	2016-02-16 10:47:06 -08:00
Julio Merino	391f676705	Explicitly qualify unsigned as unsigned int	2016-02-10 23:18:35 -05:00
Julio Merino	c1e799b4da	Expose the cache clean interval settings as flags Allow the user to customize the cache regular and minimum clean intervals as flags via the new cache_clean_interval and cache_min_clean_interval options. While doing this, rename the internal variables and constants to suffix them with their unit (seconds).	2016-02-10 23:18:35 -05:00
Julio Merino	ebfeebd468	Expose the maximum cache size setting as a flag Allow the user to customize the size of the sshfs cache by adding a new max_cache_size flag and turning the hardcoded constant into a variable.	2016-02-10 23:18:35 -05:00
Julio Merino	d1ddbbcae5	Qualify timeout identifiers with their unit All timeouts are in seconds, so add a suffix to the identifier names to clearly denote the unit.	2016-02-10 23:18:35 -05:00
Nikolaus Rath	e812e29d39	Merge pull request #5 from jmmv/merge-osxfuse Merge osxfuse.	2016-02-10 19:53:49 -08:00
Julio Merino	80db43d7dc	Improve the sshnodelay hack after osxfuse's merge Document the strage-looking symbol interposition that is necessary for the OS X case. While doing this, homogenize the code to do the real connect call for both the Linux and OS X cases into a helper function. This logic is generic and should not be replicated into various OS-specific cases.	2016-02-08 21:40:30 -05:00
Julio Merino	27e7029148	Unconditionally mlock the password in memory Revision `b4023a19` added an mlock call to ensure the sshfs password is kept in memory, but did so only for OS X. This is a good idea in general, so let's remove the condition.	2016-02-08 21:26:53 -05:00
Julio Merino	30e90ae080	Remove apparently-unnecessary lock Revision `b4023a19dd`, which imported the MacFUSE-specific sshfs fixes into osxfuse-sshfs, added a lock to handle the refs reference counter of the sshfs_file structure. However, this lock was only added for OS X, which is a very strange thing to do. One may think that this was only because MacFUSE 2.2 had some semantics that differed from regular FUSE, and that would have been quite stupid for compatibility reasons. A few simple tests show no issues after removing this lock, so let's keep it out for now. If things break, we know what to look at.	2016-02-08 21:20:21 -05:00
Julio Merino	9b4ca1aade	Avoid using cpp for sshfs.1 generation Move the logic to determine which values to stick into the manual page to the configure script and replace the logic to build the sshfs.1 manual page with sed instead of abusing cpp. I'm not using AC_OUTPUT here because this macro is typically used to generate support build files. Final artifacts of the build should, in general, be built by the Makefile itself.	2016-02-08 21:10:48 -05:00
Julio Merino	a03d3eab39	Fix path to compat in -I flag When defining a -I flag to point into the source directory, we should prefix the directory with ${srcdir} so that it can be found when the build is configured to use a build directory that differs from the source directory. This fixes "make distcheck".	2016-02-08 20:50:23 -05:00
Julio Merino	665bb97ef6	Document merge of osxfuse's sshfs	2016-02-08 20:50:23 -05:00
Julio Merino	b7e8fee81b	Sync AUTHORS list after osxfuse-sshfs's merge	2016-02-08 20:50:23 -05:00
Julio Merino	869aa42e97	Remove LIBDIR explicit definition Makefile.am always sets LIBDIR in CPPFLAGS. There is no need for sshfs.c to redefine it to a bogus value when not present, and much less to only do so for the Darwin case only.	2016-02-08 20:50:23 -05:00
Julio Merino	d8230e72ca	Drop the cache_enabled hack cache_enabled leaked the cache.on setting from the cache module abstraction back into sshfs, and it only did so for the Darwin case. This hack was being used to avoid calling cache_add_attr and cache_invalidate when the cache was disabled... but these two functions already do nothing when in that case: there is no need to do a second check in the caller.	2016-02-08 20:50:22 -05:00
Julio Merino	e0025219b3	Drop OSXFUSE_SSHFS_VERSION Now that we are unifying osxfuse's sshfs into libfuse's version, there should not be two different version identifiers. Drop osxfuse's one.	2016-02-08 20:50:22 -05:00
Julio Merino	19ab22abec	Improve sshfs.1 manpage generation * Fix dependencies of the sshfs.1 target to actually specify sshfs.1.in as a source. * Ensure that failures during the generation of sshfs.1 do not result in a potentially bogus manpage by first outputting the contents to a temporary file unknown to the Makefile rule and then replacing the target file once all is known to be OK. * Use $(AM_V_GEN) in the command to respect automake's silent rules.	2016-02-08 20:50:22 -05:00
Julio Merino	3bf3be3bcd	Rename arch to osname Operating system names are not architectures; therefore, rename the arch variable to osname to better represent its contents. While doing this, drop a bunch of unused values from the osname.	2016-02-08 20:46:45 -05:00
Julio Merino	ddbe3bee44	Merge remote-tracking branch 'osxfuse/master' into merge-osxfuse Pull in all changes from osxfuse's fork of sshfs into libfuse's sshfs. There need not be two different copies of this codebase, particularly because libfuse's version is already autoconf-ified and can support multiple platforms. The merge is mostly clean with just a few manual edits to resolve conflicts.	2016-02-08 20:46:37 -05:00
Nikolaus Rath	b10d21db31	Merge pull request #4 from gala132/patch-1 Fix typo in README.md	2016-02-05 09:25:28 -08:00
gala	f7c7713a82	Update README.md Typo fixed	2016-02-05 09:18:25 +01:00
Qais Patankar	9bcb989454	Fix english	2015-03-16 15:34:34 +01:00
Benjamin Fleischer	f2b17c299b	Bump version to 2.5.0	2014-02-03 09:01:38 +01:00
Benjamin Fleischer	c3d83ee24b	Fix redefinition of struct __local_sem_t	2014-02-03 09:01:26 +01:00
Benjamin Fleischer	1fc97d3f2c	Add AC_CANONICAL_TARGET to configure.ac	2014-02-03 09:01:07 +01:00
Benjamin Fleischer	b42f84218c	Merge tag 'sshfs_2_5' Conflicts: sshfs.c	2014-02-02 23:16:13 +01:00
Benjamin Fleischer	990f30d767	Merge remote-tracking branch 'upstream/master' Conflicts: ChangeLog configure.ac sshfs.1.in sshfs.c	2013-08-03 11:50:50 +02:00
Benjamin Fleischer	d04fd55128	Update copyright year in darwin_compat	2013-01-08 15:44:18 +01:00
Benjamin Fleischer	1458193728	Add unnamed semaphore implementation for Mac OS X In the past we relied on libosxfuse including a working unnamed semaphore implmentation for Mac OS X. This will not be the case in future releases of OSXFUSE, therefore we need to add our own implementation.	2013-01-08 15:32:57 +01:00
Benjamin Fleischer	66458931dd	Bump version to OSXFUSE SSHFS 2.4.1 The only difference between version 2.4.0 and 2.4.1 is the updated man page to reflect Darwin/OS X specific changes to upstream SSHFS.	2012-03-11 17:36:01 +01:00
Benjamin Fleischer	f4631f0a17	Add Darwin/OS X specific information to man page * Volumes are unmounted using "umount" not "fusermount" * idmap=user is the deafault setting on Darwin/OS X	2012-03-11 17:35:25 +01:00
Benjamin Fleischer	3c44e22ddd	Bump version to OSXFUSE SSHFS 2.4.0	2012-03-09 22:52:56 +01:00
Benjamin Fleischer	b389c66b32	Use "#ifdef __APPLE__" instead of "#if __APPLE__"	2012-03-09 22:51:56 +01:00
Miklos Szeredi	f64407d865	Released 2.4	2012-03-09 22:51:49 +01:00
Mike Kelly	eb60e2d1a2	make sure idmap files aren't writable by others otherwise, other local users could change the mapping, and gain access to things they shouldn't	2012-03-09 22:48:58 +01:00
Chris Wolfe	0d34c7b742	Add slave option to run sftp over stdin and stdout Add -o slave. This option routes the sftp communication over stdin and stdout, bypassing SSH and network.	2012-03-09 22:48:58 +01:00
Chris Wolfe	ff32332e83	Split fd into separate read and write pipes	2012-03-09 22:48:58 +01:00
Miklos Szeredi	c1284b4089	fix unused but set variables cache.c: In function ‘cache_add_attr’: cache.c:167:9: warning: variable ‘now’ set but not used [-Wunused-but-set-variable] cache.c: In function ‘cache_add_dir’: cache.c:188:9: warning: variable ‘now’ set but not used [-Wunused-but-set-variable] cache.c: In function ‘cache_add_link’: cache.c:212:9: warning: variable ‘now’ set but not used [-Wunused-but-set-variable]	2012-03-09 22:48:58 +01:00
Chris Wolfe	0120e6b461	Remove some trailing whitespace. Verified with `cat -vet` and `grep '\s$'`	2012-03-09 22:48:58 +01:00
Mike Kelly	1ac41d2ae2	skip blank lines	2012-03-09 22:48:58 +01:00
Mike Kelly	ea6fa1d7c9	increase portability getline() isn't widely available yet, use fgets() instead	2012-03-09 22:48:58 +01:00
Mike Kelly	6a954f429c	fix typo in error message	2012-03-09 22:44:14 +01:00
Mike Kelly	0e87004ab2	default to erroring if we can't remap a uid/gid add a '-o nomap=ignore\|error' option, which defaults to 'error'	2012-03-09 22:43:58 +01:00
Benjamin Fleischer	e6f7fb4e50	Make IDMAP_USER the default option on OS X UID/GID mapping had been enabled in previous versions of SSHFS for MacFUSE/ OSXFUSE by default. This is the expected behavior.	2012-03-09 22:30:14 +01:00
Mike Kelly	a6b6b5c820	Add -o idmap=file, -o uidmap=FILE, -o gidmap=FILE These options allow you to create a pair of local files, with username:uid/groupname:gid pairs, one per line. Alternatively, files can be in standard /etc/passwd / /etc/group format. The uid/gids are for the remote server, their local counterparts are looked up with a local getpwnam/getgrnam call. Any stat() calls will show with the remapped local uid/gid, and any chown() calls will be remapped back to the remote uid/gid.	2012-01-22 11:19:29 +01:00
Mike Kelly	a306a80b6e	Fix a possible small memory leak	2012-01-22 11:16:43 +01:00
Mike Kelly	bb3ea51117	Fix typo in error message s/FD_CLOESEC/FD_CLOEXEC/	2012-01-22 11:16:43 +01:00
Miklos Szeredi	20fafed0a4	Fix error handling in sshfs_read_end Reported by Mike Kelly	2012-01-22 11:16:43 +01:00
Miklos Szeredi	69b2b3cc0e	Make chown respect the UID mapping policy Reported and tested by Vivenzio Pagliari	2012-01-22 11:16:37 +01:00
Miklos Szeredi	fa9bfc6d08	Submit max 32k reads and writes to the sftp server Also don't limit the kernel to 64k reads and writes, rather split into 32k sized chunks and send them to the server all at once. This is more efficient and less demanding from the server. Reported by Ludovic Courtès. Fix suggested by Niels Möller	2012-01-22 10:45:50 +01:00
Miklos Szeredi	90619fe249	Add locking around modifver and connver	2012-01-22 10:45:36 +01:00
Miklos Szeredi	04a610bad1	Fix double free if reconnection races with request sending Patch by E. Kuemmerle	2012-01-22 10:45:16 +01:00
Miklos Szeredi	d8da0c4ed6	Remove "-oPreferredAuthentications" from ssh options Remove "-oPreferredAuthentications" from ssh options if the "password_stdin" option is used. Reported by E. Kuemmerle	2012-01-22 10:45:06 +01:00
Miklos Szeredi	163683d9ef	Add "FIXME: really needs LSETSTAT extension (debian Bug#640038)"	2012-01-22 10:44:55 +01:00
Percy Jahn	f2086ccfbc	sshfs: fstat workaround Add "-oworkaround=fstat" for SFTP servers which don't support the FSTAT message.	2012-01-22 10:44:45 +01:00
Benjamin Fleischer	b4023a19dd	Apply modified sshfs 2.2 patch from MacFUSE Based on Amit Singh's work at http://code.google.com/p/macfuse/	2012-01-20 10:02:14 +01:00