mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2026-07-22 00:51:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

pty_process: Simplify cleanup after error during spawn

Browse Source
This commit is contained in:
Thiago de Arruda
2015-07-18 09:46:14 -03:00
parent 024b1f39a3
commit b13011ff47
1 changed files with 2 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/nvim/event/pty_process.c
View File

@@ -33,9 +33,6 @@
# include "event/pty_process.c.generated.h"
#endif
static const unsigned int KILL_RETRIES = 5;
static const unsigned int KILL_TIMEOUT = 2; // seconds
bool pty_process_spawn(PtyProcess *ptyproc)
FUNC_ATTR_NONNULL_ALL
{
@@ -83,19 +80,8 @@ bool pty_process_spawn(PtyProcess *ptyproc)
error:
close(master);
// terminate spawned process
kill(pid, SIGTERM);
int status, child;
unsigned int try = 0;
while (try++ < KILL_RETRIES && !(child = waitpid(pid, &status, WNOHANG))) {
sleep(KILL_TIMEOUT);
}
if (child != pid) {
kill(pid, SIGKILL);
waitpid(pid, NULL, 0);
}
kill(pid, SIGKILL);
waitpid(pid, NULL, 0);
return false;
}