summaryrefslogtreecommitdiffstats
path: root/sftp-client.c
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2008-06-08 01:25:28 +0200
committerDarren Tucker <dtucker@zip.com.au>2008-06-08 01:25:28 +0200
commit5b2e2ba9e40d77d5876a96b248f9c526f8611b7c (patch)
treed1ad158c99f8bec56956508971a8c4b69ee19a5f /sftp-client.c
parent - (dtucker) [mux.c] Include paths.h inside ifdef HAVE_PATHS_H. (diff)
downloadopenssh-5b2e2ba9e40d77d5876a96b248f9c526f8611b7c.tar.xz
openssh-5b2e2ba9e40d77d5876a96b248f9c526f8611b7c.zip
- (dtucker) [configure.ac defines.h sftp-client.c sftp-server.c sftp.c] Do not enable statvfs extensions on platforms that do not have statvfs. ok djm@
Diffstat (limited to 'sftp-client.c')
-rw-r--r--sftp-client.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/sftp-client.c b/sftp-client.c
index 1e54348b7..8593cb8ce 100644
--- a/sftp-client.c
+++ b/sftp-client.c
@@ -24,7 +24,9 @@
#include <sys/types.h>
#include <sys/param.h>
+#ifdef HAVE_SYS_STATVFS_H
#include <sys/statvfs.h>
+#endif
#include "openbsd-compat/sys-queue.h"
#ifdef HAVE_SYS_STAT_H
# include <sys/stat.h>
@@ -241,6 +243,7 @@ get_decode_stat(int fd, u_int expected_id, int quiet)
return(a);
}
+#ifdef USE_STATVFS
static int
get_decode_statvfs(int fd, struct statvfs *st, u_int expected_id, int quiet)
{
@@ -290,6 +293,7 @@ get_decode_statvfs(int fd, struct statvfs *st, u_int expected_id, int quiet)
return 0;
}
+#endif
struct sftp_conn *
do_init(int fd_in, int fd_out, u_int transfer_buflen, u_int num_requests)
@@ -809,6 +813,7 @@ do_readlink(struct sftp_conn *conn, char *path)
}
#endif
+#ifdef USE_STATVFS
int
do_statvfs(struct sftp_conn *conn, const char *path, struct statvfs *st,
int quiet)
@@ -834,6 +839,7 @@ do_statvfs(struct sftp_conn *conn, const char *path, struct statvfs *st,
return get_decode_statvfs(conn->fd_in, st, id, quiet);
}
+#endif
#ifdef notyet
int