--- libelwix/src/pio.c	2013/12/05 14:56:42	1.1.2.1
+++ libelwix/src/pio.c	2013/12/05 15:38:48	1.1.2.5
@@ -1,9 +1,54 @@
+/*************************************************************************
+* (C) 2013 AITNET ltd - Sofia/Bulgaria - <misho@aitnet.org>
+*  by Michael Pounov <misho@elwix.org>
+*
+* $Author: misho $
+* $Id: pio.c,v 1.1.2.5 2013/12/05 15:38:48 misho Exp $
+*
+**************************************************************************
+The ELWIX and AITNET software is distributed under the following
+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, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
+	by Michael Pounov <misho@elwix.org>.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+3. All advertising materials mentioning features or use of this software
+   must display the following acknowledgement:
+This product includes software developed by Michael Pounov <misho@elwix.org>
+ELWIX - Embedded LightWeight unIX and its contributors.
+4. Neither the name of AITNET nor the names of its contributors
+   may be used to endorse or promote products derived from this software
+   without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY AITNET AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
+*/
 #include "global.h"
 
 
 extern char **environ;
 
-pio_pid_t pio_pidlist = = SLIST_HEAD_INITIALIZER(pio_pidlist);
+pio_pid_t pio_pidlist = SLIST_HEAD_INITIALIZER(pio_pidlist);
 static pthread_mutex_t pidlist_mutex = PTHREAD_MUTEX_INITIALIZER;
 
 #define	THREAD_LOCK()	if (__isthreaded) pthread_mutex_lock(&pidlist_mutex)
@@ -21,12 +66,14 @@ static pthread_mutex_t pidlist_mutex = PTHREAD_MUTEX_I
 FILE *
 e_popen(const char *command, const char *type, pid_t *ppid)
 {
-	struct tagPIOPID *cur;
+	struct tagPIOPID *cur, *p;
 	FILE *iop;
 	int pdes[2], pid, twoway, cloexec;
 	char *argv[4];
-	struct pid *p;
 
+	if (!command || !type)
+		return NULL;
+
 	cloexec = strchr(type, 'e') != NULL;
 	/*
 	 * Lite2 introduced two-way popen() pipes using _socketpair().
@@ -44,7 +91,7 @@ e_popen(const char *command, const char *type, pid_t *
 	if ((cloexec ? pipe2(pdes, O_CLOEXEC) : pipe(pdes)) < 0)
 		return (NULL);
 
-	if ((cur = e_malloc(sizeof(struct pid))) == NULL) {
+	if (!(cur = e_malloc(sizeof(struct tagPIOPID)))) {
 		close(pdes[0]);
 		close(pdes[1]);
 		return (NULL);
@@ -137,10 +184,13 @@ e_popen(const char *command, const char *type, pid_t *
 int
 e_pclose(FILE *iop)
 {
-	struct pid *cur, *last = NULL;
+	struct tagPIOPID *cur, *last = NULL;
 	int pstat;
 	pid_t pid;
 
+	if (!iop)
+		return -1;
+
 	/*
 	 * Find the appropriate file pointer and remove it from the list.
 	 */
@@ -150,11 +200,11 @@ e_pclose(FILE *iop)
 			break;
 		last = cur;
 	}
-	if (cur == NULL) {
+	if (!cur) {
 		THREAD_UNLOCK();
 		return (-1);
 	}
-	if (last == NULL)
+	if (!last)
 		SLIST_REMOVE_HEAD(&pio_pidlist, next);
 	else
 		SLIST_REMOVE_AFTER(last, next);
@@ -163,10 +213,66 @@ e_pclose(FILE *iop)
 	fclose(iop);
 
 	do {
-		pid = wait4(cur->pid, &pstat, 0, (struct rusage *)0);
+		pid = wait4(cur->pid, &pstat, 0, NULL);
 	} while (pid == -1 && errno == EINTR);
 
 	e_free(cur);
 
 	return (pid == -1 ? -1 : pstat);
+}
+
+/*
+ * pio_pgetpid() - Get tagPIOPID structure from file handle
+ *
+ * @iop = popen handle
+ * return: NULL error or !=NULL tagPIOPID structure
+ */
+struct tagPIOPID *
+pio_pgetpid(FILE * __restrict iop)
+{
+	struct tagPIOPID *p;
+
+	if (!iop)
+		return NULL;
+
+	THREAD_LOCK();
+	SLIST_FOREACH(p, &pio_pidlist, next)
+		if (p->fp == iop)
+			break;
+	THREAD_UNLOCK();
+
+	return p;
+}
+
+/*
+ * pio_pchkpid() - Check exit status of child programs
+ *
+ * @pids = return tagPIOPID structures of exited programs, 
+ * 		if !=NULL must call array_Destroy()
+ * return: -1 error or >-1 exited programs
+ */
+int
+pio_pchkpid(array_t ** __restrict pids)
+{
+	register int ret = 0;
+	struct tagPIOPID *p;
+	array_t *pa;
+
+	if (pids) {
+		if (!(pa = array_Init(0)))
+			return -1;
+		else
+			*pids = pa;
+	}
+
+	THREAD_LOCK();
+	SLIST_FOREACH(p, &pio_pidlist, next)
+		if (p->fp && waitpid(p->pid, &p->stat, WNOHANG) > 0) {
+			if (pids)
+				array_Push(pa, p, 0);
+			ret++;
+		}
+	THREAD_UNLOCK();
+
+	return ret;
 }