1 files changed, 8 insertions, 8 deletions

diff --git a/channels.c b/channels.c
index a84b487e5..c9d2015ee 100644
--- a/channels.c
+++ b/channels.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: channels.c,v 1.347 2015/07/01 02:26:31 djm Exp $ */
+/* $OpenBSD: channels.c,v 1.349 2016/02/05 13:28:19 naddy Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -662,7 +662,7 @@ channel_open_message(void)
                 case SSH_CHANNEL_INPUT_DRAINING:
                 case SSH_CHANNEL_OUTPUT_DRAINING:
                         snprintf(buf, sizeof buf,
-                            "  #%d %.300s (t%d r%d i%d/%d o%d/%d fd %d/%d cc %d)\r\n",
+                            "  #%d %.300s (t%d r%d i%u/%d o%u/%d fd %d/%d cc %d)\r\n",
                             c->self, c->remote_name,
                             c->type, c->remote_id,
                             c->istate, buffer_len(&c->input),
@@ -1896,13 +1896,13 @@ read_mux(Channel *c, u_int need)
         if (buffer_len(&c->input) < need) {
                 rlen = need - buffer_len(&c->input);
                 len = read(c->rfd, buf, MIN(rlen, CHAN_RBUF));
+                if (len < 0 && (errno == EINTR || errno == EAGAIN))
+                        return buffer_len(&c->input);
                 if (len <= 0) {
-                        if (errno != EINTR && errno != EAGAIN) {
-                                debug2("channel %d: ctl read<=0 rfd %d len %d",
-                                    c->self, c->rfd, len);
-                                chan_read_failed(c);
-                                return 0;
-                        }
+                        debug2("channel %d: ctl read<=0 rfd %d len %d",
+                            c->self, c->rfd, len);
+                        chan_read_failed(c);
+                        return 0;
                 } else
                         buffer_append(&c->input, buf, len);
         }