diff options
| author | Damien Miller <djm@mindrot.org> | 2008-07-04 15:10:49 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2008-07-04 15:10:49 +0200 |
| commit | d8968adb5faef58508bb5e7dab7cdbaf5b0e90d5 (patch) | |
| tree | 33357b9d71f2d3e72b8383e2b3771773914425f4 /atomicio.c | |
| parent | - djm@cvs.openbsd.org 2008/06/30 10:43:03 (diff) | |
| download | openssh-d8968adb5faef58508bb5e7dab7cdbaf5b0e90d5.tar.xz openssh-d8968adb5faef58508bb5e7dab7cdbaf5b0e90d5.zip | |
- (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.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/atomicio.c b/atomicio.c index 575bf8900..bb44c3230 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; } |