- (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, 2 insertions, 1 deletions

diff --git a/sftp-client.c b/sftp-client.c
index 42bf0c813..5e39aa7d2 100644
--- a/sftp-client.c
+++ b/sftp-client.c
@@ -1223,7 +1223,8 @@ do_upload(struct sftp_conn *conn, char *local_path, char *remote_path,
                         len = 0;
                 else do
                         len = read(local_fd, data, conn->transfer_buflen);
-                while ((len == -1) && (errno == EINTR || errno == EAGAIN));
+                while ((len == -1) &&
+                    (errno == EINTR || errno == EAGAIN || errno == EWOULDBLOCK));
 
                 if (len == -1)
                         fatal("Couldn't read from \"%s\": %s", local_path,