summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2000-07-08 10:57:08 +1000
committerDamien Miller <djm@mindrot.org>2000-07-08 10:57:08 +1000
commitf2fdbe5540c3954bd62a6ec6d701132a65110d27 (patch)
treeea12f6af9f07a863df085715f25b263f39026513
parentfe668e4b1636aed7d1adb7c0aaaa07a9b6277421 (diff)
downloadopenssh-git-f2fdbe5540c3954bd62a6ec6d701132a65110d27.tar.gz
- (djm) Handle EWOULDBLOCK returns from read() and write() in atomicio.c
Fix from Marquess, Steve Mr JMLFDC <Steve.Marquess@DET.AMEDD.ARMY.MIL>
-rw-r--r--ChangeLog2
-rw-r--r--atomicio.c4
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index c2fe2473..be8ba356 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,8 @@
Lutz Jaenicke <Lutz.Jaenicke@aet.TU-Cottbus.DE>
- (djm) Fixed undefined variables for OSF SIA. Report from
Baars, Henk <Hendrik.Baars@nl.origin-it.com>
+ - (djm) Handle EWOULDBLOCK returns from read() and write() in atomicio.c
+ Fix from Marquess, Steve Mr JMLFDC <Steve.Marquess@DET.AMEDD.ARMY.MIL>
20000702
- (djm) Fix brace mismatch from Corinna Vinschen <vinschen@cygnus.com>
diff --git a/atomicio.c b/atomicio.c
index 7d9f9340..45da22d3 100644
--- a/atomicio.c
+++ b/atomicio.c
@@ -46,7 +46,11 @@ atomicio(f, fd, _s, n)
res = (f) (fd, s + pos, n - pos);
switch (res) {
case -1:
+#ifdef EWOULDBLOCK
+ if (errno == EINTR || errno == EAGAIN || errno == EWOULDBLOCK)
+#else
if (errno == EINTR || errno == EAGAIN)
+#endif
continue;
case 0:
return (res);