[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master bf0045d: Avoid aborting in 'waitpid' on MS-Windows
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] master bf0045d: Avoid aborting in 'waitpid' on MS-Windows |
Date: |
Tue, 29 Aug 2017 11:14:52 -0400 (EDT) |
branch: master
commit bf0045d7a4cd4c7d4df3fa34b8a12795e8ee73aa
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>
Avoid aborting in 'waitpid' on MS-Windows
* src/w32proc.c (waitpid): Don't allow quitting if called with
WNOHANG in OPTIONS. (Bug#28268)
---
src/w32proc.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/w32proc.c b/src/w32proc.c
index 76af55f..ffd5f0d0 100644
--- a/src/w32proc.c
+++ b/src/w32proc.c
@@ -1449,7 +1449,11 @@ waitpid (pid_t pid, int *status, int options)
do
{
- maybe_quit ();
+ /* When child_status_changed calls us with WNOHANG in OPTIONS,
+ we are supposed to be non-interruptible, so don't allow
+ quitting in that case. */
+ if (!dont_wait)
+ maybe_quit ();
active = WaitForMultipleObjects (nh, wait_hnd, FALSE, timeout_ms);
} while (active == WAIT_TIMEOUT && !dont_wait);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master bf0045d: Avoid aborting in 'waitpid' on MS-Windows,
Eli Zaretskii <=