Mercurial > dropbear
diff common-channel.c @ 722:4a274f47eabd
Add ~. and ~^Z handling to exit/suspend dbclient
author | Matt Johnston <matt@ucc.asn.au> |
---|---|
date | Sat, 23 Mar 2013 23:16:06 +0800 |
parents | abd99ecd7ec2 |
children | 9a5438271556 |
line wrap: on
line diff
--- a/common-channel.c Thu Mar 21 23:35:07 2013 +0800 +++ b/common-channel.c Sat Mar 23 23:16:06 2013 +0800 @@ -643,6 +643,7 @@ /* read the data */ len = read(fd, buf_getwriteptr(ses.writepayload, maxlen), maxlen); + if (len <= 0) { if (len == 0 || errno != EINTR) { /* This will also get hit in the case of EAGAIN. The only @@ -650,12 +651,22 @@ in which case it can be treated the same as EOF */ close_chan_fd(channel, fd, SHUT_RD); } - ses.writepayload->len = ses.writepayload->pos = 0; + buf_setpos(ses.writepayload, 0); + buf_setlen(ses.writepayload, 0); TRACE(("leave send_msg_channel_data: len %d read err %d or EOF for fd %d", len, errno, fd)) return; } + if (channel->read_mangler) { + channel->read_mangler(channel, buf_getwriteptr(ses.writepayload, len), &len); + if (len == 0) { + buf_setpos(ses.writepayload, 0); + buf_setlen(ses.writepayload, 0); + return; + } + } + TRACE(("send_msg_channel_data: len %d fd %d", len, fd)) buf_incrwritepos(ses.writepayload, len); /* ... real size here */