shinys000114/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2026-02-10 18:28:10 +09:00
Code Issues Packages Projects Releases Wiki Activity

channel_read() won't block until count b. are read

Browse Source
This commit is contained in:
Aris Adamantiadis
2009-11-05 16:00:05 +01:00
parent 535ff07f0f
commit 75f066dfcd
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libssh/channels.c
View File

@@ -1838,7 +1838,8 @@ int channel_read_buffer(ssh_channel channel, ssh_buffer buffer, uint32_t count,
* @param is_stderr A boolean value to mark reading from the stderr flow. * @param is_stderr A boolean value to mark reading from the stderr flow.
* *
* @return The number of bytes read, 0 on end of file or SSH_ERROR on error. * @return The number of bytes read, 0 on end of file or SSH_ERROR on error.
* * @warning This function may return less than count bytes of data, and won't
* block until count bytes have been read.
* @warning The read function using a buffer has been renamed to * @warning The read function using a buffer has been renamed to
* channel_read_buffer(). * channel_read_buffer().
*/ */
@@ -1876,9 +1877,10 @@ int channel_read(ssh_channel channel, void *dest, uint32_t count, int is_stderr)
} }
} }
/* block reading if asked bytes=0 */ /* block reading until at least one byte is read
while (buffer_get_rest_len(stdbuf) == 0 || * and ignore the trivial case count=0
buffer_get_rest_len(stdbuf) < count) { */
while (buffer_get_rest_len(stdbuf) == 0 && count > 0) {
if (channel->remote_eof && buffer_get_rest_len(stdbuf) == 0) { if (channel->remote_eof && buffer_get_rest_len(stdbuf) == 0) {
leave_function(); leave_function();
return 0; return 0;