From 0c9879ad9c7c64438fd183e2c1b37411e5c0ba9d Mon Sep 17 00:00:00 2001 From: nick black Date: Thu, 3 Mar 2022 22:41:41 -0500 Subject: [PATCH] popen() wants pclose() not fclose() --- src/omphalos/popen.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/omphalos/popen.c b/src/omphalos/popen.c index 705d908f..87e041f5 100644 --- a/src/omphalos/popen.c +++ b/src/omphalos/popen.c @@ -73,10 +73,10 @@ int popen_drain(const char *cmd){ } if(!feof(fd)){ diagnostic("Error reading from '%s' (%s?)",cmd,strerror(errno)); - fclose(fd); + pclose(fd); return -1; } - if(fclose(fd)){ + if(pclose(fd)){ diagnostic("Error running '%s'",cmd); return -1; } @@ -105,13 +105,13 @@ char *spopen_drain(const char *cmd){ } } if(!feof(fd)){ - if(o < s){ + if(o < s){ diagnostic("Error reading from '%s' (%s?)",cmd,strerror(errno)); - fclose(fd); + pclose(fd); free(buf); return NULL; - } - }else if(fclose(fd)){ + } + }else if(pclose(fd)){ diagnostic("Error running '%s'",cmd); free(buf); return NULL;