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

fileroller/procroller: check widget destructor for error #793

Browse Source
This commit is contained in:
nick black 2020-07-13 05:26:29 -04:00
parent 9ca7d14c2b
commit 1c95241948
No known key found for this signature in database
GPG Key ID: 5F43400C21CBFACC
2 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/poc/fileroller.c
View File

@ -13,8 +13,7 @@ static pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER;
static int
cb(struct ncfdplane* ncfd, const void* data, size_t len, void* curry){
int ret = -1;
// FIXME unsafe -- input isn't necessarily nul-terminated!
if(ncplane_putstr(ncfdplane_plane(ncfd), data) >= 0){
if(ncplane_putnstr(ncfdplane_plane(ncfd), len, data) >= 0){
if(!notcurses_render(ncplane_notcurses(ncfdplane_plane(ncfd)))){
ret = 0;
}
@ -62,7 +61,10 @@ int main(int argc, char** argv){
}
fddone = false;
pthread_mutex_unlock(&lock);
ncfdplane_destroy(ncfp);
if(ncfdplane_destroy(ncfp)){
notcurses_stop(nc);
return EXIT_FAILURE;
}
}
done:

20
src/poc/procroller.c
View File

@ -13,8 +13,8 @@ static pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER;
static int
cb(struct ncfdplane* ncfd, const void* data, size_t len, void* curry){
int ret = -1;
// FIXME unsafe -- input isn't necessarily nul-terminated!
if(ncplane_putstr(ncfdplane_plane(ncfd), data) >= 0){
ncplane_set_scrolling(ncfdplane_plane(ncfd), true);
if(ncplane_putnstr(ncfdplane_plane(ncfd), len, data) >= 0){
if(!notcurses_render(ncplane_notcurses(ncfdplane_plane(ncfd)))){
ret = 0;
}
@ -50,16 +50,24 @@ int main(int argc, char** argv){
return EXIT_FAILURE;
}
++argv;
struct ncplane* n = notcurses_stdplane(nc);
ncplane_set_scrolling(n, true);
struct ncplane* std = notcurses_stdplane(nc);
ncplane_set_scrolling(std, true);
ncsubproc_options nopts = {};
struct ncsubproc* nsproc = ncsubproc_createvp(n, &nopts, *argv, argv, cb, eofcb);
struct ncsubproc* nsproc = ncsubproc_createvp(std, &nopts, *argv, argv, cb, eofcb);
if(nsproc == NULL){
notcurses_stop(nc);
return EXIT_FAILURE;
}
pthread_mutex_lock(&lock);
while(!fddone){
pthread_cond_wait(&cond, &lock);
}
pthread_mutex_unlock(&lock);
ncsubproc_destroy(nsproc);
notcurses_render(nc);
if(ncsubproc_destroy(nsproc)){
notcurses_stop(nc);
return EXIT_FAILURE;
}
if(notcurses_stop(nc)){
return EXIT_FAILURE;
}