--- libelwix/inc/elwix/apio.h 2013/12/05 15:13:57 1.1.2.4 +++ libelwix/inc/elwix/apio.h 2013/12/15 22:54:41 1.2 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: apio.h,v 1.1.2.4 2013/12/05 15:13:57 misho Exp $ +* $Id: apio.h,v 1.2 2013/12/15 22:54:41 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -48,7 +48,10 @@ SUCH DAMAGE. struct tagPIOPID { - FILE *fp; + union { + FILE *fp; + int fd; + } f; pid_t pid; int stat; @@ -68,14 +71,22 @@ extern pio_pid_t pio_pidlist; * @ppid = return pid of child program * return: NULL error or !=NULL open program */ +#ifdef POPEN_STREAM FILE *e_popen(const char *command, const char *type, pid_t *ppid); +#else +int e_popen(const char *command, const char *type, pid_t *ppid); +#endif /* * e_pclose() - ELWIX replacement of standard pclose * * @iop = popen handle * return: -1 error or !=-1 pid status */ +#ifdef POPEN_STREAM int e_pclose(FILE *iop); +#else +int e_pclose(int iop); +#endif /* * pio_pgetpid() - Get tagPIOPID structure from file handle @@ -83,7 +94,19 @@ int e_pclose(FILE *iop); * @iop = popen handle * return: NULL error or !=NULL tagPIOPID structure */ -struct tagPIOPID *pio_pgetpid(FILE * __restrict iop); +#ifdef POPEN_STREAM +struct tagPIOPID *pio_pgetpid(FILE *iop); +#else +struct tagPIOPID *pio_pgetpid(int iop); +#endif +/* + * 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); #endif