--- libelwix/src/pio.c 2019/12/30 18:11:16 1.6 +++ libelwix/src/pio.c 2020/06/19 22:35:05 1.7.2.1 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: pio.c,v 1.6 2019/12/30 18:11:16 misho Exp $ +* $Id: pio.c,v 1.7.2.1 2020/06/19 22:35:05 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -12,7 +12,7 @@ terms: All of the documentation and software included in the ELWIX and AITNET Releases is copyrighted by ELWIX - Sofia/Bulgaria -Copyright 2004 - 2015 +Copyright 2004 - 2020 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -65,6 +65,7 @@ static pthread_mutex_t pidlist_mutex = PTHREAD_MUTEX_I * @command = command * @type = type * @ppid = return pid of child program + * If value of *ppid is -1 when invoke routine then child will be session leader * return: NULL error or !=NULL open program */ #ifdef POPEN_STREAM @@ -74,8 +75,29 @@ int #endif e_popen(const char *command, const char *type, pid_t *ppid) { + return e_popen2(command, type, ppid, NULL, 0); +} + +/* + * e_popen2() - ELWIX replacement of standard popen with post close of chosen handles + * + * @command = command + * @type = type + * @ppid = return pid of child program + * If value of *ppid is -1 when invoke routine then child will be session leader + * @fds = file descriptor array for close when fork + * @fdslen = fds number of descriptors + * return: NULL error or !=NULL open program + */ +#ifdef POPEN_STREAM +FILE * +#else +int +#endif +e_popen2(const char *command, const char *type, pid_t *ppid, int *fds, size_t fdslen) +{ struct tagPIOPID *cur, *p; - int pdes[2], pid, twoway, cloexec; + int pdes[2], pid, twoway, cloexec, i; char *argv[4]; if (!command || !type) @@ -143,6 +165,14 @@ e_popen(const char *command, const char *type, pid_t * #endif /* NOTREACHED */ case 0: /* Child. */ + if (ppid && *ppid == -1) + setsid(); + + if (fds && fdslen) { + for (i = 0; i < fdslen; i++) + close(fds[i]); + } + if (*type == 'r') { /* * The _dup2() to STDIN_FILENO is repeated to avoid