--- libelwix/src/pio.c	2019/12/30 18:10:17	1.5.44.1
+++ libelwix/src/pio.c	2024/10/28 09:58:51	1.10
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: pio.c,v 1.5.44.1 2019/12/30 18:10:17 misho Exp $
+* $Id: pio.c,v 1.10 2024/10/28 09:58:51 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 <info@elwix.org>
 
-Copyright 2004 - 2015
+Copyright 2004 - 2024
 	by Michael Pounov <misho@elwix.org>.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -46,6 +46,14 @@ SUCH DAMAGE.
 #include "global.h"
 
 
+#ifdef __linux__
+#define __USE_GNU
+
+#ifndef O_CLOEXEC
+#define O_CLOEXEC	02000000
+#endif
+#endif
+
 extern char **environ;
 
 pio_pid_t pio_pidlist = SLIST_HEAD_INITIALIZER(pio_pidlist);
@@ -65,6 +73,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 +83,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)
@@ -129,7 +159,7 @@ e_popen(const char *command, const char *type, pid_t *
 	argv[3] = NULL;
 
 	THREAD_LOCK();
-	switch (pid = vfork()) {
+	switch (pid = fork()) {
 	case -1:			/* Error. */
 		LOGERR;
 		THREAD_UNLOCK();
@@ -143,6 +173,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