aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiklos Szeredi <miklos@szeredi.hu>2008-07-11 10:59:12 +0000
committerMiklos Szeredi <miklos@szeredi.hu>2008-07-11 10:59:12 +0000
commitfd52ef3e51efe674386c2b62fead27128da37179 (patch)
treed7080c9bee251c7a3066d8dba4c56f7bc5272340
parent1abdbe64a33eaefe24708e8c020a3ca2bba0c6c0 (diff)
downloadsshfs-fd52ef3e51efe674386c2b62fead27128da37179.tar
sshfs-fd52ef3e51efe674386c2b62fead27128da37179.tar.gz
sshfs-fd52ef3e51efe674386c2b62fead27128da37179.tar.bz2
sshfs-fd52ef3e51efe674386c2b62fead27128da37179.zip
Released 2.1sshfs_2_1
-rw-r--r--ChangeLog12
-rw-r--r--configure.ac2
-rw-r--r--sshfs.c26
3 files changed, 27 insertions, 13 deletions
diff --git a/ChangeLog b/ChangeLog
index 5fc2f13..6515ab9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+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
diff --git a/configure.ac b/configure.ac
index 0caba29..dbad682 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(sshfs-fuse, 2.0)
+AC_INIT(sshfs-fuse, 2.1)
AM_INIT_AUTOMAKE
AM_CONFIG_HEADER(config.h)
diff --git a/sshfs.c b/sshfs.c
index 1d59a0f..d63adea 100644
--- a/sshfs.c
+++ b/sshfs.c
@@ -662,29 +662,29 @@ static int buf_get_attrs(struct buffer *buf, struct stat *stbuf, int *flagsp)
static int buf_get_statvfs(struct buffer *buf, struct statvfs *stbuf)
{
- uint32_t bsize;
- uint32_t frsize;
+ uint64_t bsize;
+ uint64_t frsize;
uint64_t blocks;
uint64_t bfree;
uint64_t bavail;
uint64_t files;
uint64_t ffree;
uint64_t favail;
- uint32_t fsid;
- uint32_t flag;
- uint32_t namemax;
+ uint64_t fsid;
+ uint64_t flag;
+ uint64_t namemax;
- if (buf_get_uint32(buf, &bsize) == -1 ||
- buf_get_uint32(buf, &frsize) == -1 ||
+ if (buf_get_uint64(buf, &bsize) == -1 ||
+ buf_get_uint64(buf, &frsize) == -1 ||
buf_get_uint64(buf, &blocks) == -1 ||
buf_get_uint64(buf, &bfree) == -1 ||
buf_get_uint64(buf, &bavail) == -1 ||
buf_get_uint64(buf, &files) == -1 ||
buf_get_uint64(buf, &ffree) == -1 ||
buf_get_uint64(buf, &favail) == -1 ||
- buf_get_uint32(buf, &fsid) == -1 ||
- buf_get_uint32(buf, &flag) == -1 ||
- buf_get_uint32(buf, &namemax) == -1) {
+ buf_get_uint64(buf, &fsid) == -1 ||
+ buf_get_uint64(buf, &flag) == -1 ||
+ buf_get_uint64(buf, &namemax) == -1) {
return -1;
}
@@ -1350,11 +1350,13 @@ static int sftp_init_reply_ok(struct buffer *buf, uint32_t *version)
DEBUG("Extension: %s <%s>\n", ext, extdata);
- if (strcmp(ext, SFTP_EXT_POSIX_RENAME) == 0) {
+ if (strcmp(ext, SFTP_EXT_POSIX_RENAME) == 0 &&
+ strcmp(extdata, "1") == 0) {
sshfs.ext_posix_rename = 1;
sshfs.rename_workaround = 0;
}
- if (strcmp(ext, SFTP_EXT_STATVFS) == 0)
+ if (strcmp(ext, SFTP_EXT_STATVFS) == 0 &&
+ strcmp(extdata, "2") == 0)
sshfs.ext_statvfs = 1;
} while (buf2.len < buf2.size);
}