summaryrefslogtreecommitdiff
path: root/atomicio.c
diff options
context:
space:
mode:
authordjm <djm>2008-07-04 13:10:49 +0000
committerdjm <djm>2008-07-04 13:10:49 +0000
commit3d2174695a7e606f709dca9dd87a68757c8c437c (patch)
tree93f94a773f5d4b8d9da5ee426ed02621ee04c19e /atomicio.c
parent009f7e35c0a4a367cdfc8db24011e29c342b02ac (diff)
downloadopenssh-3d2174695a7e606f709dca9dd87a68757c8c437c.tar.gz
- (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@
Diffstat (limited to 'atomicio.c')
-rw-r--r--atomicio.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/atomicio.c b/atomicio.c
index 575bf890..bb44c323 100644
--- a/atomicio.c
+++ b/atomicio.c
@@ -63,11 +63,7 @@ atomicio(ssize_t (*f) (int, void *, size_t), int fd, void *_s, size_t n)
case -1:
if (errno == EINTR)
continue;
-#ifdef EWOULDBLOCK
if (errno == EAGAIN || errno == EWOULDBLOCK) {
-#else
- if (errno == EAGAIN) {
-#endif
(void)poll(&pfd, 1, -1);
continue;
}
@@ -109,11 +105,7 @@ atomiciov(ssize_t (*f) (int, const struct iovec *, int), int fd,
case -1:
if (errno == EINTR)
continue;
-#ifdef EWOULDBLOCK
if (errno == EAGAIN || errno == EWOULDBLOCK) {
-#else
- if (errno == EAGAIN) {
-#endif
(void)poll(&pfd, 1, -1);
continue;
}