- dtucker@cvs.openbsd.org 2008/06/09 13:02:39

[openssh.git] / sftp-server.c

diff --git a/sftp-server.c b/sftp-server.c
index 300fd5cfdb192ca72d4abf48237106bcebed11d1..4022b93b604076f29874c5b4874a165a02d9450a 100644 (file)
--- a/sftp-server.c
+++ b/sftp-server.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp-server.c,v 1.79 2008/04/18 12:32:11 djm Exp $ */
+/* $OpenBSD: sftp-server.c,v 1.83 2008/06/09 13:02:39 dtucker Exp $ */
 /*
  * Copyright (c) 2000-2004 Markus Friedl.  All rights reserved.
  *
@@ -23,8 +23,12 @@
 #ifdef HAVE_SYS_TIME_H
 # include <sys/time.h>
 #endif
+#ifdef HAVE_SYS_MOUNT_H
 #include <sys/mount.h>
+#endif
+#ifdef HAVE_SYS_STATVFS_H
 #include <sys/statvfs.h>
+#endif
 
 #include <dirent.h>
 #include <errno.h>
@@ -100,6 +104,9 @@ errno_to_portable(int unixerrno)
        case EINVAL:
                ret = SSH2_FX_BAD_MESSAGE;
                break;
+       case ENOSYS:
+               ret = SSH2_FX_OP_UNSUPPORTED;
+               break;
        default:
                ret = SSH2_FX_FAILURE;
                break;
@@ -489,17 +496,17 @@ send_statvfs(u_int32_t id, struct statvfs *st)
        buffer_init(&msg);
        buffer_put_char(&msg, SSH2_FXP_EXTENDED_REPLY);
        buffer_put_int(&msg, id);
-       buffer_put_int(&msg, st->f_bsize);
-       buffer_put_int(&msg, st->f_frsize);
+       buffer_put_int64(&msg, st->f_bsize);
+       buffer_put_int64(&msg, st->f_frsize);
        buffer_put_int64(&msg, st->f_blocks);
        buffer_put_int64(&msg, st->f_bfree);
        buffer_put_int64(&msg, st->f_bavail);
        buffer_put_int64(&msg, st->f_files);
        buffer_put_int64(&msg, st->f_ffree);
        buffer_put_int64(&msg, st->f_favail);
-       buffer_put_int(&msg, st->f_fsid);
-       buffer_put_int(&msg, flag);
-       buffer_put_int(&msg, st->f_namemax);
+       buffer_put_int64(&msg, FSID_TO_ULONG(st->f_fsid));
+       buffer_put_int64(&msg, flag);
+       buffer_put_int64(&msg, st->f_namemax);
        send_msg(&msg);
        buffer_free(&msg);
 }
@@ -519,10 +526,12 @@ process_init(void)
        /* POSIX rename extension */
        buffer_put_cstring(&msg, "posix-rename@openssh.com");
        buffer_put_cstring(&msg, "1"); /* version */
+       /* statvfs extension */
        buffer_put_cstring(&msg, "statvfs@openssh.com");
-       buffer_put_cstring(&msg, "1"); /* version */
+       buffer_put_cstring(&msg, "2"); /* version */
+       /* fstatvfs extension */
        buffer_put_cstring(&msg, "fstatvfs@openssh.com");
-       buffer_put_cstring(&msg, "1"); /* version */
+       buffer_put_cstring(&msg, "2"); /* version */
        send_msg(&msg);
        buffer_free(&msg);
 }