--- libelwix/src/pio.c	2013/12/06 00:19:54	1.1.2.6
+++ libelwix/src/pio.c	2015/06/25 17:53:50	1.4
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: pio.c,v 1.1.2.6 2013/12/06 00:19:54 misho Exp $
+* $Id: pio.c,v 1.4 2015/06/25 17:53:50 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, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
+Copyright 2004 - 2015
 	by Michael Pounov <misho@elwix.org>.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -63,16 +63,23 @@ static pthread_mutex_t pidlist_mutex = PTHREAD_MUTEX_I
  * @ppid = return pid of child program
  * return: NULL error or !=NULL open program
  */
+#ifdef POPEN_STREAM
 FILE *
+#else
+int
+#endif
 e_popen(const char *command, const char *type, pid_t *ppid)
 {
 	struct tagPIOPID *cur, *p;
-	FILE *iop;
 	int pdes[2], pid, twoway, cloexec;
 	char *argv[4];
 
 	if (!command || !type)
+#ifdef POPEN_STREAM
 		return NULL;
+#else
+		return -1;
+#endif
 
 	cloexec = strchr(type, 'e') != NULL;
 	/*
@@ -82,22 +89,34 @@ e_popen(const char *command, const char *type, pid_t *
 	if (strchr(type, '+')) {
 		twoway = 1;
 		type = "r+";
-	} else  {
+	} else {
 		twoway = 0;
-		if ((*type != 'r' && *type != 'w') ||
-		    (type[1] && (type[1] != 'e' || type[2])))
-			return (NULL);
+		if ((*type != 'r' && *type != 'w') || 
+				(type[1] && (type[1] != 'e' || type[2])))
+#ifdef POPEN_STREAM
+			return NULL;
+#else
+			return -1;
+#endif
 	}
 	if (socketpair(AF_UNIX, SOCK_STREAM | (cloexec ? O_CLOEXEC : 0), 
 				0, pdes) < 0) {
 		LOGERR;
-		return (NULL);
+#ifdef POPEN_STREAM
+		return NULL;
+#else
+		return -1;
+#endif
 	}
 
 	if (!(cur = e_malloc(sizeof(struct tagPIOPID)))) {
 		close(pdes[0]);
 		close(pdes[1]);
-		return (NULL);
+#ifdef POPEN_STREAM
+		return NULL;
+#else
+		return -1;
+#endif
 	}
 
 	argv[0] = "sh";
@@ -113,7 +132,11 @@ e_popen(const char *command, const char *type, pid_t *
 		close(pdes[0]);
 		close(pdes[1]);
 		e_free(cur);
-		return (NULL);
+#ifdef POPEN_STREAM
+		return NULL;
+#else
+		return -1;
+#endif
 		/* NOTREACHED */
 	case 0:				/* Child. */
 		if (*type == 'r') {
@@ -150,7 +173,11 @@ e_popen(const char *command, const char *type, pid_t *
 				close(pdes[1]);
 		}
 		SLIST_FOREACH(p, &pio_pidlist, next)
-			close(fileno(p->fp));
+#ifdef POPEN_STREAM
+			close(fileno(p->f.fp));
+#else
+			close(p->f.fd);
+#endif
 		execve(_PATH_BSHELL, argv, environ);
 		_exit(127);
 		/* NOTREACHED */
@@ -162,21 +189,32 @@ e_popen(const char *command, const char *type, pid_t *
 
 	/* Parent; assume fdopen can't fail. */
 	if (*type == 'r') {
-		iop = fdopen(pdes[0], type);
+#ifdef POPEN_STREAM
+		cur->f.fp = fdopen(pdes[0], type);
+#else
+		cur->f.fd = pdes[0];
+#endif
 		close(pdes[1]);
 	} else {
-		iop = fdopen(pdes[1], type);
+#ifdef POPEN_STREAM
+		cur->f.fp = fdopen(pdes[1], type);
+#else
+		cur->f.fd = pdes[1];
+#endif
 		close(pdes[0]);
 	}
 
 	/* Link into list of file descriptors. */
-	cur->fp = iop;
 	cur->pid = pid;
 	THREAD_LOCK();
 	SLIST_INSERT_HEAD(&pio_pidlist, cur, next);
 	THREAD_UNLOCK();
 
-	return (iop);
+#ifdef POPEN_STREAM
+	return cur->f.fp;
+#else
+	return cur->f.fd;
+#endif
 }
 
 /*
@@ -186,7 +224,11 @@ e_popen(const char *command, const char *type, pid_t *
  * return: -1 error or !=-1 pid status
  */
 int
+#ifdef POPEN_STREAM
 e_pclose(FILE *iop)
+#else
+e_pclose(int iop)
+#endif
 {
 	struct tagPIOPID *cur, *last = NULL;
 	int pstat;
@@ -200,7 +242,11 @@ e_pclose(FILE *iop)
 	 */
 	THREAD_LOCK();
 	SLIST_FOREACH(cur, &pio_pidlist, next) {
-		if (cur->fp == iop)
+#ifdef POPEN_STREAM
+		if (cur->f.fp == iop)
+#else
+		if (cur->f.fd == iop)
+#endif
 			break;
 		last = cur;
 	}
@@ -214,7 +260,11 @@ e_pclose(FILE *iop)
 		SLIST_REMOVE_AFTER(last, next);
 	THREAD_UNLOCK();
 
+#ifdef POPEN_STREAM
 	fclose(iop);
+#else
+	close(iop);
+#endif
 
 	do {
 		pid = wait4(cur->pid, &pstat, 0, NULL);
@@ -232,7 +282,11 @@ e_pclose(FILE *iop)
  * return: NULL error or !=NULL tagPIOPID structure
  */
 struct tagPIOPID *
-pio_pgetpid(FILE * __restrict iop)
+#ifdef POPEN_STREAM
+pio_pgetpid(FILE *iop)
+#else
+pio_pgetpid(int iop)
+#endif
 {
 	struct tagPIOPID *p;
 
@@ -241,7 +295,11 @@ pio_pgetpid(FILE * __restrict iop)
 
 	THREAD_LOCK();
 	SLIST_FOREACH(p, &pio_pidlist, next)
-		if (p->fp == iop)
+#ifdef POPEN_STREAM
+		if (p->f.fp == iop)
+#else
+		if (p->f.fd == iop)
+#endif
 			break;
 	THREAD_UNLOCK();
 
@@ -260,7 +318,7 @@ pio_pchkpid(array_t ** __restrict pids)
 {
 	register int ret = 0;
 	struct tagPIOPID *p;
-	array_t *pa;
+	array_t *pa = NULL;
 
 	if (pids) {
 		if (!(pa = array_Init(0)))
@@ -271,7 +329,11 @@ pio_pchkpid(array_t ** __restrict pids)
 
 	THREAD_LOCK();
 	SLIST_FOREACH(p, &pio_pidlist, next)
-		if (p->fp && waitpid(p->pid, &p->stat, WNOHANG) > 0) {
+#ifdef POPEN_STREAM
+		if (p->f.fp && waitpid(p->pid, &p->stat, WNOHANG) > 0) {
+#else
+		if (p->f.fd && waitpid(p->pid, &p->stat, WNOHANG) > 0) {
+#endif
 			if (pids)
 				array_Push(pa, p, 0);
 			ret++;