aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAris Adamantiadis <aris@0xbadc0de.be>2008-03-03 15:42:25 +0000
committerAris Adamantiadis <aris@0xbadc0de.be>2008-03-03 15:42:25 +0000
commit21c547689aaffcea3045df0359315115e2e4c0b0 (patch)
treeb2ead58b5db884a7290a9328e2fb6bbea54d6625
parent01470097c6ff22b3c1a8c4383ae08a2ad3ce0ff8 (diff)
downloadlibssh-21c547689aaffcea3045df0359315115e2e4c0b0.tar.gz
libssh-21c547689aaffcea3045df0359315115e2e4c0b0.tar.xz
libssh-21c547689aaffcea3045df0359315115e2e4c0b0.zip
Rodolphe Rocca fixes
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@135 7dcaeef0-15fb-0310-b436-a5af3365683c
-rw-r--r--include/libssh/libssh.h3
-rw-r--r--libssh/channels.c2
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