diff options
| author | Markus Friedl <markus@cvs.openbsd.org> | 2000-05-01 19:11:36 +0000 |
|---|---|---|
| committer | Markus Friedl <markus@cvs.openbsd.org> | 2000-05-01 19:11:36 +0000 |
| commit | 814bfa161902ef25cfa67fc6a41f79432f32024a (patch) | |
| tree | 79d947c88ec7b72fe4669e2aa598641b3b54a952 /usr.bin | |
| parent | 0efbbb488dcfe757e259cde40588be55c9862aaa (diff) | |
EINTR
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/ssh/channels.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/usr.bin/ssh/channels.c b/usr.bin/ssh/channels.c index 85a340bac54..42a8a04552d 100644 --- a/usr.bin/ssh/channels.c +++ b/usr.bin/ssh/channels.c @@ -17,7 +17,7 @@ */ #include "includes.h" -RCSID("$Id: channels.c,v 1.52 2000/05/01 18:31:27 markus Exp $"); +RCSID("$Id: channels.c,v 1.53 2000/05/01 19:11:35 markus Exp $"); #include "ssh.h" #include "packet.h" @@ -632,6 +632,8 @@ channel_handle_rfd(Channel *c, fd_set * readset, fd_set * writeset) if (c->rfd != -1 && FD_ISSET(c->rfd, readset)) { len = read(c->rfd, buf, sizeof(buf)); + if (len < 0 && (errno == EINTR || errno == EAGAIN)) + return 1; if (len <= 0) { debug("channel %d: read<=0 rfd %d len %d", c->self, c->rfd, len); @@ -658,7 +660,9 @@ channel_handle_wfd(Channel *c, fd_set * readset, fd_set * writeset) FD_ISSET(c->wfd, writeset) && buffer_len(&c->output) > 0) { len = write(c->wfd, buffer_ptr(&c->output), - buffer_len(&c->output)); + buffer_len(&c->output)); + if (len < 0 && (errno == EINTR || errno == EAGAIN)) + return 1; if (len <= 0) { if (compat13) { buffer_consume(&c->output, buffer_len(&c->output)); |