From 5377a9a5710d8386cfb36da89523295fe8f4942e Mon Sep 17 00:00:00 2001 From: Miklos Szeredi Date: Mon, 7 Nov 2005 15:49:24 +0000 Subject: fix --- ChangeLog | 4 ++++ Makefile.am | 2 +- sshfs.c | 16 ++++++++++++++++ 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 09c727c..6a660a5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2005-10-29 Miklos Szeredi + + * Use FUSE version 25 if available + 2005-10-29 Miklos Szeredi * Released 1.3 diff --git a/Makefile.am b/Makefile.am index 8b4384a..1192634 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,4 +2,4 @@ bin_PROGRAMS = sshfs sshfs_SOURCES = sshfs.c cache.c opts.c cache.h opts.h -sshfs_CPPFLAGS = -DFUSE_USE_VERSION=22 +sshfs_CPPFLAGS = -DFUSE_USE_VERSION=25 diff --git a/sshfs.c b/sshfs.c index c512f76..2876a21 100644 --- a/sshfs.c +++ b/sshfs.c @@ -1767,6 +1767,21 @@ static int sshfs_write(const char *path, const char *wbuf, size_t size, return err ? err : (int) size; } +#if FUSE_VERSION >= 25 +static int sshfs_statfs(const char *path, struct statvfs *buf) +{ + (void) path; + + buf->f_namemax = 255; + buf->f_bsize = 512; + buf->f_blocks = 999999999 * 2; + buf->f_bfree = 999999999 * 2; + buf->f_bavail = 999999999 * 2; + buf->f_files = 999999999; + buf->f_ffree = 999999999; + return 0; +} +#else static int sshfs_statfs(const char *path, struct statfs *buf) { (void) path; @@ -1780,6 +1795,7 @@ static int sshfs_statfs(const char *path, struct statfs *buf) buf->f_ffree = 999999999; return 0; } +#endif #if FUSE_VERSION >= 25 static int sshfs_create(const char *path, mode_t mode, -- cgit v1.2.3