walkero
/
lite-xl
1
0
Fork 0
Code Issues 7 Pull Requests Projects Releases 14 Wiki Activity

Merge pull request #828 from adamharrison/signal-processes 

Changed signalling so it'll target the whole process group.
This commit is contained in:
Adam 2022-02-11 12:01:53 -05:00 committed by GitHub
parent af6a06bc8b d2d5617774
commit 3a0af6ee04
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/api/process.c
View File

@ -106,9 +106,9 @@ static bool signal_process(process_t* proc, signal_e sig) {
} }
#else #else
switch (sig) { switch (sig) {
case SIGNAL_TERM: terminate = kill(proc->pid, SIGTERM) == 1; break; case SIGNAL_TERM: terminate = kill(-proc->pid, SIGTERM) == 1; break;
case SIGNAL_KILL: terminate = kill(proc->pid, SIGKILL) == 1; break; case SIGNAL_KILL: terminate = kill(-proc->pid, SIGKILL) == 1; break;
case SIGNAL_INTERRUPT: kill(proc->pid, SIGINT); break; case SIGNAL_INTERRUPT: kill(-proc->pid, SIGINT); break;
} }
#endif #endif
if (terminate) if (terminate)
@ -256,6 +256,7 @@ static int process_start(lua_State* L) {
} }
return luaL_error(L, "Error running fork: %s.", strerror(errno)); return luaL_error(L, "Error running fork: %s.", strerror(errno));
} else if (!self->pid) { } else if (!self->pid) {
setpgrp();
for (int stream = 0; stream < 3; ++stream) { for (int stream = 0; stream < 3; ++stream) {
if (new_fds[stream] == REDIRECT_DISCARD) { // Close the stream if we don't want it. if (new_fds[stream] == REDIRECT_DISCARD) { // Close the stream if we don't want it.
close(self->child_pipes[stream][stream == STDIN_FD ? 0 : 1]); close(self->child_pipes[stream][stream == STDIN_FD ? 0 : 1]);
@ -430,6 +431,7 @@ static int f_gc(lua_State* L) {
close_fd(&self->child_pipes[STDIN_FD ][1]); close_fd(&self->child_pipes[STDIN_FD ][1]);
close_fd(&self->child_pipes[STDOUT_FD][0]); close_fd(&self->child_pipes[STDOUT_FD][0]);
close_fd(&self->child_pipes[STDERR_FD][0]); close_fd(&self->child_pipes[STDERR_FD][0]);
poll_process(self, 10);
return 0; return 0;
} }