Released 3.3.0

Add support for printing release contributors.
Dropped support for writeback caching
2017-09-20 18:08:27 +01:00 · 2017-09-20 18:07:29 +01:00 · 2017-09-20 17:56:44 +01:00 · 2017-09-20 14:43:34 +01:00 · 2017-09-20 14:43:34 +01:00 · 2017-09-20 14:43:31 +01:00
33 changed files with 2632 additions and 1821 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,21 @@
+sudo: required
+dist: trusty
+
+language:
+    - c
+addons:
+  apt:
+    sources:
+    - ubuntu-toolchain-r-test
+    packages:
+    - valgrind
+    - clang
+    - gcc
+    - gcc-6
+    - python-docutils
+    - python3-pip
+before_install:
+   - sudo -H python3 -m pip install pip==8.1.1
+install: test/travis-install.sh
+script: test/travis-build.sh
+
@@ -1 +1,37 @@
-Miklos Szeredi     <miklos@szeredi.hu>
+Current Maintainer
+------------------
+
+Nikolaus Rath <Nikolaus@rath.org>
+
+
+Past Maintainers
+----------------
+
+Miklos Szeredi <miklos@szeredi.hu> (until 12/2015)
+
+
+Contributors (autogenerated list)
+---------------------------------
+
+Alan Jenkins <alan.christopher.jenkins@gmail.com>
+Alexander Neumann <alexander@bumpern.de>
+Anatol Pomozov <anatol.pomozov@gmail.com>
+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>
+harrim4n <git@harrim4n.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,573 +0,0 @@
-2012-03-08  Miklos Szeredi <miklos@szeredi.hu>
-
-	* Released 2.4
-
-2012-03-08  Miklos Szeredi <miklos@szeredi.hu>
-
-	* 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.  Patch by Mike Kelly
-
-2012-02-08  Chris Wolfe <cwolfe@chromium.org>
-
-	* Add -o slave. This option routes the sftp communication over stdin
-	and stdout, bypassing SSH and network.
-
-2011-12-16  Mike Kelly <mike@pair.com>
-
-	* Add -o idmap=file, -o uidmap=FILE, -o gidmap=FILE. These options
-	allow you to create a pair of local files, similar to /etc/passwd or
-	/etc/group files from the remote server, and use those to remap all
-	the given UIDs/GIDs.
-
-2011-11-25  Miklos Szeredi <miklos@szeredi.hu>
-
-	* Make chown respect the UID mapping policy.  Reported and tested
-	by Vivenzio Pagliari
-
-2011-11-16  Miklos Szeredi <miklos@szeredi.hu>
-
-	* 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
-
-2011-11-14  Miklos Szeredi <miklos@szeredi.hu>
-
-	* Fix double free if reconnection races with request sending.
-	Patch by E. Kuemmerle
-
-	* Add locking around modifver and connver
-
-2011-10-21  Miklos Szeredi <miklos@szeredi.hu>
-
-	* Remove "-oPreferredAuthentications" from ssh options if the
-	"password_stdin" option is used.  Reported by E. Kuemmerle
-
-2011-08-24  Miklos Szeredi <miklos@szeredi.hu>
-
-	* Add "-oworkaround=fstat" for SFTP servers which don't support
-	the FSTAT message.  Patch by: Percy Jahn
-
-2011-07-01  Miklos Szeredi <miklos@szeredi.hu>
-
-	* Released 2.3
-
-2011-07-01  Miklos Szeredi <miklos@szeredi.hu>
-
-	* Add hard link operation.  Works if the server supports the
-	"hardlink@openssh.com" protocol extension.
-
-2011-03-25  Miklos Szeredi <miklos@szeredi.hu>
-
-	* Fix possible deadlock on reconnection.  Reported by Florian
-	Zumbiehl
-
-2011-01-25  Miklos Szeredi <miklos@szeredi.hu>
-
-	* Fix cleanup when ssh connection is terminated.  This prevents
-	sshfs hanging when the server is rebooted, for example.
-
-2010-03-16  Miklos Szeredi <miklos@szeredi.hu>
-
-	* Set FD_CLOEXEC on fuse device.  This prevents deadlocks that
-	happen in some circumstances (bugzilla.kernel.org #12864).
-	Reported by Tim Connors
-
-2009-07-15  Miklos Szeredi <miklos@szeredi.hu>
-
-	* Check mountpoint and fuse options before starting an ssh
-	session (debian bug #535333).  This is only supported if compiled
-	against libfuse-2.6 or later. Reported by Greg Kochanski
-
-	* Check that the remote path specified refers to the same type of
-	file as the mountpoint, i.e. both are directories or both are
-	non-directories (debian bug #535343).  Reported by Greg Kochanski
-
-	* Allow mounting a single non-directory from the server
-
-2009-07-15  Sebastian Dransfeld <sebastid@tango.flipp.net>
-
-	* Add option 'delay_connect': This will always create the sshfs mount,
-	even if the connection to the server can't be established.
-
-2009-01-27  Miklos Szeredi <miklos@szeredi.hu>
-
-	* Print usage information and version to stdout, not stderr.
-	Libfuse also needs to be fixed up.  Reported by Kārlis Repsons
-
-2008-10-20  Miklos Szeredi <miklos@szeredi.hu>
-
-	* Released 2.2
-
-2008-10-20  Miklos Szeredi <miklos@szeredi.hu>
-
-	* Escape commas in fsname option if libfuse supports it
-
-2008-10-08  Miklos Szeredi <miklos@szeredi.hu>
-
-	* Handle numerical IPv6 addresses enclosed in square brackets.
-	Reported by Andre-John Mas
-
-	* Fix error if username contains a comma character.  Reported by
-	Yang Zhang
-
-	* Fix harmless glib assertations with "cache=no"
-
-2008-07-11  Miklos Szeredi <miklos@szeredi.hu>
-
-	* Released 2.1
-
-2008-07-11  Miklos Szeredi <miklos@szeredi.hu>
-
-	* Fix statvfs extension to match the current protocol in
-	opensshfs
-
-	* Check version numbers of extensions, so such changes wouldn't
-	cause stupid behavior
-
-2008-06-24  Miklos Szeredi <miklos@szeredi.hu>
-
-	* Add '-F' option to specify the ssh config file.  Patch by Pat
-	Pascal.
-
-2008-05-06  Miklos Szeredi <miklos@szeredi.hu>
-
-	* Fix bug in caching which could cause file corruption for append
-	mode writes.  Reported by Jose Alonso
-
-2008-05-05  Miklos Szeredi <miklos@szeredi.hu>
-
-	* Fix compile on OS X.  Original patch from Michael G Schwern
-
-	* Fix compile on Solaris.  Reported by Jean-Jacques Sarton
-
-2008-04-23  Miklos Szeredi <miklos@szeredi.hu>
-
-	* Released 2.0
-
-2008-04-23  Miklos Szeredi <miklos@szeredi.hu>
-
-	* Add manual page.  Written by Bartosz Fenski
-
-2008-04-22  Miklos Szeredi <miklos@szeredi.hu>
-
-	* Add missing ssh options: ControlMaster, ControlPath,
-	KbdInteractiveAuthentication, KbdInteractiveDevices, LocalCommand,
-	RekeyLimit (Debian bug #430225).
-
-	* Allow the '-ossh_command=CMD' command to contain parameters.
-	Escape charater is backslash.
-
-	* Limit write requests to 64kB.
-
-	* Support "statvfs@openssh.com" extension, which will be available
-	in OpenSSH 5.1.
-
-2008-04-21  Miklos Szeredi <miklos@szeredi.hu>
-
-	* Fix incorrect disk usage reported by 'du' for files of size 4GB
-	or above.  Reported by Christian Boltz.
-
-2008-04-16  Miklos Szeredi <miklos@szeredi.hu>
-
-	* If debugging is enabled, print some statistics at exit about the
-	number of bytes transferred, etc..
-
-2008-03-31  Miklos Szeredi <miklos@szeredi.hu>
-
-	* Support "posix-rename@openssh.com" extension available in
-	OpenSSH 4.9.  This allows rename to be atomic even when target
-	file or directory exists.  If available, the extension will be
-	used instead of the rename operation in the original protocol and
-	the "-oworkaround=rename" option will be ignored.
-
-2008-03-28  Miklos Szeredi <miklos@szeredi.hu>
-
-	* Add support for password authentication with pam_mount.
-	Original patch and help with testing: John S. Skogtvedt
-
-2008-03-03  Miklos Szeredi <miklos@szeredi.hu>
-
-	* Fix ssh debug only appearing if "-d" is used.  Reported by
-	Michael Gorbach
-
-2008-01-03  Miklos Szeredi <miklos@szeredi.hu>
-
-	* Fix condition for building of sshnodelay.so
-
-2007-12-17  Miklos Szeredi <miklos@szeredi.hu>
-
-	* Released 1.9
-
-2007-12-12  Miklos Szeredi <miklos@szeredi.hu>
-
-	* Fix checking for fuse_opt_parse in configure
-
-2007-12-11  Miklos Szeredi <miklos@szeredi.hu>
-
-	* Fill in st_ctime attribute with st_mtime, instead of leaving it
-	zero
-
-	* Check for OpenSSH version >= 4.4, and if found, don't build the
-	sshnodelay.so workaround
-
-2007-12-10  Miklos Szeredi <miklos@szeredi.hu>
-
-	* Fix crash on writing files, caused by missing locking around
-	sshfs_file_get()
-
-	* Don't time requests when not debugging
-
-	* Add subtype support with libfuse >= 2.7.0
-
-	* Abort on allocation failure instead of exit
-
-	* Correctly show default of nodelaysrv workaround in help message
-
-2007-05-16  Miklos Szeredi <miklos@szeredi.hu>
-
-	* Released 1.8
-
-2007-05-15  Miklos Szeredi <miklos@szeredi.hu>
-
-	* Add needed g_thread_init() to fix rare crashes.  Reported by
-	Dimitrios Apostolou
-
-	* Fix memory leak in sshfs_open_common()
-
-2007-04-18  Miklos Szeredi <miklos@szeredi.hu>
-
-	* Fix crash within gdb, caused by sem_wait() returning with an
-	error on interrupt.  Reported by Dimitrios Apostolou
-
-	* Fix spurious cache entries remaining after renaming a directory
-
-2007-02-28  Miklos Szeredi <miklos@szeredi.hu>
-
-	* Don't set DISPLAY environment variable to "", because it breaks
-	ssh-askpass.  Make nodelaysrv_workaround default to off, because
-	with this change it may have security implications.
-
-2007-02-19  Miklos Szeredi <miklos@szeredi.hu>
-
-	* OpenSSH sftp-server can read requests faster, than it processes
-	them, when it's buffer is full it aborts.  This can happen on a
-	large upload to a slow server.  Work around this by limiting the
-	total size of outstanding reqests.  Debian bug #365541.  Tracked
-	down by Thue Janus Kristensen
-
-	* Add --disable-sshnodelay configure option.  The sshnodelay.so
-	hack shouldnt be needed with OpenSSH client versions >= 4.3
-
-2006-12-20  Miklos Szeredi <miklos@szeredi.hu>
-
-	* Work around write performace issues due to missing TCP_NODELAY
-	in sshd.  Reported by Justin Searle
-
-2006-11-10  Miklos Szeredi <miklos@szeredi.hu>
-
-	* Fix bug which ommitted directory entries for symlinks with the
-	-ofollow_symlinks option.  Bug reported by Mikael Ståldal
-
-2006-09-29  Miklos Szeredi <miklos@szeredi.hu>
-
-	* Fix segfault if there are outstanding writes to the server after
-	release on the file descriptor.  This only happened on FreeBSD.
-	Reported by Andriy Gapon
-
-2006-08-18  Miklos Szeredi <miklos@szeredi.hu>
-
-	* Released 1.7
-
-2006-08-17  Miklos Szeredi <miklos@szeredi.hu>
-
-	* Cosmetics on bogus statfs numbers
-
-2006-08-16  Miklos Szeredi <miklos@szeredi.hu>
-
-	* Add option 'follow_symlinks' to resolve symlinks on the server.
-
-	* On setups where the login shell prints a banner, the sftp
-	protocol was confused, and bailed out with "reply len too large:
-	...".  So iterate over any rubbish read immediately after login
-	until a valid reply is found.
-
-	* Check remote directory for existence before mounting.  Closes
-	Ubuntu bug #46633
-
-2006-03-10  Miklos Szeredi <miklos@szeredi.hu>
-
-	* Use socketpair() instead of pipe() for communication between ssh
-	and sshfs.  Patch from Csaba Henk
-
-	* Update to FUSE interface version 26
-
-2006-03-09  Miklos Szeredi <miklos@szeredi.hu>
-
-	* Released 1.6
-
-2006-03-09  Miklos Szeredi <miklos@szeredi.hu>
-
-	* Fix segfault if remote host is down and reconnection is enabled
-
-2006-03-08  Miklos Szeredi <miklos@szeredi.hu>
-
-	* Fix bug in symlink transformation.  Reported by Ralf Hoffmann
-
-2006-02-24  Miklos Szeredi <miklos@szeredi.hu>
-
-	* Add workaround for broken truncate on old sftp servers.  Can be
-	enabled with '-oworkaround=truncate'.  Patch from Joseph M Link
-
-2006-02-23  Miklos Szeredi <miklos@szeredi.hu>
-
-	* Avoid double memcpy on writes.  Patch by Joseph M Link
-
-	* More memory copy avoidance
-
-2006-02-22  Miklos Szeredi <miklos@szeredi.hu>
-
-	* Add -fPIC to the comile flags of sshnodelay.so.  Reported by
-	Anthony Kolasny
-
-2006-02-20  Miklos Szeredi <miklos@szeredi.hu>
-
-	* Released 1.5
-
-2006-02-19  Miklos Szeredi <miklos@szeredi.hu>
-
-	* Fix compilation with old FUSE versions.  Report by Kurt George
-	Gjerde
-
-2006-02-16  Miklos Szeredi <miklos@szeredi.hu>
-
-	* Block TERM/INT/HUP/QUIT signals in sshfs reading thread, so they
-	will always be received by the FUSE main thread.  Fixes the
-	"double ^C" problem seen on FreeBSD.
-
-	* Use 'auto_cache' option if available, so that file cache is not
-	thrown away on each open.  This should make repeated reading of a
-	file much much faster.
-
-2006-01-31  Miklos Szeredi <miklos@szeredi.hu>
-
-	* Fix problems with nodelay workaround on FreeBSD.
-
-2006-01-30  Miklos Szeredi <miklos@szeredi.hu>
-
-	* Fix data consitency bug if readahead is enabled and writes are
-	intermixed with reads.  Solution is far from optimal, since it
-	will prevent readahead in the above situation.  If used with FUSE
-	>= 2.6.0 with Linux-2.6.X, readahead will be done by the kernel,
-	and hence there will be no performance penalty.  Bug reported and
-	test program written by Wolfgang Köbler.  Further testing on
-	FreeBSD by Csaba Henk
-
-2006-01-29  Miklos Szeredi <miklos@szeredi.hu>
-
-	* Add '-olarge_read' option for Linux-2.4.*.  This should
-	generally improve download performance
-
-2006-01-27  Miklos Szeredi <miklos@szeredi.hu>
-
-	* Add workaround (enabled by default) for ssh clients not setting
-	TCP_NODELAY on the network connection.  Currently this is all
-	known versions of openssh.  This may improve download speed in
-	some circumstances
-
-	* Make it possible to idividually disable workarounds with a "no"
-	prefix
-
-	* Change '-otransform_symlinks' not to prefix with the mountpoint
-	(which is fragile wrt. moving/binding the mount).  Rather convert
-	absolute symlinks to relative if possible.  Does not yet work if
-	base path is itself relative
-
-2006-01-25  Miklos Szeredi <miklos@szeredi.hu>
-
-	* Use TCP_NODELAY socket option for direct connection.  This may
-	improve download speed in some circumstances
-
-2006-01-20  Miklos Szeredi <miklos@szeredi.hu>
-
-	* Update to fuse API 2.6
-
-	* Don't do readahead in sshfs if it's done in kernel
-
-2006-01-14  Miklos Szeredi <miklos@szeredi.hu>
-
-	* Released 1.4
-
-2006-01-09  Miklos Szeredi <miklos@szeredi.hu>
-
-	* Added 'transform_symlinks' option to "fix-up" absolute symlinks.
-	Patch by Paul Jarc
-
-	* Add option parsing implementation, so linking with older than
-	2.5.0 libfuse still works.
-
-2005-12-09  Miklos Szeredi <miklos@szeredi.hu>
-
-	* Use new option parsing interface of FUSE
-
-2005-11-28  Miklos Szeredi <miklos@szeredi.hu>
-
-	* Set statvfs::f_frsize
-
-2005-11-23  Miklos Szeredi <miklos@szeredi.hu>
-
-	* Fix warnings on 64bit systems.  Reported by D. R. Evans
-
-2005-11-16  Miklos Szeredi <miklos@szeredi.hu>
-
-	* Replace EPROTO with the more portable EIO
-
-	* Fix bug in option parsing.  Reported by Csaba Henk
-
-2005-10-29  Miklos Szeredi <miklos@szeredi.hu>
-
-	* Use FUSE version 25 if available
-
-	* Add <sys/socket.h> include.  Reported by Csaba Henk
-
-2005-10-29  Miklos Szeredi <miklos@szeredi.hu>
-
-	* Released 1.3
-
-2005-10-28  Miklos Szeredi <miklos@szeredi.hu>
-
-	* Add atomic create+open and ftruncate operation.  This should fix
-	issues with 'cp' and other programs failing with "Permission
-	denied".  To be effective, needs FUSE version 2.5 and kernel
-	version 2.6.15 (just a guess, since neither of them is released
-	yet).
-
-2005-10-27  Miklos Szeredi <miklos@szeredi.hu>
-
-	* Add support for SSH protocol version 1.  Bug reported by Miklos
-	Bagi Jr.
-
-2005-10-26  Miklos Szeredi <miklos@szeredi.hu>
-
-	* Fix typo (ConnectTimeout -> ConnectionTimeout) in ssh options.
-	Bug reported by Miklos Bagi Jr.
-
-2005-10-19  Miklos Szeredi <miklos@szeredi.hu>
-
-	* GNOME Nautilus fails to copy file to sshfs filesystem, because
-	FUSE returns zero free space.  So instead return huge (999999999
-	kbytes) amount of free space, yet it should be obvious that the
-	number is artificial.  Bug report by Peter Kronheimer
-
-2005-10-18  Miklos Szeredi <miklos@szeredi.hu>
-
-	* Add remote uid detection and translation ('idmap=user' option).
-	Idea and implementation details worked out by Jean-Marc Valin
-
-2005-10-17  Miklos Szeredi <miklos@szeredi.hu>
-
-	* Add one more missing lock.
-
-	* Add workaround for failure to rename to an existing file.  Based
-	on patch by Michael Best
-
-2005-10-15  Miklos Szeredi <miklos@szeredi.hu>
-
-	* Protect request ID allocation with mutex.  Bug report by Tvrtko
-	Ursulin
-
-2005-08-17  Miklos Szeredi <miklos@szeredi.hu>
-
-	* Try to calculate approximate disk usage of files from their
-	size, so that 'du' returns meaningful results.  Problem reported
-	by Bernd Amend.
-
-2005-08-15  Miklos Szeredi <miklos@szeredi.hu>
-
-	* Released 1.2
-
-2005-08-13  Miklos Szeredi <miklos@szeredi.hu>
-
-	* Add 'reconnect' option, which tries to reconnect to the server
-	when the connection is broken.  If a password is required for
-	connection, it is recommended that you install ssh-askpass, and
-	set the SSH_ASKPASS environment variable (see 'man ssh' for more
-	details).
-
-2005-05-05  Miklos Szeredi <miklos@szeredi.hu>
-
-	* Work around missing truncate() support in some older sftp
-	servers (only works for zero size truncate).  Thanks to Eduard
-	Czimbalmos for the bug report and help with testing
-
-2005-04-13  Miklos Szeredi <miklos@szeredi.hu>
-
-	* Fix compilation with gcc-2.95.  Reported by David A. Gershman
-
-2005-03-08  Miklos Szeredi <miklos@szeredi.hu>
-
-	* Make it work on server version 2 (e.g. Sun_SSH_1.0.1).  Report
-	and testing by Pieter J. Kersten
-
-2005-03-04  Miklos Szeredi <miklos@szeredi.hu>
-
-	* Released 1.1
-
-2005-03-03  Miklos Szeredi <miklos@szeredi.hu>
-
-	* Slightly optimize readahead.  Still not clever enough to always
-	keep the pipe filled.
-
-	* Add 'sshfs_debug' option
-
-2005-02-17  Miklos Szeredi <miklos@szeredi.hu>
-
-	* Parse 'max_read' mount option and if smaller than 65536 forward
-	to FUSE
-
-2005-02-16  Miklos Szeredi <miklos@szeredi.hu>
-
-	* Added simple readahead (big performance gain in case of
-	sequential read pattern).  Can be disabled with '-o no_readahead'
-
-2005-02-14  Miklos Szeredi <miklos@szeredi.hu>
-
-	* Added asynchronous writeback (big performance gain) and made
-	this the default.  Can be disabled with '-o sshfs_sync'
-
-2005-02-09  Miklos Szeredi <miklos@szeredi.hu>
-
-	* Added option to start arbitary command instead of 'ssh'
-
-	* Re-added '-p PORT' as a convenience option, also '-C' works as
-	in ssh.
-
-2005-02-08  Miklos Szeredi <miklos@szeredi.hu>
-
-	* Add caching of symlinks
-
-	* Add support for many ssh options to be passed to ssh
-
-	* Port number can now actually be specified with "-o port=PORT",
-	bug spotted by Andrew Ukrainec
-
-2005-02-07  Miklos Szeredi <miklos@szeredi.hu>
-
-	* Separate attribute caching to a separate layer
-
-	* Add caching of directory contents
-
-2005-02-03  Miklos Szeredi <miklos@szeredi.hu>
-
-	Fix PKG_CONFIG_PATH setting in configure.ac (reported by Alpar
-	Juttner)
-
-2005-01-09  Miklos Szeredi <miklos@szeredi.hu>
-
-	* Released 1.0
-
-2004-12-04  Miklos Szeredi <miklos@szeredi.hu>
-
-	* Started ChangeLog
@@ -0,0 +1,211 @@
+SSHFS 3.3.0 (2017-09-20)
+------------------------
+
+* Dropped support for writeback caching (and, as a consequence,
+  "unreliable append" operation). As of kernel 4.14, the FUSE module's
+  writeback implementation is not compatible with network filesystems
+  and there are no imminent plans to change that.
+* Add support for mounting from /etc/fstab
+* Dropped support for building with autotools.
+* Added missing options to man page.
+
+Release 3.2.0 (2017-08-06)
+--------------------------
+
+* Re-enabled writeback cache.
+* SSHFS now supports O_APPEND.
+
+Release 3.1.0 (2017-08-04)
+--------------------------
+
+* Temporarily disabled the writeback cache feature, since there
+  have been reports of dataloss when appending to files when
+  writeback caching is enabled.
+
+* Fixed a crash due to a race condition when listing
+  directory contents.
+
+* For improved backwards compatibility, SSHFS now also silently
+  accepts the old ``-o cache_*`` options.
+  
+Release 3.0.0 (2017-07-08)
+--------------------------
+
+* sshfs now requires libfuse 3.1.0 or newer.
+* When supported by the kernel, sshfs now uses writeback caching.
+* The `cache` option has been renamed to `dir_cache` for clarity.  
+* Added unit tests
+* --debug now behaves like -o debug_sshfs, i.e. it enables sshfs
+  debugging messages rather than libfuse debugging messages.
+* 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.5 (2014-01-14)
+------------------------
+
+* Some performance improvements for large directories.
+* New `disable_hardlink` option.
+* Various small bugfixes.
+
+Release 2.4 (2012-03-08)
+------------------------
+
+* New `slave` option.
+* New `idmap`, `uidmap` and `gidmap` options.  
+* Various small bugfixes.
+
+Release 2.3 (2011-07-01)
+------------------------
+
+* Support hard link creation if server is OpenSSH 5.7 or later
+* Small improvements and bug fixes  
+* Check mount point and options before connecting to ssh server
+* New 'delay_connect' option
+
+Release 2.2 (2008-10-20)
+------------------------
+
+* Handle numerical IPv6 addresses enclosed in square brackets
+* Handle commas in usernames
+
+Release 2.1 (2008-07-11)
+------------------------
+
+* Small improvements and bug fixes  
+
+Release 2.0 (2008-04-23)
+------------------------
+
+* Support password authentication with pam_mount
+
+* Support atomic renames if server is OpenSSH 4.9 or later
+
+* Support getting disk usage if server is OpenSSH 5.1 or later
+
+* Small enhancements and bug fixes
+
+What is new in 1.9
+------------------
+
+* Fix a serious bug, that could result in sshfs hanging, crashing, or
+  reporting out-of-memory
+
+What is new in 1.8
+------------------
+
+* Bug fixes
+
+What is new in 1.7
+------------------
+
+* Tolerate servers which print a banner on login
+
+* Small improvements
+
+What is new in 1.6
+------------------
+
+* Workaround for missing truncate operation on old sftp servers
+
+* Bug fixes
+
+What is new in 1.5
+------------------
+
+* Improvements to read performance.  Now both read and write
+  throughput should be very close to 'scp'
+
+* If used with FUSE 2.6.0 or later, then perform better data caching.
+  This should show dramatic speed improvements when a file is opened
+  more than once
+
+* Bug fixes
+
+What is new in 1.4
+------------------
+
+* Updated to version 25 of libfuse API
+
+* This means that the 'cp' of readonly file to sshfs bug is finally
+  solved (as long as using libfuse 2.5.0 or later *and* Linux 2.6.15
+  or later)
+
+* Sshfs now works on FreeBSD
+
+* Added option to "transform" absolute symbolic links
+
+What is new in 1.3
+------------------
+
+* Add workaround for failure to rename to an existing file
+
+* Simple user ID mapping
+
+* Estimate disk usage of files based on size
+
+* Report "infinite" disk space
+
+* Bug fixes
+
+What is new in 1.2
+------------------
+
+* Better compatibility with different sftp servers
+
+* Automatic reconnect (optional)
+
+What is new in 1.1
+------------------
+
+* Performance improvements:
+
+   - directory content caching
+
+   - symlink caching
+
+   - asynchronous writeback
+
+   - readahead
+
+* Fixed '-p' option
+
+What is new in 1.0
+------------------
+
+* Initial release
@@ -1,31 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-bin_PROGRAMS = sshfs
-
-sshfs_SOURCES = sshfs.c cache.c cache.h
-if FUSE_OPT_COMPAT
-sshfs_SOURCES += compat/fuse_opt.c compat/fuse_opt.h
-endif
-
-sshfs_LDADD = $(SSHFS_LIBS)
-sshfs_CFLAGS = $(SSHFS_CFLAGS)
-sshfs_CPPFLAGS = -D_REENTRANT -DFUSE_USE_VERSION=26 -DLIBDIR=\"$(libdir)\"
-
-EXTRA_DIST = sshnodelay.c FAQ.txt
-CLEANFILES = sshnodelay.so
-
-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
@@ -1,112 +0,0 @@
-What is new in 2.1, 2.2 and 2.3
-------------------------------
-
-* Support hard link creation if server is OpenSSH 5.7 or later
-
-* Check mount point and options before connecting to ssh server
-
-* Handle commas in usernames
-
-* Small improvements and bug fixes
-
-
-What is new in 2.0
------------------
-
-* Support password authentication with pam_mount
-
-* Support atomic renames if server is OpenSSH 4.9 or later
-
-* Support getting disk usage if server is OpenSSH 5.1 or later
-
-* Small enhancements and bug fixes
-
-What is new in 1.9
------------------
-
-* Fix a serious bug, that could result in sshfs hanging, crashing, or
-  reporting out-of-memory
-
-What is new in 1.8
------------------
-
-* Bug fixes
-
-What is new in 1.7
------------------
-
-* Tolerate servers which print a banner on login
-
-* Small improvements
-
-What is new in 1.6
------------------
-
-* Workaround for missing truncate operation on old sftp servers
-
-* Bug fixes
-
-What is new in 1.5
------------------
-
-* Improvements to read performance.  Now both read and write
-  throughput should be very close to 'scp'
-
-* If used with FUSE 2.6.0 or later, then perform better data caching.
-  This should show dramatic speed improvements when a file is opened
-  more than once
-
-* Bug fixes
-
-What is new in 1.4
------------------
-
-* Updated to version 25 of libfuse API
-
-* This means that the 'cp' of readonly file to sshfs bug is finally
-  solved (as long as using libfuse 2.5.0 or later *and* Linux 2.6.15
-  or later)
-
-* Sshfs now works on FreeBSD
-
-* Added option to "transform" absolute symbolic links
-
-What is new in 1.3
------------------
-
-* Add workaround for failure to rename to an existing file
-
-* Simple user ID mapping
-
-* Estimate disk usage of files based on size
-
-* Report "infinite" disk space
-
-* Bug fixes
-
-What is new in 1.2
------------------
-
-* Better compatibility with different sftp servers
-
-* Automatic reconnect (optional)
-
-What is new in 1.1
------------------
-
-* Performance improvements:
-
-   - directory content caching
-
-   - symlink caching
-
-   - asynchronous writeback
-
-   - readahead
-
-* Fixed '-p' option
-
-What is new in 1.0
------------------
-
-* Initial release
@@ -1,74 +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://fuse.sourceforge.net/sshfs.html
-
-
-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://fuse.sourceforge.net
-
-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 CVS for the first time also do 'autoreconf -i'
-before doing './configure'.
@@ -0,0 +1,92 @@
+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 install libfuse_ 3.1.0 or newer. On OS-X, you need
+OSXFUSE_ instead. Finally, you need the Glib_ library with development
+headers (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/
+
+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.
@@ -8,23 +8,27 @@

 #include "cache.h"
 #include <stdio.h>
+#include <assert.h>
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
 #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;
-	struct fuse_cache_operations *next_oper;
+	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_operations *next_oper;
 	GHashTable *table;
 	pthread_mutex_t lock;
 	time_t last_cleaned;
@@ -43,14 +47,22 @@ struct node {
 	time_t valid;
 };

-struct fuse_cache_dirhandle {
+struct readdir_handle {
 	const char *path;
-	fuse_dirh_t h;
-	fuse_dirfil_t filler;
+	void *buf;
+	fuse_fill_dir_t filler;
 	GPtrArray *dir;
 	uint64_t wrctr;
 };

+struct file_handle {
+	/* Did we send an open request to the underlying fs? */
+	int is_open;
+
+	/* If so, this will hold its handle */
+	unsigned long fs_fh;
+};
+
 static void free_node(gpointer node_)
 {
 	struct node *node = (struct node *) node_;
@@ -70,9 +82,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;
@@ -105,15 +117,12 @@ static void cache_purge_parent(const char *path)

 void cache_invalidate(const char *path)
 {
-	if (!cache.on)
-		return;
-
 	pthread_mutex_lock(&cache.lock);
 	cache_purge(path);
 	pthread_mutex_unlock(&cache.lock);
 }

-void cache_invalidate_write(const char *path)
+static void cache_invalidate_write(const char *path)
 {
 	pthread_mutex_lock(&cache.lock);
 	cache_purge(path);
@@ -165,14 +174,11 @@ void cache_add_attr(const char *path, const struct stat *stbuf, uint64_t wrctr)
 {
 	struct node *node;

-	if (!cache.on)
-		return;
-
 	pthread_mutex_lock(&cache.lock);
 	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 +194,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 +216,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();
@@ -245,12 +251,25 @@ uint64_t cache_get_write_ctr(void)
 	return res;
 }

-static int cache_getattr(const char *path, struct stat *stbuf)
+static void *cache_init(struct fuse_conn_info *conn,
+                        struct fuse_config *cfg)
+{
+	void *res;
+	res = cache.next_oper->init(conn, cfg);
+	
+	// Cache requires a path for each request
+        cfg->nullpath_ok = 0;
+
+	return res;
+}
+
+static int cache_getattr(const char *path, struct stat *stbuf,
+			 struct fuse_file_info *fi)
 {
 	int err = cache_get_attr(path, stbuf);
 	if (err) {
 		uint64_t wrctr = cache_get_write_ctr();
-		err = cache.next_oper->oper.getattr(path, stbuf);
+		err = cache.next_oper->getattr(path, stbuf, fi);
 		if (!err)
 			cache_add_attr(path, stbuf, wrctr);
 	}
@@ -274,17 +293,53 @@ static int cache_readlink(const char *path, char *buf, size_t size)
 		}
 	}
 	pthread_mutex_unlock(&cache.lock);
-	err = cache.next_oper->oper.readlink(path, buf, size);
+	err = cache.next_oper->readlink(path, buf, size);
 	if (!err)
 		cache_add_link(path, buf, size);

 	return err;
 }

-static int cache_dirfill(fuse_cache_dirh_t ch, const char *name,
-                         const struct stat *stbuf)
+
+static int cache_opendir(const char *path, struct fuse_file_info *fi)
 {
-	int err = ch->filler(ch->h, name, 0, 0);
+	(void) path;
+	struct file_handle *cfi;
+
+	cfi = malloc(sizeof(struct file_handle));
+	if(cfi == NULL)
+		return -ENOMEM;
+	cfi->is_open = 0;
+	fi->fh = (unsigned long) cfi;
+	return 0;
+}
+
+static int cache_releasedir(const char *path, struct fuse_file_info *fi)
+{
+	int err;
+	struct file_handle *cfi;
+	
+	cfi = (struct file_handle*) fi->fh;
+	
+	if(cfi->is_open) {
+		fi->fh = cfi->fs_fh;
+		err = cache.next_oper->releasedir(path, fi);
+	} else
+		err = 0;
+
+	free(cfi);
+	return err;
+}
+
+static int cache_dirfill (void *buf, const char *name,
+			  const struct stat *stbuf, off_t off,
+			  enum fuse_fill_dir_flags flags)
+{
+	int err;
+	struct readdir_handle *ch;
+
+	ch = (struct readdir_handle*) buf;
+	err = ch->filler(ch->buf, name, stbuf, off, flags);
 	if (!err) {
 		g_ptr_array_add(ch->dir, g_strdup(name));
 		if (stbuf->st_mode & S_IFMT) {
@@ -299,61 +354,66 @@ static int cache_dirfill(fuse_cache_dirh_t ch, const char *name,
 	return err;
 }

-static int cache_getdir(const char *path, fuse_dirh_t h, fuse_dirfil_t filler)
+static int cache_readdir(const char *path, void *buf, fuse_fill_dir_t filler,
+			 off_t offset, struct fuse_file_info *fi,
+			 enum fuse_readdir_flags flags)
 {
-	struct fuse_cache_dirhandle ch;
+	struct readdir_handle ch;
+	struct file_handle *cfi;
 	int err;
 	char **dir;
 	struct node *node;

+	assert(offset == 0);
+	
 	pthread_mutex_lock(&cache.lock);
 	node = cache_lookup(path);
 	if (node != NULL && node->dir != NULL) {
 		time_t now = time(NULL);
 		if (node->dir_valid - now >= 0) {
 			for(dir = node->dir; *dir != NULL; dir++)
-				filler(h, *dir, 0, 0);
+				// FIXME: What about st_mode?
+				filler(buf, *dir, NULL, 0, 0);
 			pthread_mutex_unlock(&cache.lock);
 			return 0;
 		}
 	}
 	pthread_mutex_unlock(&cache.lock);

+	cfi = (struct file_handle*) fi->fh;
+	if(cfi->is_open)
+		fi->fh = cfi->fs_fh;
+	else {
+		if(cache.next_oper->opendir) {
+			err = cache.next_oper->opendir(path, fi);
+			if(err)
+				return err;
+		}
+		cfi->is_open = 1;
+		cfi->fs_fh = fi->fh;
+	} 
+	
 	ch.path = path;
-	ch.h = h;
+	ch.buf = buf;
 	ch.filler = filler;
 	ch.dir = g_ptr_array_new();
 	ch.wrctr = cache_get_write_ctr();
-	err = cache.next_oper->cache_getdir(path, &ch, cache_dirfill);
+	err = cache.next_oper->readdir(path, &ch, cache_dirfill, offset, fi, flags);
 	g_ptr_array_add(ch.dir, NULL);
 	dir = (char **) ch.dir->pdata;
-	if (!err)
+	if (!err) {
 		cache_add_dir(path, dir);
-	else
+	} else {
 		g_strfreev(dir);
+	}
 	g_ptr_array_free(ch.dir, FALSE);
+
 	return err;
 }

-static int cache_unity_dirfill(fuse_cache_dirh_t ch, const char *name,
-                               const struct stat *stbuf)
-{
-	(void) stbuf;
-	return ch->filler(ch->h, name, 0, 0);
-}
-
-static int cache_unity_getdir(const char *path, fuse_dirh_t h,
-                              fuse_dirfil_t filler)
-{
-	struct fuse_cache_dirhandle ch;
-	ch.h = h;
-	ch.filler = filler;
-	return cache.next_oper->cache_getdir(path, &ch, cache_unity_dirfill);
-}
-
 static int cache_mknod(const char *path, mode_t mode, dev_t rdev)
 {
-	int err = cache.next_oper->oper.mknod(path, mode, rdev);
+	int err = cache.next_oper->mknod(path, mode, rdev);
 	if (!err)
 		cache_invalidate_dir(path);
 	return err;
@@ -361,7 +421,7 @@ static int cache_mknod(const char *path, mode_t mode, dev_t rdev)

 static int cache_mkdir(const char *path, mode_t mode)
 {
-	int err = cache.next_oper->oper.mkdir(path, mode);
+	int err = cache.next_oper->mkdir(path, mode);
 	if (!err)
 		cache_invalidate_dir(path);
 	return err;
@@ -369,7 +429,7 @@ static int cache_mkdir(const char *path, mode_t mode)

 static int cache_unlink(const char *path)
 {
-	int err = cache.next_oper->oper.unlink(path);
+	int err = cache.next_oper->unlink(path);
 	if (!err)
 		cache_invalidate_dir(path);
 	return err;
@@ -377,7 +437,7 @@ static int cache_unlink(const char *path)

 static int cache_rmdir(const char *path)
 {
-	int err = cache.next_oper->oper.rmdir(path);
+	int err = cache.next_oper->rmdir(path);
 	if (!err)
 		cache_invalidate_dir(path);
 	return err;
@@ -385,15 +445,15 @@ static int cache_rmdir(const char *path)

 static int cache_symlink(const char *from, const char *to)
 {
-	int err = cache.next_oper->oper.symlink(from, to);
+	int err = cache.next_oper->symlink(from, to);
 	if (!err)
 		cache_invalidate_dir(to);
 	return err;
 }

-static int cache_rename(const char *from, const char *to)
+static int cache_rename(const char *from, const char *to, unsigned int flags)
 {
-	int err = cache.next_oper->oper.rename(from, to);
+	int err = cache.next_oper->rename(from, to, flags);
 	if (!err)
 		cache_do_rename(from, to);
 	return err;
@@ -401,7 +461,7 @@ static int cache_rename(const char *from, const char *to)

 static int cache_link(const char *from, const char *to)
 {
-	int err = cache.next_oper->oper.link(from, to);
+	int err = cache.next_oper->link(from, to);
 	if (!err) {
 		cache_invalidate(from);
 		cache_invalidate_dir(to);
@@ -409,33 +469,28 @@ static int cache_link(const char *from, const char *to)
 	return err;
 }

-static int cache_chmod(const char *path, mode_t mode)
+static int cache_chmod(const char *path, mode_t mode,
+                       struct fuse_file_info *fi)
 {
-	int err = cache.next_oper->oper.chmod(path, mode);
+	int err = cache.next_oper->chmod(path, mode, fi);
 	if (!err)
 		cache_invalidate(path);
 	return err;
 }

-static int cache_chown(const char *path, uid_t uid, gid_t gid)
+static int cache_chown(const char *path, uid_t uid, gid_t gid,
+                       struct fuse_file_info *fi)
 {
-	int err = cache.next_oper->oper.chown(path, uid, gid);
+	int err = cache.next_oper->chown(path, uid, gid, fi);
 	if (!err)
 		cache_invalidate(path);
 	return err;
 }

-static int cache_truncate(const char *path, off_t size)
+static int cache_utimens(const char *path, const struct timespec tv[2],
+			 struct fuse_file_info *fi)
 {
-	int err = cache.next_oper->oper.truncate(path, size);
-	if (!err)
-		cache_invalidate(path);
-	return err;
-}
-
-static int cache_utime(const char *path, struct utimbuf *buf)
-{
-	int err = cache.next_oper->oper.utime(path, buf);
+	int err = cache.next_oper->utimens(path, tv, fi);
 	if (!err)
 		cache_invalidate(path);
 	return err;
@@ -444,146 +499,117 @@ static int cache_utime(const char *path, struct utimbuf *buf)
 static int cache_write(const char *path, const char *buf, size_t size,
                       off_t offset, struct fuse_file_info *fi)
 {
-	int res = cache.next_oper->oper.write(path, buf, size, offset, fi);
+	int res = cache.next_oper->write(path, buf, size, offset, fi);
 	if (res >= 0)
 		cache_invalidate_write(path);
 	return res;
 }

-#if FUSE_VERSION >= 25
 static int cache_create(const char *path, mode_t mode,
                        struct fuse_file_info *fi)
 {
-	int err = cache.next_oper->oper.create(path, mode, fi);
+	int err = cache.next_oper->create(path, mode, fi);
 	if (!err)
 		cache_invalidate_dir(path);
 	return err;
 }

-static int cache_ftruncate(const char *path, off_t size,
-                           struct fuse_file_info *fi)
+static int cache_truncate(const char *path, off_t size,
+			  struct fuse_file_info *fi)
 {
-	int err = cache.next_oper->oper.ftruncate(path, size, fi);
+	int err = cache.next_oper->truncate(path, size, fi);
 	if (!err)
 		cache_invalidate(path);
 	return err;
 }

-static int cache_fgetattr(const char *path, struct stat *stbuf,
-                          struct fuse_file_info *fi)
-{
-	int err = cache_get_attr(path, stbuf);
-	if (err) {
-		uint64_t wrctr = cache_get_write_ctr();
-		err = cache.next_oper->oper.fgetattr(path, stbuf, fi);
-		if (!err)
-			cache_add_attr(path, stbuf, wrctr);
-	}
-	return err;
-}
-#endif
-
-static void cache_unity_fill(struct fuse_cache_operations *oper,
-                             struct fuse_operations *cache_oper)
-{
-#if FUSE_VERSION >= 23
-	cache_oper->init        = oper->oper.init;
-#endif
-	cache_oper->getattr     = oper->oper.getattr;
-	cache_oper->readlink    = oper->oper.readlink;
-	cache_oper->getdir      = cache_unity_getdir;
-	cache_oper->mknod       = oper->oper.mknod;
-	cache_oper->mkdir       = oper->oper.mkdir;
-	cache_oper->symlink     = oper->oper.symlink;
-	cache_oper->unlink      = oper->oper.unlink;
-	cache_oper->rmdir       = oper->oper.rmdir;
-	cache_oper->rename      = oper->oper.rename;
-	cache_oper->link        = oper->oper.link;
-	cache_oper->chmod       = oper->oper.chmod;
-	cache_oper->chown       = oper->oper.chown;
-	cache_oper->truncate    = oper->oper.truncate;
-	cache_oper->utime       = oper->oper.utime;
-	cache_oper->open        = oper->oper.open;
-	cache_oper->read        = oper->oper.read;
-	cache_oper->write       = oper->oper.write;
-	cache_oper->flush       = oper->oper.flush;
-	cache_oper->release     = oper->oper.release;
-	cache_oper->fsync       = oper->oper.fsync;
-	cache_oper->statfs      = oper->oper.statfs;
-	cache_oper->setxattr    = oper->oper.setxattr;
-	cache_oper->getxattr    = oper->oper.getxattr;
-	cache_oper->listxattr   = oper->oper.listxattr;
-	cache_oper->removexattr = oper->oper.removexattr;
-#if FUSE_VERSION >= 25
-	cache_oper->create      = oper->oper.create;
-	cache_oper->ftruncate   = oper->oper.ftruncate;
-	cache_oper->fgetattr    = oper->oper.fgetattr;
-#endif
-}
-
-static void cache_fill(struct fuse_cache_operations *oper,
+static void cache_fill(struct fuse_operations *oper,
 		       struct fuse_operations *cache_oper)
 {
-	cache_oper->getattr  = oper->oper.getattr ? cache_getattr : NULL;
-	cache_oper->readlink = oper->oper.readlink ? cache_readlink : NULL;
-	cache_oper->getdir   = oper->cache_getdir ? cache_getdir : NULL;
-	cache_oper->mknod    = oper->oper.mknod ? cache_mknod : NULL;
-	cache_oper->mkdir    = oper->oper.mkdir ? cache_mkdir : NULL;
-	cache_oper->symlink  = oper->oper.symlink ? cache_symlink : NULL;
-	cache_oper->unlink   = oper->oper.unlink ? cache_unlink : NULL;
-	cache_oper->rmdir    = oper->oper.rmdir ? cache_rmdir : NULL;
-	cache_oper->rename   = oper->oper.rename ? cache_rename : NULL;
-	cache_oper->link     = oper->oper.link ? cache_link : NULL;
-	cache_oper->chmod    = oper->oper.chmod ? cache_chmod : NULL;
-	cache_oper->chown    = oper->oper.chown ? cache_chown : NULL;
-	cache_oper->truncate = oper->oper.truncate ? cache_truncate : NULL;
-	cache_oper->utime    = oper->oper.utime ? cache_utime : NULL;
-	cache_oper->write    = oper->oper.write ? cache_write : NULL;
-#if FUSE_VERSION >= 25
-	cache_oper->create   = oper->oper.create ? cache_create : NULL;
-	cache_oper->ftruncate = oper->oper.ftruncate ? cache_ftruncate : NULL;
-	cache_oper->fgetattr = oper->oper.fgetattr ? cache_fgetattr : NULL;
-#endif
-
+	cache_oper->access   = oper->access;
+	cache_oper->chmod    = oper->chmod ? cache_chmod : NULL;
+	cache_oper->chown    = oper->chown ? cache_chown : NULL;
+	cache_oper->create   = oper->create ? cache_create : NULL;
+	cache_oper->flush    = oper->flush;
+	cache_oper->fsync    = oper->fsync;
+	cache_oper->getattr  = oper->getattr ? cache_getattr : NULL;
+	cache_oper->getxattr = oper->getxattr;
+	cache_oper->init     = cache_init;
+	cache_oper->link     = oper->link ? cache_link : NULL;
+	cache_oper->listxattr = oper->listxattr;
+	cache_oper->mkdir    = oper->mkdir ? cache_mkdir : NULL;
+	cache_oper->mknod    = oper->mknod ? cache_mknod : NULL;
+	cache_oper->open     = oper->open;
+	cache_oper->opendir  = cache_opendir;
+	cache_oper->read     = oper->read;
+	cache_oper->readdir  = oper->readdir ? cache_readdir : NULL;
+	cache_oper->readlink = oper->readlink ? cache_readlink : NULL;
+	cache_oper->release  = oper->release;
+	cache_oper->releasedir = cache_releasedir;
+	cache_oper->removexattr = oper->removexattr;
+	cache_oper->rename   = oper->rename ? cache_rename : NULL;
+	cache_oper->rmdir    = oper->rmdir ? cache_rmdir : NULL;
+	cache_oper->setxattr = oper->setxattr;
+	cache_oper->statfs   = oper->statfs;
+	cache_oper->symlink  = oper->symlink ? cache_symlink : NULL;
+	cache_oper->truncate = oper->truncate ? cache_truncate : NULL;
+	cache_oper->unlink   = oper->unlink ? cache_unlink : NULL;
+	cache_oper->utimens  = oper->utimens ? cache_utimens : NULL;
+	cache_oper->write    = oper->write ? cache_write : NULL;
 }

-struct fuse_operations *cache_init(struct fuse_cache_operations *oper)
+struct fuse_operations *cache_wrap(struct fuse_operations *oper)
 {
 	static struct fuse_operations cache_oper;
 	cache.next_oper = oper;

-	cache_unity_fill(oper, &cache_oper);
-	if (cache.on) {
-		cache_fill(oper, &cache_oper);
-		pthread_mutex_init(&cache.lock, NULL);
-		cache.table = g_hash_table_new_full(g_str_hash, g_str_equal,
-						    g_free, free_node);
-		if (cache.table == NULL) {
-			fprintf(stderr, "failed to create cache\n");
-			return NULL;
-		}
+	cache_fill(oper, &cache_oper);
+	pthread_mutex_init(&cache.lock, NULL);
+	cache.table = g_hash_table_new_full(g_str_hash, g_str_equal,
+					    g_free, free_node);
+	if (cache.table == NULL) {
+		fprintf(stderr, "failed to create cache\n");
+		return NULL;
 	}
 	return &cache_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 },
+	{ "dcache_timeout=%u", offsetof(struct cache, stat_timeout_secs), 0 },
+	{ "dcache_timeout=%u", offsetof(struct cache, dir_timeout_secs), 0 },
+	{ "dcache_timeout=%u", offsetof(struct cache, link_timeout_secs), 0 },
+	{ "dcache_stat_timeout=%u", offsetof(struct cache, stat_timeout_secs), 0 },
+	{ "dcache_dir_timeout=%u", offsetof(struct cache, dir_timeout_secs), 0 },
+	{ "dcache_link_timeout=%u", offsetof(struct cache, link_timeout_secs), 0 },
+	{ "dcache_max_size=%u", offsetof(struct cache, max_size), 0 },
+	{ "dcache_clean_interval=%u", offsetof(struct cache,
+					       clean_interval_secs), 0 },
+	{ "dcache_min_clean_interval=%u", offsetof(struct cache,
+						   min_clean_interval_secs), 0 },
+
+	/* For backwards compatibility */
+	{ "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.on = 1;
+	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;

 	return fuse_opt_parse(args, &cache, cache_opts, NULL);
 }
@@ -9,20 +9,7 @@
 #include <fuse.h>
 #include <fuse_opt.h>

-#ifndef FUSE_VERSION
-#define FUSE_VERSION (FUSE_MAJOR_VERSION * 10 + FUSE_MINOR_VERSION)
-#endif
-
-typedef struct fuse_cache_dirhandle *fuse_cache_dirh_t;
-typedef int (*fuse_cache_dirfil_t) (fuse_cache_dirh_t h, const char *name,
-                                    const struct stat *stbuf);
-
-struct fuse_cache_operations {
-    struct fuse_operations oper;
-    int (*cache_getdir) (const char *, fuse_cache_dirh_t, fuse_cache_dirfil_t);
-};
-
-struct fuse_operations *cache_init(struct fuse_cache_operations *oper);
+struct fuse_operations *cache_wrap(struct fuse_operations *oper);
 int cache_parse_options(struct fuse_args *args);
 void cache_add_attr(const char *path, const struct stat *stbuf, uint64_t wrctr);
 void cache_invalidate(const char *path);
@@ -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,52 +0,0 @@
-AC_INIT(sshfs-fuse, 2.4)
-AM_INIT_AUTOMAKE
-AM_CONFIG_HEADER(config.h)
-
-AC_PROG_CC
-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")
-
-export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH
-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"
-fi
-AM_CONDITIONAL(FUSE_OPT_COMPAT, test "$have_fuse_opt_parse" = no)
-
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT
@@ -1,11 +0,0 @@
-#! /bin/bash
-
-(
-echo "See http://fuse.sourceforge.net/wiki/index.php/SshfsFaq for the latest"
-echo "version of this FAQ"
-echo "---"
-echo
-
-lynx -nolist -dump http://fuse.sourceforge.net/wiki/index.php/SshfsFaq \
-| sed -e '1,12d' -e '/____/,$d'
-) > FAQ.txt
@@ -0,0 +1,29 @@
+#!/bin/sh
+#
+# Create tarball from Git tag, removing and adding
+# some files.
+#
+
+set -e
+
+if [ -z "$1" ]; then
+    TAG="$(git tag --list 'sshfs-3*' --sort=-taggerdate | head -1)"
+else
+    TAG="$1"
+fi
+
+echo "Creating release tarball for ${TAG}..."
+
+mkdir "${TAG}"
+git archive --format=tar "${TAG}" | tar -x "--directory=${TAG}"
+find "${TAG}" -name .gitignore -delete
+rm "${TAG}/make_release_tarball.sh" \
+   "${TAG}/.travis.yml" \
+   "${TAG}/test/travis-*.sh"
+tar -cJf "${TAG}.tar.xz" "${TAG}/"
+gpg --armor --detach-sign "${TAG}.tar.xz"
+
+PREV_TAG="$(git tag --list 'sshfs-3*' --sort=-taggerdate --merged "${TAG}^"| head -1)"
+echo "Contributors from ${PREV_TAG} to ${TAG}:"
+git log --pretty="format:%an <%aE>" "${PREV_TAG}..${TAG}" | sort -u
+
@@ -0,0 +1,72 @@
+project('sshfs', 'c', version: '3.3.0',
+        meson_version: '>= 0.38',
+        default_options: [ 'buildtype=debugoptimized' ])
+
+add_global_arguments('-D_REENTRANT', '-DHAVE_CONFIG_H',
+                     '-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
+
+
+rst2man = find_program('rst2man', required: false)
+  
+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(output: 'config.h',
+               configuration : cfg)
+
+sshfs_deps = [ dependency('fuse3', version: '>= 3.1.0'),
+               dependency('glib-2.0'),
+               dependency('gthread-2.0') ]
+
+executable('sshfs', sshfs_sources,
+           include_directories: include_dirs,
+           dependencies: sshfs_deps,
+           c_args: ['-DFUSE_USE_VERSION=31'],
+           install: true,
+           install_dir: get_option('bindir'))
+
+if rst2man.found()
+    custom_target('manpages', input: [ 'sshfs.rst' ], output: [ 'sshfs.1' ],
+                  command: [rst2man, '@INPUT@', '@OUTPUT@'], install: true,
+                  install_dir: join_paths(get_option('mandir'), '1'))
+else
+    message('rst2man not found, not building manual page.')
+endif
+
+meson.add_install_script('utils/install_helper.sh',
+                         get_option('sbindir'),
+                         get_option('bindir'))
+
+
+subdir('test')
+
@@ -1,277 +0,0 @@
-.TH SSHFS "1" "April 2008" "SSHFS version 2.0" "User Commands"
-.SH NAME
-SSHFS \- filesystem client based on ssh
-.SH SYNOPSIS
-.SS mounting
-.TP
-\fBsshfs\fP [\fIuser\fP@]\fBhost\fP:[\fIdir\fP] \fBmountpoint\fP [\fIoptions\fP]
-.SS unmounting
-.TP
-\fBfusermount -u 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)
-capable of operating on files on a remote computer using just a secure
-shell login on the remote computer. On the local computer where the SSHFS
-is mounted, the implementation makes use of the FUSE (Filesystem in
-Userspace) kernel module. The practical effect of this is that the end user
-can seamlessly interact with remote files being securely served over SSH
-just as if they were local files on his/her computer. On the remote
-computer the SFTP subsystem of SSH is used.
-.PP
-If \fIhost\fP is a numeric IPv6 address, it needs to be enclosed in
-square brackets.
-.SH OPTIONS
-.SS "general options:"
-.TP
-\fB\-o\fR opt,[opt...]
-mount options
-.TP
-\fB\-h\fR   \fB\-\-help\fR
-print help
-.TP
-\fB\-V\fR   \fB\-\-version\fR
-print version
-.SS "SSHFS options:"
-.TP
-\fB\-p\fR PORT
-equivalent to '\-o port=PORT'
-.TP
-\fB\-C\fR
-equivalent to '\-o compression=yes'
-.TP
-\fB\-F\fR ssh_configfile
-specifies alternative ssh configuration file
-.TP
-\fB\-1\fR
-equivalent to '\-o ssh_protocol=1'
-.TP
-\fB\-o\fR reconnect
-reconnect to server
-.TP
-\fB\-o\fR delay_connect
-delay connection to server
-.TP
-\fB\-o\fR sshfs_sync
-synchronous writes
-.TP
-\fB\-o\fR no_readahead
-synchronous reads (no speculative readahead)
-.TP
-\fB\-o\fR sshfs_debug
-print some debugging information
-.TP
-\fB\-o\fR cache=BOOL
-enable caching {yes,no} (default: yes)
-.TP
-\fB\-o\fR cache_timeout=N
-sets timeout for caches in seconds (default: 20)
-.TP
-\fB\-o\fR cache_X_timeout=N
-sets timeout for {stat,dir,link} cache
-.TP
-\fB\-o\fR workaround=LIST
-colon separated list of workarounds
-.RS 8
-.TP
-none
-no workarounds enabled
-.TP
-all
-all workarounds enabled
-.TP
-[no]rename
-fix renaming to existing file (default: off)
-.TP
-[no]nodelaysrv
-set nodelay tcp flag in ssh (default: off)
-.TP
-[no]truncate
-fix truncate for old servers (default: off)
-.TP
-[no]buflimit
-fix buffer fillup bug in server (default: on)
-.RE
-.TP
-\fB\-o\fR idmap=TYPE
-user/group ID mapping, possible types are:
-.RS 8
-.TP
-none
-no translation of the ID space (default)
-.TP
-user
-only translate UID of connecting user
-.TP
-file
-translate UIDs/GIDs based upon the contents of \fBuidfile \fR and
-\fBgidfile\fR
-.RE
-.TP
-\fB\-o\fR uidfile=FILE
-file containing username:uid mappings for \fBidmap=file\fR
-.RE
-.TP
-\fB\-o\fR gidfile=FILE
-file containing groupname:gid mappings for \fBidmap=file\fR
-.RE
-.TP
-\fB\-o\fR nomap=TYPE
-with idmap=file, how to handle missing mappings
-.RS 8
-.TP
-ignore
-don't do any re-mapping
-.TP
-error
-return an error (default)
-.RE
-.TP
-\fB\-o\fR ssh_command=CMD
-execute CMD instead of 'ssh'
-.TP
-\fB\-o\fR ssh_protocol=N
-ssh protocol to use (default: 2)
-.TP
-\fB\-o\fR sftp_server=SERV
-path to sftp server or subsystem (default: sftp)
-.TP
-\fB\-o\fR directport=PORT
-directly connect to PORT bypassing ssh
-\fB\-o\fR slave
-communicate over stdin and stdout bypassing network
-.TP
-\fB\-o\fR transform_symlinks
-transform absolute symlinks to relative
-.TP
-\fB\-o\fR follow_symlinks
-follow symlinks on the server
-.TP
-\fB\-o\fR no_check_root
-don't check for existence of 'dir' on server
-.TP
-\fB\-o\fR password_stdin
-read password from stdin (only for pam_mount!)
-.TP
-\fB\-o\fR SSHOPT=VAL
-ssh options (see man ssh_config)
-.SS "FUSE options:"
-.TP
-\fB\-d\fR   \fB\-o\fR debug
-enable debug output (implies \fB\-f\fR)
-.TP
-\fB\-f\fR
-foreground operation
-.TP
-\fB\-s\fR
-disable multi\-threaded operation
-.TP
-\fB\-o\fR allow_other
-allow access to other users
-.TP
-\fB\-o\fR allow_root
-allow access to root
-.TP
-\fB\-o\fR nonempty
-allow mounts over non\-empty file/dir
-.HP
-\fB\-o\fR default_permissions
-enable permission checking by kernel
-.TP
-\fB\-o\fR fsname=NAME
-set filesystem name
-.TP
-\fB\-o\fR subtype=NAME
-set filesystem type
-.TP
-\fB\-o\fR large_read
-issue large read requests (2.4 only)
-.TP
-\fB\-o\fR max_read=N
-set maximum size of read requests
-.TP
-\fB\-o\fR hard_remove
-immediate removal (don't hide files)
-.TP
-\fB\-o\fR use_ino
-let filesystem set inode numbers
-.TP
-\fB\-o\fR readdir_ino
-try to fill in d_ino in readdir
-.TP
-\fB\-o\fR direct_io
-use direct I/O
-.TP
-\fB\-o\fR kernel_cache
-cache files in kernel
-.TP
-\fB\-o\fR [no]auto_cache
-enable caching based on modification times
-.TP
-\fB\-o\fR umask=M
-set file permissions (octal)
-.TP
-\fB\-o\fR uid=N
-set file owner
-.TP
-\fB\-o\fR gid=N
-set file group
-.TP
-\fB\-o\fR entry_timeout=T
-cache timeout for names (1.0s)
-.TP
-\fB\-o\fR negative_timeout=T
-cache timeout for deleted names (0.0s)
-.TP
-\fB\-o\fR attr_timeout=T
-cache timeout for attributes (1.0s)
-.TP
-\fB\-o\fR ac_attr_timeout=T
-auto cache timeout for attributes (attr_timeout)
-.TP
-\fB\-o\fR intr
-allow requests to be interrupted
-.TP
-\fB\-o\fR intr_signal=NUM
-signal to send on interrupt (10)
-.TP
-\fB\-o\fR modules=M1[:M2...]
-names of modules to push onto filesystem stack
-.TP
-\fB\-o\fR max_write=N
-set maximum size of write requests
-.TP
-\fB\-o\fR max_readahead=N
-set maximum readahead
-.TP
-\fB\-o\fR async_read
-perform reads asynchronously (default)
-.TP
-\fB\-o\fR sync_read
-perform reads synchronously
-.SS "Module options:"
-.TP
-[subdir]
-.TP
-\fB\-o\fR subdir=DIR
-prepend this directory to all paths (mandatory)
-.TP
-\fB\-o\fR [no]rellinksa
-transform absolute symlinks to relative
-.TP
-[iconv]
-.TP
-\fB\-o\fR from_code=CHARSET
-original encoding of file names (default: UTF-8)
-.TP
-\fB\-o\fR to_code=CHARSET
-new encoding of the file names (default: ISO-8859-2)
-.PD
-.SH "AUTHORS"
-.LP
-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).
-
-
@@ -0,0 +1,273 @@
+=======
+ SSHFS
+=======
+
+---------------------------------------------
+ filesystem client based on SSH
+---------------------------------------------
+
+:Manual section: 1
+:Manual group: User Commands
+
+Synopsis
+========
+
+To mount a filesystem::
+
+   sshfs [user@]host:[dir] mountpoint [options]
+
+If *host* is a numeric IPv6 address, it needs to be enclosed in square
+brackets.
+
+To unmount it::
+
+  fusermount3 -u mountpoint   # Linux
+  umount mountpoint           # OS X, FreeBSD
+
+Description
+===========
+
+SSHFS allows you to mount a remote filesystem using SSH (more
+precisely, the SFTP subsystem). 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.
+
+SSHFS uses FUSE (Filesystem in Userspace) and should work on any
+operating system that provides a FUSE implementation. Currently,
+this includes Linux, FreeBSD and Mac OS X.
+
+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).
+
+
+Options
+=======
+
+
+-o opt,[opt...]
+   mount options, see below for details. A a variety of SSH options can
+   be given here as well, see the manual pages for *sftp(1)* and
+   *ssh_config(5)*.
+
+-h, --help
+   print help and exit.
+
+-V, --version
+   print version information and exit.
+
+-d, --debug
+   print debugging information.
+
+-p PORT
+   equivalent to '-o port=PORT'
+
+-f
+   do not daemonize, stay in foreground.
+
+-s
+   Single threaded operation.
+
+-C
+   equivalent to '-o compression=yes'
+
+-F ssh_configfile
+   specifies alternative ssh configuration file
+
+-1
+   equivalent to '-o ssh_protocol=1'
+
+-o reconnect
+   automatically reconnect to server if connection is
+   interrupted. Attempts to access files that were opened before the
+   reconnection will give errors and need to be re-opened.
+
+-o delay_connect
+   Don't immediately connect to server, wait until mountpoint is first
+   accessed.
+
+-o sshfs_sync
+   synchronous writes. This will slow things down, but may be useful
+   in some situations.
+
+-o no_readahead
+   Only read exactly the data that was requested, instead of
+   speculatively reading more to anticipate the next read request.
+
+-o sync_readdir
+   synchronous readdir. This will slow things down, but may be useful
+   in some situations.
+
+-o workaround=LIST
+   Enable the specified workaround. See the `Caveats` section below
+   for some additional information. Possible values are:
+
+   :rename: Emulate overwriting an existing file by deleting and
+        renaming.
+   :truncate: Work around servers that don't support truncate by
+        coping the whole file, truncating it locally, and sending it
+        back.
+   :fstat: Work around broken servers that don't support *fstat()* by
+           using *stat* instead.
+   :buflimit: Work around OpenSSH "buffer fillup" bug.
+
+-o idmap=TYPE
+   How to map remote UID/GIDs to local values. Possible values are:
+
+   :none: no translation of the ID space (default).
+
+   :user: map the UID/GID of the remote user to UID/GID of the
+            mounting user.
+
+   :file: translate UIDs/GIDs based upon the contents of `--uidfile`
+            and `--gidfile`.
+
+-o uidfile=FILE
+   file containing ``username:uid`` mappings for `-o idmap=file`
+
+-o gidfile=FILE
+   file containing ``groupname:gid`` mappings for `-o idmap=file`
+
+-o nomap=TYPE
+   with idmap=file, how to handle missing mappings:
+
+   :ignore: don't do any re-mapping
+   :error:  return an error (default)
+
+-o ssh_command=CMD
+   execute CMD instead of 'ssh'
+
+-o ssh_protocol=N
+   ssh protocol to use (default: 2)
+
+-o sftp_server=SERV
+   path to sftp server or subsystem (default: sftp)
+
+-o directport=PORT
+   directly connect to PORT bypassing ssh
+
+-o slave
+   communicate over stdin and stdout bypassing network
+
+-o disable_hardlink
+   With this option set, attempts to call `link(2)` will fail with
+   error code ENOSYS.
+
+-o transform_symlinks
+   transform absolute symlinks on remote side to relative
+   symlinks. This means that if e.g. on the server side
+   ``/foo/bar/com`` is a symlink to ``/foo/blub``, SSHFS will
+   transform the link target to ``../blub`` on the client side.
+
+-o follow_symlinks
+   follow symlinks on the server, i.e. present them as regular
+   files on the client. If a symlink is dangling (i.e, the target does
+   not exist) the behavior depends on the remote server - the entry
+   may appear as a symlink on the client, or it may appear as a
+   regular file that cannot be accessed.
+
+-o no_check_root
+   don't check for existence of 'dir' on server
+
+-o password_stdin
+   read password from stdin (only for pam_mount!)
+
+-o dir_cache=BOOL
+   Enables (*yes*) or disables (*no*) the SSHFS directory cache.  The
+   directory cache holds the names of directory entries. Enabling it
+   allows `readdir(3)` system calls to be processed without network
+   access.
+   
+-o dcache_max_size=N
+   sets the maximum size of the directory cache.
+   
+-o dcache_timeout=N
+   sets timeout for directory cache in seconds.
+   
+-o dcache_{stat,link,dir}_timeout=N
+   sets separate timeout for {attributes, symlinks, names} in  the
+   directory cache.
+   
+-o dcache_clean_interval=N
+   sets the interval for automatic cleaning of the directory cache.
+
+-o dcache_min_clean_interval=N
+   sets the interval for forced cleaning of the directory cache
+   when full.
+
+In addition, SSHFS accepts several options common to all FUSE file
+systems. These are described in the `mount.fuse` manpage (look
+for "general", "libfuse specific", and "high-level API" options).
+
+Caveats / Workarounds
+=====================
+
+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.
+
+
+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.
+
+
+SSHFS hangs
+~~~~~~~~~~~
+
+In some cases, attempts to access the SSHFS mountpoint may freeze if
+no filesystem activity has occured for some time. This is typically
+caused by the SSH connection being dropped because of inactivity
+without SSHFS being informed about that. As a workaround, you can try
+to mount with ``-o ServerAliveInterval=15``. This will force the SSH
+connection to stay alive even if you have no activity.
+
+Mounting from /etc/fstab
+========================
+
+To mount an SSHFS filesystem from ``/etc/fstab``, simply use ``sshfs`
+as the file system type. (For backwards compatibility, you may also
+use ``fuse.sshfs``).
+
+
+See also
+========
+
+The `mount.fuse(8)` manpage.
+
+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.
+
+
+Authors
+=======
+
+SSHFS is currently maintained by Nikolaus Rath <Nikolaus@rath.org>,
+and was created by Miklos Szeredi <miklos@szeredi.hu>.
+
+This man page was originally written by Bartosz Fenski
+<fenio@debian.org> for the Debian GNU/Linux distribution (but it may
+be used by others).
@@ -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,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', '-fP', '--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,431 @@
+#!/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 contextlib import contextmanager
+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))
+@pytest.mark.parametrize("sync_rd", (True, False))
+def test_sshfs(tmpdir, debug, cache_timeout, sync_rd, 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' ]
+
+    if sync_rd:
+        cmdline += [ '-o', 'sync_readdir' ]
+
+    # SSHFS Cache
+    if cache_timeout == 0:
+        cmdline += [ '-o', 'dir_cache=no' ]
+    else:
+        cmdline += [ '-o', 'dcache_timeout=%d' % cache_timeout,
+                     '-o', 'dir_cache=yes' ]
+
+    # 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_append(src_dir, mnt_dir)
+        tst_seek(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, cache_timeout)
+        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)
+
+@contextmanager
+def os_open(name, flags):
+    fd = os.open(name, flags)
+    try:
+        yield fd
+    finally:
+        os.close(fd)
+
+def os_create(name):
+    os.close(os.open(name, os.O_CREAT | os.O_RDWR))
+
+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_append(src_dir, mnt_dir):
+    name = name_generator()
+    os_create(pjoin(src_dir, name))
+    fullname = pjoin(mnt_dir, name)
+    with os_open(fullname, os.O_WRONLY) as fd:
+        os.write(fd, b'foo\n')
+    with os_open(fullname, os.O_WRONLY|os.O_APPEND) as fd:
+        os.write(fd, b'bar\n')
+
+    with open(fullname, 'rb') as fh:
+        assert fh.read() == b'foo\nbar\n'
+
+def tst_seek(src_dir, mnt_dir):
+    name = name_generator()
+    os_create(pjoin(src_dir, name))
+    fullname = pjoin(mnt_dir, name)
+    with os_open(fullname, os.O_WRONLY) as fd:
+        os.lseek(fd, 1, os.SEEK_SET)
+        os.write(fd, b'foobar\n')
+    with os_open(fullname, os.O_WRONLY) as fd:
+        os.lseek(fd, 4, os.SEEK_SET)
+        os.write(fd, b'com')
+
+    with open(fullname, 'rb') as fh:
+        assert fh.read() == b'\0foocom\n'
+
+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, cache_timeout):
+    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)
+
+    # The link operation changes st_ctime, and if we're unlucky
+    # the kernel will keep the old value cached for name1, and
+    # retrieve the new value for name2 (at least, this is the only
+    # way I can explain the test failure). To avoid this problem,
+    # we need to wait until the cached value has expired.
+    if cache_timeout:
+        safe_sleep(cache_timeout)
+    
+    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,41 @@
+#!/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}
+    sudo ninja install
+    cd ..
+done
@@ -0,0 +1,34 @@
+#!/bin/sh
+
+set -e
+
+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
+
+# Install fuse
+wget https://github.com/libfuse/libfuse/archive/master.zip
+unzip master.zip
+cd libfuse-master
+mkdir build
+cd build
+export CC=gcc-6
+meson ..
+ninja
+sudo ninja install
+test -e /usr/local/lib/pkgconfig || sudo mkdir /usr/local/lib/pkgconfig
+sudo mv /usr/local/lib/*/pkgconfig/* /usr/local/lib/pkgconfig/
+ls -d1 /usr/local/lib/*-linux-gnu | sudo tee /etc/ld.so.conf.d/usrlocal.conf
+sudo ldconfig
+
+# 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;
+}
@@ -0,0 +1,19 @@
+#!/bin/sh
+#
+# Don't call this script. It is used internally by the Meson
+# build system. Thank you for your cooperation.
+#
+
+set -e
+
+bindir="$2"
+sbindir="$1"
+prefix="${MESON_INSTALL_DESTDIR_PREFIX}"
+
+mkdir -p "${prefix}/${sbindir}"
+
+ln -svf --relative "${prefix}/${bindir}/sshfs" \
+   "${prefix}/${sbindir}/mount.sshfs"
+
+ln -svf --relative "${prefix}/${bindir}/sshfs" \
+   "${prefix}/${sbindir}/mount.fuse.sshfs"