1
1

channels: Reformat ssh_channel_read_nonblocking()

Fixes T188

Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
Reviewed-by: Jakub Jelen <jjelen@redhat.com>
Этот коммит содержится в:
Andreas Schneider 2019-10-31 13:28:42 +01:00
родитель 3bad060738
Коммит 8d671efdbd

Просмотреть файл

@ -2973,42 +2973,45 @@ int ssh_channel_read_timeout(ssh_channel channel,
* *
* @see ssh_channel_is_eof() * @see ssh_channel_is_eof()
*/ */
int ssh_channel_read_nonblocking(ssh_channel channel, void *dest, uint32_t count, int ssh_channel_read_nonblocking(ssh_channel channel,
int is_stderr) { void *dest,
ssh_session session; uint32_t count,
int to_read; int is_stderr)
int rc; {
int blocking; ssh_session session;
int to_read;
int rc;
int blocking;
if(channel == NULL) { if(channel == NULL) {
return SSH_ERROR; return SSH_ERROR;
} }
if(dest == NULL) { if(dest == NULL) {
ssh_set_error_invalid(channel->session); ssh_set_error_invalid(channel->session);
return SSH_ERROR; return SSH_ERROR;
} }
session = channel->session; session = channel->session;
to_read = ssh_channel_poll(channel, is_stderr); to_read = ssh_channel_poll(channel, is_stderr);
if (to_read <= 0) { if (to_read <= 0) {
if (session->session_state == SSH_SESSION_STATE_ERROR){ if (session->session_state == SSH_SESSION_STATE_ERROR){
return SSH_ERROR; return SSH_ERROR;
} }
return to_read; /* may be an error code */ return to_read; /* may be an error code */
} }
if (to_read > (int)count) { if (to_read > (int)count) {
to_read = (int)count; to_read = (int)count;
} }
blocking = ssh_is_blocking(session); blocking = ssh_is_blocking(session);
ssh_set_blocking(session, 0); ssh_set_blocking(session, 0);
rc = ssh_channel_read(channel, dest, to_read, is_stderr); rc = ssh_channel_read(channel, dest, to_read, is_stderr);
ssh_set_blocking(session,blocking); ssh_set_blocking(session,blocking);
return rc; return rc;
} }
/** /**