diff options
| author | Bram Moolenaar <bram@vim.org> | 2012-04-20 15:55:16 +0200 |
|---|---|---|
| committer | Bram Moolenaar <bram@vim.org> | 2012-04-20 15:55:16 +0200 |
| commit | 7327002fc34f2c06ccff9a0757dc29eb911da073 (patch) | |
| tree | 75c56b46260467081329122d849e3124c2dcd019 | |
| parent | 1cc073662b6e19df10f9cbcab83b0f5c5d6b5df2 (diff) | |
| download | vim-7327002fc34f2c06ccff9a0757dc29eb911da073.tar.gz | |
Problem: When using any interface language when Vim is waiting for a child
process it gets confused by a child process started through the
interface.
Solution: Always used waitpid() instead of wait(). (Yasuhiro Matsumoto)
| -rw-r--r-- | src/os_unix.c | 17 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 9 insertions, 10 deletions
diff --git a/src/os_unix.c b/src/os_unix.c index 043d0a80..860fbcc4 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -3734,24 +3734,21 @@ wait4pid(child, status) while (wait_pid != child) { -# ifdef _THREAD_SAFE - /* Ugly hack: when compiled with Python threads are probably - * used, in which case wait() sometimes hangs for no obvious - * reason. Use waitpid() instead and loop (like the GUI). */ -# ifdef __NeXT__ + /* When compiled with Python threads are probably used, in which case + * wait() sometimes hangs for no obvious reason. Use waitpid() + * instead and loop (like the GUI). Also needed for other interfaces, + * they might call system(). */ +# ifdef __NeXT__ wait_pid = wait4(child, status, WNOHANG, (struct rusage *)0); -# else +# else wait_pid = waitpid(child, status, WNOHANG); -# endif +# endif if (wait_pid == 0) { /* Wait for 1/100 sec before trying again. */ mch_delay(10L, TRUE); continue; } -# else - wait_pid = wait(status); -# endif if (wait_pid <= 0 # ifdef ECHILD && errno == ECHILD diff --git a/src/version.c b/src/version.c index ed92464a..df3717ab 100644 --- a/src/version.c +++ b/src/version.c @@ -715,6 +715,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 499, +/**/ 498, /**/ 497, |