(wait_reading_process_input): When trying to suck

input from one process, for accept-process-output,
exit that loop if we get EAGAIN or EWOULDBLOCK.

1 files changed, 14 insertions, 3 deletions

diff --git a/src/process.c b/src/process.c
index cc658400dbb..2cb1dd908ce 100644
--- a/src/process.c
+++ b/src/process.c
@@ -2541,16 +2541,27 @@ wait_reading_process_input (time_limit, microsecs, read_kbd, do_display)
           XSETPROCESS (proc, wait_proc);
 
           /* Read data from the process, until we exhaust it.  */
-          while (XINT (wait_proc->infd) >= 0
-                 && (nread
-                     = read_process_output (proc, XINT (wait_proc->infd))))
+          while (XINT (wait_proc->infd) >= 0)
             {
+              nread = read_process_output (proc, XINT (wait_proc->infd));
+
+              if (nread == 0)
+                break;
+
               if (0 < nread) 
                 total_nread += nread;
 #ifdef EIO
               else if (nread == -1 && EIO == errno)
                 break;
 #endif
+#ifdef EAGAIN
+              else if (nread == -1 && EAGAIN == errno)
+                break;
+#endif
+#ifdef EWOULDBLOCK
+              else if (nread == -1 && EWOULDBLOCK == errno)
+                break;
+#endif
             }
           if (total_nread > 0 && do_display)
             redisplay_preserve_echo_area ();