From 21c547689aaffcea3045df0359315115e2e4c0b0 Mon Sep 17 00:00:00 2001 From: Aris Adamantiadis Date: Mon, 3 Mar 2008 15:42:25 +0000 Subject: [PATCH] Rodolphe Rocca fixes git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@135 7dcaeef0-15fb-0310-b436-a5af3365683c --- include/libssh/libssh.h | 3 ++- libssh/channels.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/libssh/libssh.h b/include/libssh/libssh.h index d96c34b5..ff3a60f0 100644 --- a/include/libssh/libssh.h +++ b/include/libssh/libssh.h @@ -187,6 +187,7 @@ int channel_request_exec(CHANNEL *channel, char *cmd); int channel_request_sftp(CHANNEL *channel); int channel_write(CHANNEL *channel,void *data,int len); int channel_send_eof(CHANNEL *channel); +int channel_is_eof(CHANNEL *channel); int channel_read(CHANNEL *channel, BUFFER *buffer,int bytes,int is_stderr); int channel_poll(CHANNEL *channel, int is_stderr); int channel_close(CHANNEL *channel); @@ -251,6 +252,6 @@ void ssh_userauth_kbdint_setanswer(SSH_SESSION *session, unsigned int i, char *a /* init.c */ int ssh_finalize(); #ifdef __cplusplus -} ; +} #endif #endif /* _LIBSSH_H */ diff --git a/libssh/channels.c b/libssh/channels.c index 45c6d6a4..b9f757df 100644 --- a/libssh/channels.c +++ b/libssh/channels.c @@ -824,7 +824,7 @@ int channel_poll(CHANNEL *channel, int is_stderr){ } if(channel->remote_eof) return 1; - return buffer_get_len(buffer); + return buffer_get_rest_len(buffer); } /* nonblocking read on the specified channel. it will return <=len bytes of data read