summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--atomicio.c4
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index c2fe24735..be8ba3569 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,8 @@
5 Lutz Jaenicke <Lutz.Jaenicke@aet.TU-Cottbus.DE> 5 Lutz Jaenicke <Lutz.Jaenicke@aet.TU-Cottbus.DE>
6 - (djm) Fixed undefined variables for OSF SIA. Report from 6 - (djm) Fixed undefined variables for OSF SIA. Report from
7 Baars, Henk <Hendrik.Baars@nl.origin-it.com> 7 Baars, Henk <Hendrik.Baars@nl.origin-it.com>
8 - (djm) Handle EWOULDBLOCK returns from read() and write() in atomicio.c
9 Fix from Marquess, Steve Mr JMLFDC <Steve.Marquess@DET.AMEDD.ARMY.MIL>
8 10
920000702 1120000702
10 - (djm) Fix brace mismatch from Corinna Vinschen <vinschen@cygnus.com> 12 - (djm) Fix brace mismatch from Corinna Vinschen <vinschen@cygnus.com>
diff --git a/atomicio.c b/atomicio.c
index 7d9f9340c..45da22d3b 100644
--- a/atomicio.c
+++ b/atomicio.c
@@ -46,7 +46,11 @@ atomicio(f, fd, _s, n)
46 res = (f) (fd, s + pos, n - pos); 46 res = (f) (fd, s + pos, n - pos);
47 switch (res) { 47 switch (res) {
48 case -1: 48 case -1:
49#ifdef EWOULDBLOCK
50 if (errno == EINTR || errno == EAGAIN || errno == EWOULDBLOCK)
51#else
49 if (errno == EINTR || errno == EAGAIN) 52 if (errno == EINTR || errno == EAGAIN)
53#endif
50 continue; 54 continue;
51 case 0: 55 case 0:
52 return (res); 56 return (res);