aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--NEWS7
-rw-r--r--README2
-rw-r--r--configure.ac2
-rw-r--r--sshfs.c6
5 files changed, 18 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index d6837e4..b4508a8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+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
diff --git a/NEWS b/NEWS
index 9156c4b..11cd63b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,10 @@
+What is new in 1.2
+------------------
+
+* Better compatibility with different sftp servers
+
+* Automatic reconnect (optional)
+
What is new in 1.1
------------------
diff --git a/README b/README
index a053989..491b9c7 100644
--- a/README
+++ b/README
@@ -20,6 +20,8 @@ codebase, so I rewrote it. Features of this implementation are:
- Caching directory contents
+ - Reconnect on failure
+
How to mount a filesystem
=========================
diff --git a/configure.ac b/configure.ac
index 67c5210..92a4898 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(sshfs-fuse, 1.2-pre1)
+AC_INIT(sshfs-fuse, 1.2)
AM_INIT_AUTOMAKE
AM_CONFIG_HEADER(config.h)
diff --git a/sshfs.c b/sshfs.c
index b20b684..18ab34c 100644
--- a/sshfs.c
+++ b/sshfs.c
@@ -717,12 +717,14 @@ static int sftp_read(uint8_t *type, struct buffer *buf)
buf_init(&buf2, 5);
res = do_read(&buf2);
if (res != -1) {
- buf_get_uint32(&buf2, &len);
+ if (buf_get_uint32(&buf2, &len) == -1)
+ return -1;
if (len > MAX_REPLY_LEN) {
fprintf(stderr, "reply len too large: %u\n", len);
return -1;
}
- buf_get_uint8(&buf2, type);
+ if (buf_get_uint8(&buf2, type) == -1)
+ return -1;
buf_init(buf, len - 1);
res = do_read(buf);
}