- (djm) [atomicio.c channels.c clientloop.c defines.h includes.h]

   [packet.c scp.c serverloop.c sftp-client.c ssh-agent.c ssh-keyscan.c]
   [sshd.c] Explicitly handle EWOULDBLOCK wherever we handle EAGAIN, on
   some platforms (HP nonstop) it is a distinct errno;
   bz#1467 reported by sconeu AT yahoo.com; ok dtucker@

1 files changed, 4 insertions, 2 deletions

diff --git a/ssh-agent.c b/ssh-agent.c
index b1c65fab6..9123cfe6b 100644
--- a/ssh-agent.c
+++ b/ssh-agent.c
@@ -961,7 +961,8 @@ after_select(fd_set *readset, fd_set *writeset)
                                             buffer_ptr(&sockets[i].output),
                                             buffer_len(&sockets[i].output));
                                         if (len == -1 && (errno == EAGAIN ||
-                                            errno == EINTR))
+                                            errno == EINTR ||
+                                            errno == EWOULDBLOCK))
                                                 continue;
                                         break;
                                 } while (1);
@@ -975,7 +976,8 @@ after_select(fd_set *readset, fd_set *writeset)
                                 do {
                                         len = read(sockets[i].fd, buf, sizeof(buf));
                                         if (len == -1 && (errno == EAGAIN ||
-                                            errno == EINTR))
+                                            errno == EINTR ||
+                                            errno == EWOULDBLOCK))
                                                 continue;
                                         break;
                                 } while (1);