mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-18 17:01:01 -08:00
Code Issues Projects Releases Wiki Activity

More cleanup in handling subprocess exiting on MS-Windows.

Browse source 
src/w32proc.c (reader_thread): Avoid passing NULL handles to
 SetEvent and WaitForSingleObject.
This commit is contained in:
Eli Zaretskii 2012-12-29 12:09:49 +02:00
parent 43ebd12b9a
commit e7ae8039c3
2 changed files with 17 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/ChangeLog
View file

@ -1,3 +1,8 @@
2012-12-29 Eli Zaretskii <eliz@gnu.org>
* w32proc.c (reader_thread): Avoid passing NULL handles to
SetEvent and WaitForSingleObject.
2012-12-28 Paul Eggert <eggert@cs.ucla.edu>
Port EXTERNALLY_VISIBLE to Clang 3.2.

12
src/w32proc.c
View file

@ -970,6 +970,11 @@ reader_thread (void *arg)
else
rc = _sys_read_ahead (cp->fd);
/* Don't bother waiting for the event if we already have been
told to exit by delete_child. */
if (cp->status == STATUS_READ_ERROR || !cp->char_avail)
break;
/* The name char_avail is a misnomer - it really just means the
read-ahead has completed, whether successfully or not. */
if (!SetEvent (cp->char_avail))
@ -986,6 +991,11 @@ reader_thread (void *arg)
if (rc == STATUS_READ_FAILED)
break;
/* Don't bother waiting for the acknowledge if we already have
been told to exit by delete_child. */
if (cp->status == STATUS_READ_ERROR || !cp->char_consumed)
break;
/* Wait until our input is acknowledged before reading again */
if (WaitForSingleObject (cp->char_consumed, INFINITE) != WAIT_OBJECT_0)
{
@ -993,6 +1003,8 @@ reader_thread (void *arg)
"%lu for fd %ld\n", GetLastError (), cp->fd));
break;
}
/* delete_child sets status to STATUS_READ_ERROR when it wants
us to exit. */
if (cp->status == STATUS_READ_ERROR)
break;
}