From adc55c9d2bdb048fc013036fc59a0594e033e51f Mon Sep 17 00:00:00 2001 From: George Vlahavas Date: Thu, 25 Feb 2016 15:10:50 +0200 Subject: Restore FAQ file This commit restores the FAQ file present in sshfs versions up to 2.5. Changes since the version in the 2.5 release: - Remove most wiki markup - Edit question about bug reports to point to the Github issue tracker - Remove unanswered questions - Minor formatting --- FAQ | 263 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 263 insertions(+) create mode 100644 FAQ diff --git a/FAQ b/FAQ new file mode 100644 index 0000000..5a45558 --- /dev/null +++ b/FAQ @@ -0,0 +1,263 @@ +SSHFS FAQ +========= + +1. I've found a bug and there's no solution in this FAQ, what + should I do? +2. Advantage of sshfs over NFS and Samba +3. Create the device node +4. mv fails with "Operation not permitted" +5. cvs fails with "cvs [status aborted]: cannot get working + directory: No such file or directory" in a sshfs mounted directory +6. Changes on the server are not immediately visible in the + mounted directory. +7. Configuring the ssh connection +8. What are the no_readahead and sshfs_sync options for? +9. Why does df return strange values on partitions mounted via + sshfs? +10. How do I specify the remote mount point (since the example + defaults to the home directory) +11. sshfs hangs after a while +12. Following symlinks on the server side +13. Making absolute symlinks work +14. Mounting as root +15. Exporting via NFS +16. Automatical mounting using /etc/fstab +17. Why does SVN (etc...) fail with permission denied? +18. Why does SVN (etc...) fail to rename files? +19. Is there some neat way to do it in reverse? +20. Might it be reasonable to disallow loops? +21. How to mount through an intermediary ssh server, eg: + localhost -> A -> B; mount B from localhost +22. Alternative Solution +23. I seem to have successfully mounted a remote directory, but + performing an `ls -l` on the directory above the mount point shows + the mount point's attributes as `? ? ? ? ? ?`. Nothing shows up in + the directory either. What am I doing wrong? + +-------------------------------------------------------------------------- + +1. I've found a bug and there's no solution in this FAQ, what should I do? + + Please report the bug in the Github issue tracker: + https://github.com/libfuse/sshfs/issues + + Also logs with debugging output can be useful for diagnosing the + problem. Try running sshfs with the following options: + sshfs -odebug,sshfs_debug,loglevel=debug ... + + Doing strace on the application which fails may also sometimes help: + strace -f -o /tmp/strace application args ... + + Note that large messages (over 40k) will be rejected from the mailing + list. So try to keep the logs as short as possible. + + +2. Advantage of sshfs over NFS and Samba + + Users can mount remote resources they already have ssh access to, + without requiring the remote machine to export the resource. + + The remote resource can be mounted when it is needed in a location + that is convenient for the user at that time, without needing to rely + on a central, root-controlled file system table. + + Automatic mounting, if desired, can be added to a shell script such as + .bashrc (provided authentication is done using RSA/DSA keys). + + Resources can be mounted over slow and unreliable (distant) + connections. + +3. Create the device node + + If you don't use udev, you may get this error message: + + fusermount: failed to open /dev/fuse: No such device or address + + Before loading the fuse kernel module, create the device node + manually: + + mknod -m 666 /dev/fuse c 10 229 + +4. mv fails with "Operation not permitted". + + Use -o workaround=rename (requires sshfs version >= 1.3). + +5. cvs fails with "cvs status aborted?: cannot get working directory: No such + file or directory" in a sshfs mounted directory + + Use the -oreaddir_ino option. Example: + sshfs -oreaddir_ino hostname:remote_dir mount_point + +6. Changes on the server are not immediately visible in the mounted directory. + + By default, sshfs caches things for 20 seconds, use -o cache_timeout=N + to change the default cache timeout (in seconds) or -o cache=no for + disabling the cache. + + You can also control cache timeouts for directory listing etc with + -o cache_stat_timeout=N, + -o cache_dir_timout=N, and + -o cache_link_timout=N. + +7. Configuring the ssh connection + + In addition to flags like -C, -p, and -o SSHOPT...=, you may find it + easier to edit your /.ssh/config file. You can add an entry with any + customization you want, test it with ssh, and finally use it with + sshfs. As a bonus, you get a short mnemonic for your configuration. + +8. What are the no_readahead and sshfs_sync options for? + + These disable read and write optimizations respectively. They don't + really make sense unless you're doing something special. + +9. Why does df return strange values on partitions mounted via sshfs? + + Because the SFTP protocol doesn't have a statfs operation this is + currently not possible to display proper usage on remote partition. + +10. How do I specfy the remote mount point (since the example defaults to the + home directory) + + The example shows: + sshfs hostname: mountpoint + + To specify a remote mount point use: + sshfs hostname:remotemountpoint mountpoint + + This might be obvious to others, but I ended up looking up the + interface to sftp to see if I could learn how to specify the remote + mount point, then thought about the way that scp specifies the remote + directory, and it worked. + +11. sshfs hangs after a while + + Mounting works fine, I can use the files in Mountpoint as good as any + other files on my system, but after bit of time, changing nothing on + the remote files sshfs crashes. This means, I can not cd into the + Mountpoint (xterm hangs, nautilus hangs... every program trying to + access the Mountpoint gets stuck, and won't return). + + Solution: add + ServerAliveInterval 15 + + in your .ssh/config (or use -o ServerAliveInterval=15 on the sshfs + command line but I did not test that solution). This will force the + ssh connection to stay alive even if you have no activity. + +12. Following symlinks on the server side + + The -o follow_symlinks option will enable this. + +13. Making absolute symlinks work + + Use the -o transform_symlinks option, which will transform absolute + symlinks (ones which point somewhere inside the mount) into relative + ones. + +14. Mounting as root + + Generally it's not possible to use an sshfs mount as a "real" + filesystem shared between multiple users. Some of this functionality + can be enabled with the -o allow_other and -o default_permissions + options, but files will not be created with the correct ownership, + etc... + +15. Exporting via NFS + + Use the userspace NFS daemon http://sourceforge.net/projects/unfs + +16. Automatical mounting using /etc/fstab + + A line in /etc/fstab has the following format: + sshfs#USERNAME@REMOTE_HOST:REMOTE_PATH MOUNT_POINT fuse SSHFS_OPTIONS 0 0 + + eg. + sshfs#guest@guest.login.com:data /mnt/guest fuse \ + uid=1003,gid=100,umask=0,allow_other 0 0 + +17. Why does SVN (etc...) fail with permission denied? + + This is a bug that happens when an application creates a read-only + file opened for writing (e.g. open("foo", O_WRONLY|O_CREAT, 0444)) + + It has been fixed in sshfs version 1.3, but also requires FUSE version + >=2.5.X and Linux kernel version >=2.6.15. + +18. Why does SVN (etc...) fail to rename files? + + $ svn co svn://anonsvn.kde.org/home/kde/trunk/KDE/kdelibs + svn: Can't move 'kdelibs/.svn/tmp/entries' to 'kdelibs/.svn/entries': + Operation not permitted + + The reason is that SFTP protocol version 3 (which is implemented by + OpenSSH's sftp-server) defines the rename operation slightly + differently than POSIX. The difference is that renaming to an existing + file or directory will fail instead of atomically replacing the old + file. + + The -o workaround=rename option will try to emulate POSIX rename + semantics, but it cannot guarantee atomicity. In most of the cases + this doesn't matter, and things will work fine with this option. + +19. Is there some neat way to do it in reverse? + + You want to mount a USB thumb drive onto a file server that is rather + remote. + + Assuming this is difficult because the laptop with the thumb drive is + sitting behind NAT, firewalls, etc. then you need to create a + port-forward: + client$ ssh -R 2222:localhost:22 server + server$ sshfs -p 2222 localhost:/media/usb1 myusb1 + + (Now, is there is there a smarter way that does not involve port + opening login permissions in an undesireable direction?) + +20. Might it be reasonable to disallow loops? + + sshfs localhost:/mnt /mnt + + This seems to produce undesirable results. --JoshuaRodman + +21. How to mount through an intermediary ssh server, eg: localhost -> A -> B; + mount B from localhost + + Start by mounting the folder you need that is on "a" to a folder on + "b" then mount the new folder that is on "a" to a folder on localhost. + + IE: (These are NOT real commands, but a sequence of steps. + A mounts B:/home/x on /mnt/Bx + localhost mounts A:/mnt/Bx on ~/mydir + +22. Alternative Solution: + + 1) Create a shell script to wrap the tunneling of one ssh command over + another, + $ cat >Atunnel < Date: Tue, 1 Mar 2016 08:49:53 -0800 Subject: Released 2.7 --- AUTHORS | 5 ++++- ChangeLog | 8 ++++---- configure.ac | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/AUTHORS b/AUTHORS index 9f05a8f..d0f5529 100644 --- a/AUTHORS +++ b/AUTHORS @@ -17,10 +17,13 @@ Alan Jenkins Alexander Neumann Benjamin Fleischer Chris Wolfe -Google Inc. +gala +George Vlahavas Julio Merino +Julio Merino Mike Kelly Miklos Szeredi +Miklos Szeredi Nikolaus Rath Percy Jahn Qais Patankar diff --git a/ChangeLog b/ChangeLog index f788ade..f7661b8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,5 @@ -Draft notes for upcoming release --------------------------------- +Release 2.6 (2015-03-01) +------------------------ * Integrated osxfuse's copy of sshfs, which means that sshfs now works on OS X out of the box. @@ -8,12 +8,12 @@ Draft notes for upcoming release * 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.7 (2015-01-28) +Release 2.6 (2015-01-28) ------------------------ * New maintainer (Nikolaus Rath ) -Release 2.6 (2014-01-14) +Release 2.5 (2014-01-14) ------------------------ * Some performance improvements for large directories. diff --git a/configure.ac b/configure.ac index a91ec3f..65162d4 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT(sshfs, 2.6) +AC_INIT(sshfs, 2.7) AC_CANONICAL_TARGET AM_INIT_AUTOMAKE([foreign subdir-objects]) AM_CONFIG_HEADER(config.h) -- cgit v1.2.3 From 0f6f33b1b4084426a78035788e5e8502a3dc5af0 Mon Sep 17 00:00:00 2001 From: Rian Hunter Date: Wed, 1 Jun 2016 22:30:44 -0700 Subject: Implement support for "fsync@openssh.com" OpenSSH implements fsync() via the extension "fsync@openssh.com". This change uses that extension when receiving a FUSE fsync request. --- sshfs.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/sshfs.c b/sshfs.c index ce30a0f..9fb68af 100644 --- a/sshfs.c +++ b/sshfs.c @@ -118,6 +118,7 @@ #define SFTP_EXT_POSIX_RENAME "posix-rename@openssh.com" #define SFTP_EXT_STATVFS "statvfs@openssh.com" #define SFTP_EXT_HARDLINK "hardlink@openssh.com" +#define SFTP_EXT_FSYNC "fsync@openssh.com" #define PROTO_VERSION 3 @@ -273,6 +274,7 @@ struct sshfs { int ext_posix_rename; int ext_statvfs; int ext_hardlink; + int ext_fsync; mode_t mnt_mode; struct fuse_operations *op; @@ -1548,6 +1550,9 @@ static int sftp_init_reply_ok(struct buffer *buf, uint32_t *version) if (strcmp(ext, SFTP_EXT_HARDLINK) == 0 && strcmp(extdata, "1") == 0) sshfs.ext_hardlink = 1; + if (strcmp(ext, SFTP_EXT_FSYNC) == 0 && + strcmp(extdata, "1") == 0) + sshfs.ext_fsync = 1; } while (buf2.len < buf2.size); buf_free(&buf2); } @@ -2632,8 +2637,25 @@ static int sshfs_flush(const char *path, struct fuse_file_info *fi) static int sshfs_fsync(const char *path, int isdatasync, struct fuse_file_info *fi) { + int err; (void) isdatasync; - return sshfs_flush(path, fi); + + if (err = sshfs_flush(path, fi)) + return err; + + if (!sshfs.ext_fsync) + return err; + + { + struct buffer buf; + struct sshfs_file *sf = get_sshfs_file(fi); + buf_init(&buf, 0); + buf_add_string(&buf, SFTP_EXT_FSYNC); + buf_add_buf(&buf, &sf->handle); + err = sftp_request(SSH_FXP_EXTENDED, &buf, SSH_FXP_STATUS, NULL); + buf_free(&buf); + return err; + } } static void sshfs_file_put(struct sshfs_file *sf) -- cgit v1.2.3 From 74bfa3850a2568f96dd1d090a9386534c9bb4629 Mon Sep 17 00:00:00 2001 From: Rian Hunter Date: Wed, 1 Jun 2016 23:21:46 -0700 Subject: Support the lack of paths when cache is off Before FUSE 2.9, FUSE had to emulate unlink() if a file was still open via renaming to a hidden file. This was due to the requirement that a valid "path" argument must be submitted for many FUSE operations. FUSE 2.9 introduced the flag_nullpath_ok and flag_nopath flags that allow a FUSE file system to signal to FUSE that the "path" argument may be NULL in certain operations. sshfs doesn't require paths if the cache isn't used so communicate that information to the FUSE layer. --- cache.c | 8 ++++++++ sshfs.c | 4 ++++ 2 files changed, 12 insertions(+) diff --git a/cache.c b/cache.c index aeb14ec..34a87ca 100644 --- a/cache.c +++ b/cache.c @@ -523,6 +523,10 @@ static void cache_unity_fill(struct fuse_cache_operations *oper, cache_oper->ftruncate = oper->oper.ftruncate; cache_oper->fgetattr = oper->oper.fgetattr; #endif +#if FUSE_VERSION >= 29 + cache_oper->flag_nullpath_ok = oper->oper.flag_nullpath_ok; + cache_oper->flag_nopath = oper->oper.flag_nopath; +#endif } static void cache_fill(struct fuse_cache_operations *oper, @@ -548,6 +552,10 @@ static void cache_fill(struct fuse_cache_operations *oper, cache_oper->ftruncate = oper->oper.ftruncate ? cache_ftruncate : NULL; cache_oper->fgetattr = oper->oper.fgetattr ? cache_fgetattr : NULL; #endif +#if FUSE_VERSION >= 29 + cache_oper->flag_nullpath_ok = 0; + cache_oper->flag_nopath = 0; +#endif } diff --git a/sshfs.c b/sshfs.c index 9fb68af..f41d987 100644 --- a/sshfs.c +++ b/sshfs.c @@ -3372,6 +3372,10 @@ static struct fuse_cache_operations sshfs_oper = { .create = sshfs_create, .ftruncate = sshfs_ftruncate, .fgetattr = sshfs_fgetattr, +#endif +#if FUSE_VERSION >= 29 + .flag_nullpath_ok = 1, + .flag_nopath = 1, #endif }, .cache_getdir = sshfs_getdir, -- cgit v1.2.3 From 504e26f9382f0d5e96e4d6474d5d3f5cd33fa99a Mon Sep 17 00:00:00 2001 From: Nikolaus Rath Date: Sun, 5 Jun 2016 14:15:36 -0400 Subject: Added ChangeLog entry for fsync extension --- ChangeLog | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ChangeLog b/ChangeLog index f7661b8..2b8f1cd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Unreleased Changes +------------------ + +* Added support for the "fsync" extension. + Release 2.6 (2015-03-01) ------------------------ -- cgit v1.2.3 From df10d96ac2e6dd7e73314544f5bfe20ae5b6141d Mon Sep 17 00:00:00 2001 From: Nikolaus Rath Date: Sun, 5 Jun 2016 14:18:49 -0400 Subject: Add extra quoting for increased compatibility. Fixes: #15. --- ChangeLog | 1 + configure.ac | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 2b8f1cd..8ede99f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ Unreleased Changes ------------------ * Added support for the "fsync" extension. +* Fixed a build problem with bitbake Release 2.6 (2015-03-01) ------------------------ diff --git a/configure.ac b/configure.ac index 65162d4..ed23d0c 100644 --- a/configure.ac +++ b/configure.ac @@ -44,7 +44,7 @@ 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]) +PKG_CHECK_MODULES([SSHFS], [fuse >= 2.3 glib-2.0 gthread-2.0]) have_fuse_opt_parse=no oldlibs="$LIBS" LIBS="$LIBS $SSHFS_LIBS" -- cgit v1.2.3 From f51d7b0c6a54df2bc4a61295a17b721ea0e9d00a Mon Sep 17 00:00:00 2001 From: Rian Hunter Date: Mon, 6 Jun 2016 00:06:21 -0700 Subject: Require paths for truncate/fstat workarounds Commit 74bfa3850a2568f96dd1d090a9386534c9bb4629 allowed sshfs to run without requiring a non-NULL path argument for certain operations. This was erroneous in the case of using certain workarounds. --- sshfs.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sshfs.c b/sshfs.c index f41d987..ce38925 100644 --- a/sshfs.c +++ b/sshfs.c @@ -3996,6 +3996,14 @@ int main(int argc, char *argv[]) parse_workarounds() == -1) exit(1); +#if FUSE_VERSION >= 29 + // These workarounds require the "path" argument. + if (sshfs.truncate_workaround || sshfs.fstat_workaround) { + sshfs_oper.oper.flag_nullpath_ok = 0; + sshfs_oper.oper.flag_nopath = 0; + } +#endif + if (sshfs.idmap == IDMAP_USER) sshfs.detect_uid = 1; else if (sshfs.idmap == IDMAP_FILE) { -- cgit v1.2.3 From 1756abe6fd36b6845c3589e572e71adff8846343 Mon Sep 17 00:00:00 2001 From: Nikolaus Rath Date: Wed, 22 Jun 2016 11:37:40 -0700 Subject: Fixed release year of version 2.7 --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 8ede99f..f32d9d2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,7 +4,7 @@ Unreleased Changes * Added support for the "fsync" extension. * Fixed a build problem with bitbake -Release 2.6 (2015-03-01) +Release 2.6 (2016-03-01) ------------------------ * Integrated osxfuse's copy of sshfs, which means that sshfs now works -- cgit v1.2.3 From b2fa7593586b141298e6159f40f521d2b0f4f894 Mon Sep 17 00:00:00 2001 From: Nikolaus Rath Date: Wed, 22 Jun 2016 11:38:53 -0700 Subject: Released 2.8 --- AUTHORS | 1 + ChangeLog | 4 ++-- configure.ac | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/AUTHORS b/AUTHORS index d0f5529..eb91f30 100644 --- a/AUTHORS +++ b/AUTHORS @@ -27,3 +27,4 @@ Miklos Szeredi Nikolaus Rath Percy Jahn Qais Patankar +Rian Hunter diff --git a/ChangeLog b/ChangeLog index f32d9d2..98a2c9c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,5 @@ -Unreleased Changes ------------------- +Release 2.7 (2016-06-22) +------------------------ * Added support for the "fsync" extension. * Fixed a build problem with bitbake diff --git a/configure.ac b/configure.ac index ed23d0c..7c0cdd1 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT(sshfs, 2.7) +AC_INIT(sshfs, 2.8) AC_CANONICAL_TARGET AM_INIT_AUTOMAKE([foreign subdir-objects]) AM_CONFIG_HEADER(config.h) -- cgit v1.2.3 From a175c2876ac65235affaa07d81ecd904034734a1 Mon Sep 17 00:00:00 2001 From: Bill Zissimopoulos Date: Wed, 22 Jun 2016 17:02:30 -0700 Subject: port sshfs to cygwin --- configure.ac | 1 + sshfs.c | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/configure.ac b/configure.ac index 7c0cdd1..7fa6969 100644 --- a/configure.ac +++ b/configure.ac @@ -49,6 +49,7 @@ have_fuse_opt_parse=no oldlibs="$LIBS" LIBS="$LIBS $SSHFS_LIBS" AC_CHECK_FUNC([fuse_opt_parse], [have_fuse_opt_parse=yes]) +AC_CHECK_FUNC([fsp_fuse_opt_parse], [have_fuse_opt_parse=yes]) LIBS="$oldlibs" if test "$have_fuse_opt_parse" = no -o "$osname" = darwin; then CFLAGS="$CFLAGS -I${srcdir}/compat" diff --git a/sshfs.c b/sshfs.c index f41d987..3186867 100644 --- a/sshfs.c +++ b/sshfs.c @@ -11,7 +11,9 @@ #include #include +#if !defined(__CYGWIN__) #include +#endif #ifdef __APPLE__ # include #endif @@ -4108,7 +4110,9 @@ int main(int argc, char *argv[]) char *mountpoint; int multithreaded; int foreground; +#if !defined(__CYGWIN__) struct stat st; +#endif res = fuse_parse_cmdline(&args, &mountpoint, &multithreaded, &foreground); @@ -4120,20 +4124,26 @@ int main(int argc, char *argv[]) foreground = 1; } +#if !defined(__CYGWIN__) res = stat(mountpoint, &st); if (res == -1) { perror(mountpoint); exit(1); } sshfs.mnt_mode = st.st_mode; +#elif defined(__CYGWIN__) + sshfs.mnt_mode = S_IFDIR | 0755; +#endif ch = fuse_mount(mountpoint, &args); if (!ch) exit(1); +#if !defined(__CYGWIN__) res = fcntl(fuse_chan_fd(ch), F_SETFD, FD_CLOEXEC); if (res == -1) perror("WARNING: failed to set FD_CLOEXEC on fuse device"); +#endif sshfs.op = cache_init(&sshfs_oper); fuse = fuse_new(ch, &args, sshfs.op, -- cgit v1.2.3 From e3cd445a4ee44a16faa646d7b642d02eea62b1f8 Mon Sep 17 00:00:00 2001 From: Zoltan Kuscsik Date: Fri, 1 Jul 2016 09:30:31 +0200 Subject: Makefile: fix path for sshfs.1 Fix source path when build directory differs from the source dir. --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index f003bae..3d8f9cb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -24,7 +24,7 @@ sshfs.1: sshfs.1.in $(AM_V_GEN)sed \ -e 's,__IDMAP_DEFAULT__,$(IDMAP_DEFAULT),g' \ -e 's,__UNMOUNT_COMMAND__,$(UNMOUNT_COMMAND),g' \ - sshfs.1.tmp || exit 1; \ + <$(srcdir)/sshfs.1.in >sshfs.1.tmp || exit 1; \ mv sshfs.1.tmp sshfs.1 if SSH_NODELAY_SO -- cgit v1.2.3 From e178150a7225957a328992b39030bb3973b04463 Mon Sep 17 00:00:00 2001 From: Benjamin Fleischer Date: Thu, 18 Feb 2016 20:15:46 +0100 Subject: Remove call to g_slice_set_config() It is unclear why G_SLICE_CONFIG_ALWAYS_MALLOC has been set before but doing so with the latest version of GLib (2.46.2) results in the following warning: GLib-CRITICAL **: g_slice_set_config: assertion 'sys_page_size == 0' failed This fixes issue osxfuse/sshfs#17 --- sshfs.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/sshfs.c b/sshfs.c index ce38925..77f3dbf 100644 --- a/sshfs.c +++ b/sshfs.c @@ -3949,9 +3949,6 @@ int main(int argc, char *argv[]) if (!realpath(*exec_path, sshfs_program_path)) { memset(sshfs_program_path, 0, PATH_MAX); } - - /* Until this gets fixed somewhere else. */ - g_slice_set_config(G_SLICE_CONFIG_ALWAYS_MALLOC, TRUE); #endif /* __APPLE__ */ g_thread_init(NULL); -- cgit v1.2.3 From 1afaef8f46f0397cd42ac0283e601890326dd44c Mon Sep 17 00:00:00 2001 From: Berserker Date: Fri, 30 Dec 2016 20:52:13 +0300 Subject: sshfs.1.in: remove duplicate "slave" option description --- sshfs.1.in | 2 -- 1 file changed, 2 deletions(-) diff --git a/sshfs.1.in b/sshfs.1.in index fcf3e9f..4ed4fa4 100644 --- a/sshfs.1.in +++ b/sshfs.1.in @@ -141,8 +141,6 @@ 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 slave communicate over stdin and stdout bypassing network -- cgit v1.2.3 From efeed712953258f5466b0821d8e30ab98979299c Mon Sep 17 00:00:00 2001 From: Bill Zissimopoulos Date: Thu, 12 Jan 2017 11:24:08 -0800 Subject: remove no longer useful check for fsp_fuse_opt_parse from configure.ac --- configure.ac | 1 - 1 file changed, 1 deletion(-) diff --git a/configure.ac b/configure.ac index 7fa6969..7c0cdd1 100644 --- a/configure.ac +++ b/configure.ac @@ -49,7 +49,6 @@ have_fuse_opt_parse=no oldlibs="$LIBS" LIBS="$LIBS $SSHFS_LIBS" AC_CHECK_FUNC([fuse_opt_parse], [have_fuse_opt_parse=yes]) -AC_CHECK_FUNC([fsp_fuse_opt_parse], [have_fuse_opt_parse=yes]) LIBS="$oldlibs" if test "$have_fuse_opt_parse" = no -o "$osname" = darwin; then CFLAGS="$CFLAGS -I${srcdir}/compat" -- cgit v1.2.3 From 33667f2a56134c1190f0bda0a5cb94664400c2fd Mon Sep 17 00:00:00 2001 From: Nikolaus Rath Date: Mon, 17 Apr 2017 13:09:35 -0700 Subject: Fixed up version numbers in ChangeLog --- ChangeLog | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 98a2c9c..5f80c65 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,10 +1,10 @@ -Release 2.7 (2016-06-22) +Release 2.8 (2016-06-22) ------------------------ * Added support for the "fsync" extension. -* Fixed a build problem with bitbake +* Fixed a build problem with bitbake -Release 2.6 (2016-03-01) +Release 2.7 (2016-03-01) ------------------------ * Integrated osxfuse's copy of sshfs, which means that sshfs now works -- cgit v1.2.3 From 1dbda317865c49825de733e210fc6119d3ee1576 Mon Sep 17 00:00:00 2001 From: Nikolaus Rath Date: Mon, 17 Apr 2017 13:13:38 -0700 Subject: Released 2.9 --- AUTHORS | 3 +++ ChangeLog | 6 ++++++ configure.ac | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/AUTHORS b/AUTHORS index eb91f30..c89de97 100644 --- a/AUTHORS +++ b/AUTHORS @@ -16,6 +16,8 @@ Contributors (autogenerated list) Alan Jenkins Alexander Neumann Benjamin Fleischer +Berserker +Bill Zissimopoulos Chris Wolfe gala George Vlahavas @@ -28,3 +30,4 @@ Nikolaus Rath Percy Jahn Qais Patankar Rian Hunter +Zoltan Kuscsik diff --git a/ChangeLog b/ChangeLog index 5f80c65..4644ae8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Release 2.9 (2017-04-17) +------------------------ + +* Improved support for Cygwin. +* Various small bugfixes. + Release 2.8 (2016-06-22) ------------------------ diff --git a/configure.ac b/configure.ac index 7c0cdd1..f33bb1b 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT(sshfs, 2.8) +AC_INIT(sshfs, 2.9) AC_CANONICAL_TARGET AM_INIT_AUTOMAKE([foreign subdir-objects]) AM_CONFIG_HEADER(config.h) -- cgit v1.2.3