xenia/kakoune
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handle SIGCHLD signals when piping

Browse Source
This commit is contained in:
Maxime Coste 2014-12-02 18:59:39 +00:00
parent 798d4c3a1e
commit 8208e75294
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/shell_manager.cc
View File

@ -50,6 +50,10 @@ String ShellManager::pipe(StringView input,
::pipe(read_pipe); ::pipe(read_pipe);
::pipe(error_pipe); ::pipe(error_pipe);
static sig_atomic_t exited; exited = 0;
static sig_atomic_t sig_exit_status;
signal(SIGCHLD, [](int) { wait(&sig_exit_status); exited = 1; });
String output; String output;
if (pid_t pid = fork()) if (pid_t pid = fork())
{ {
@ -89,7 +93,13 @@ String ShellManager::pipe(StringView input,
if (not error.empty()) if (not error.empty())
write_debug("shell stderr: <<<\n" + error + ">>>"); write_debug("shell stderr: <<<\n" + error + ">>>");
waitpid(pid, exit_status, 0); signal(SIGCHLD, SIG_DFL);
if (not exited)
waitpid(pid, exit_status, 0);
else if (exit_status)
*exit_status = sig_exit_status;
if (exit_status) if (exit_status)
{ {
if (WIFEXITED(*exit_status)) if (WIFEXITED(*exit_status))