- markus@cvs.openbsd.org 2001/04/17 09:52:48
[clientloop.c]
handle EINTR/EAGAIN on read; ok deraadt@
diff --git a/clientloop.c b/clientloop.c
index 95c00f3..2709ce3 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -59,7 +59,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: clientloop.c,v 1.63 2001/04/15 17:16:00 markus Exp $");
+RCSID("$OpenBSD: clientloop.c,v 1.64 2001/04/17 09:52:48 markus Exp $");
#include "ssh.h"
#include "ssh1.h"
@@ -625,6 +625,8 @@
if (FD_ISSET(fileno(stdin), readset)) {
/* Read as much as possible. */
len = read(fileno(stdin), buf, sizeof(buf));
+ if (len < 0 && (errno == EAGAIN || errno == EINTR))
+ return; /* we'll try again later */
if (len <= 0) {
/*
* Received EOF or error. They are treated
@@ -678,7 +680,7 @@
len = write(fileno(stdout), buffer_ptr(&stdout_buffer),
buffer_len(&stdout_buffer));
if (len <= 0) {
- if (errno == EAGAIN)
+ if (errno == EINTR || errno == EAGAIN)
len = 0;
else {
/*
@@ -701,7 +703,7 @@
len = write(fileno(stderr), buffer_ptr(&stderr_buffer),
buffer_len(&stderr_buffer));
if (len <= 0) {
- if (errno == EAGAIN)
+ if (errno == EINTR || errno == EAGAIN)
len = 0;
else {
/* EOF or error, but can't even print error message. */