===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/sftp-client.c,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- src/usr.bin/ssh/sftp-client.c	2008/06/07 21:52:46	1.83
+++ src/usr.bin/ssh/sftp-client.c	2008/06/08 20:15:29	1.84
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp-client.c,v 1.83 2008/06/07 21:52:46 djm Exp $ */
+/* $OpenBSD: sftp-client.c,v 1.84 2008/06/08 20:15:29 dtucker Exp $ */
 /*
  * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
  *
@@ -236,7 +236,8 @@
 }
 
 static int
-get_decode_statvfs(int fd, struct statvfs *st, u_int expected_id, int quiet)
+get_decode_statvfs(int fd, struct sftp_statvfs *st, u_int expected_id,
+    int quiet)
 {
 	Buffer msg;
 	u_int type, id, flag;
@@ -265,8 +266,8 @@
 	}
 
 	bzero(st, sizeof(*st));
-	st->f_bsize = buffer_get_int(&msg);
-	st->f_frsize = buffer_get_int(&msg);
+	st->f_bsize = buffer_get_int64(&msg);
+	st->f_frsize = buffer_get_int64(&msg);
 	st->f_blocks = buffer_get_int64(&msg);
 	st->f_bfree = buffer_get_int64(&msg);
 	st->f_bavail = buffer_get_int64(&msg);
@@ -274,8 +275,8 @@
 	st->f_ffree = buffer_get_int64(&msg);
 	st->f_favail = buffer_get_int64(&msg);
 	st->f_fsid = buffer_get_int64(&msg);
-	flag = buffer_get_int(&msg);
-	st->f_namemax = buffer_get_int(&msg);
+	flag = buffer_get_int64(&msg);
+	st->f_namemax = buffer_get_int64(&msg);
 
 	st->f_flag = (flag & SSH2_FXE_STATVFS_ST_RDONLY) ? ST_RDONLY : 0;
 	st->f_flag |= (flag & SSH2_FXE_STATVFS_ST_NOSUID) ? ST_NOSUID : 0;
@@ -804,7 +805,7 @@
 #endif
 
 int
-do_statvfs(struct sftp_conn *conn, const char *path, struct statvfs *st,
+do_statvfs(struct sftp_conn *conn, const char *path, struct sftp_statvfs *st,
     int quiet)
 {
 	Buffer msg;
@@ -832,7 +833,7 @@
 #ifdef notyet
 int
 do_fstatvfs(struct sftp_conn *conn, const char *handle, u_int handle_len,
-    struct statvfs *st, int quiet)
+    struct sftp_statvfs *st, int quiet)
 {
 	Buffer msg;
 	u_int id;