From: Chong Yidong <cyd@stupidchicken.com>
Date: Sat, 4 Nov 2006 03:37:40 +0000 (+0000)
Subject: * w32proc.c: (sys_wait) Only wait for processes with fd<0.
X-Git-Tag: emacs-pretest-22.0.91~359
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3ac04ed074e0e4ebe8a937b49e685276ac30531b;p=emacs.git

* w32proc.c: (sys_wait) Only wait for processes with fd<0.
	  Others should be handled by sys_select instead. Fixes problems
	  with (progn (start-process "" nil "ls") (call-process "ls"))
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 94e1e02f7f2..594c5dcd4c8 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2006-10-27  Slawomir Nowaczyk  <slawek@cs.lth.se> (tiny change)
+
+	* w32proc.c: (sys_wait) Only wait for processes with fd<0.
+	  Others should be handled by sys_select instead. Fixes problems
+	  with (progn (start-process "" nil "ls") (call-process "ls"))
+
 2006-11-03  Giorgos Keramidas  <keramida@ceid.upatras.gr> (tiny change)
 
 	* xmenu.c (Fmenu_bar_open): Declare variable before BLOCK_INPUT to
diff --git a/src/w32proc.c b/src/w32proc.c
index 29491931015..7d27172781d 100644
--- a/src/w32proc.c
+++ b/src/w32proc.c
@@ -486,7 +486,8 @@ sys_wait (int *status)
     {
       for (cp = child_procs+(child_proc_count-1); cp >= child_procs; cp--)
 	/* some child_procs might be sockets; ignore them */
-	if (CHILD_ACTIVE (cp) && cp->procinfo.hProcess)
+	if (CHILD_ACTIVE (cp) && cp->procinfo.hProcess
+	    && (cp->fd < 0 || (fd_info[cp->fd].flags & FILE_AT_EOF) != 0))
 	  {
 	    wait_hnd[nh] = cp->procinfo.hProcess;
 	    cps[nh] = cp;