blackbeard420/notcurses
1
0
Fork 0
mirror of https://github.com/dankamongmen/notcurses synced 2025-03-10 01:29:05 -04:00
Code Issues Projects Releases Wiki Activity

ncsubproc: kill_and_wait_subproc() #310

Browse Source
This commit is contained in:
nick black 2020-04-21 05:37:07 -04:00
parent ee21f4e9ed
commit 023f06591e
No known key found for this signature in database
GPG Key ID: 5F43400C21CBFACC
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/lib/fd.c
View File

@ -1,6 +1,7 @@
#include <fcntl.h>
#include <unistd.h>
#include <pthread.h>
#include <sys/wait.h>
#include "internal.h"
// release the memory and fd, but don't join the thread (since we might be
@ -95,6 +96,14 @@ launch_pipe_process(int* pipe){
return p;
}
static int
kill_and_wait_subproc(pid_t pid){
kill(pid, SIGTERM);
int status;
waitpid(pid, &status, 0); // FIXME rigorurize this up
return 0;
}
ncsubproc* ncsubproc_createv(ncplane* n, const ncsubproc_options* opts,
const char* bin, char* const arg[],
ncfdplane_callback cbfxn, ncfdplane_done_cb donecbfxn){
@ -116,7 +125,7 @@ ncsubproc* ncsubproc_createv(ncplane* n, const ncsubproc_options* opts,
return NULL;
}
if((ret->nfp = ncfdplane_create(n, &opts->popts, fd, cbfxn, donecbfxn)) == NULL){
// FIXME kill process
kill_and_wait_subproc(ret->pid);
free(ret);
return NULL;
}
@ -144,7 +153,7 @@ ncsubproc* ncsubproc_createvp(ncplane* n, const ncsubproc_options* opts,
return NULL;
}
if((ret->nfp = ncfdplane_create(n, &opts->popts, fd, cbfxn, donecbfxn)) == NULL){
// FIXME kill process
kill_and_wait_subproc(ret->pid);
free(ret);
return NULL;
}
@ -172,7 +181,7 @@ ncsubproc* ncsubproc_createvpe(ncplane* n, const ncsubproc_options* opts,
return NULL;
}
if((ret->nfp = ncfdplane_create(n, &opts->popts, fd, cbfxn, donecbfxn)) == NULL){
// FIXME kill process
kill_and_wait_subproc(ret->pid);
free(ret);
return NULL;
}