libelwix/src/pio.c - diff

Return to pio.c CVS log

Up to [ELWIX - Embedded LightWeight unIX -] / libelwix / src

Diff for /libelwix/src/pio.c between versions 1.1.2.1 and 1.3.20.1

version 1.1.2.1, 2013/12/05 14:56:42	version 1.3.20.1, 2015/06/25 00:36:48
Line 1	Line 1
	/*************************************************************************
	* (C) 2013 AITNET ltd - Sofia/Bulgaria - <misho@aitnet.org>
	* by Michael Pounov <misho@elwix.org>
	*
	* $Author$
	* $Id$
	*
	**************************************************************************
	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 - 2015
	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"	#include "global.h"


extern char **environ;	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;	static pthread_mutex_t pidlist_mutex = PTHREAD_MUTEX_INITIALIZER;

#define THREAD_LOCK() if (__isthreaded) pthread_mutex_lock(&pidlist_mutex)	#define THREAD_LOCK() if (__isthreaded) pthread_mutex_lock(&pidlist_mutex)
Line 18 static pthread_mutex_t pidlist_mutex = PTHREAD_MUTEX_I	Line 63 static pthread_mutex_t pidlist_mutex = PTHREAD_MUTEX_I
* @ppid = return pid of child program	* @ppid = return pid of child program
* return: NULL error or !=NULL open program	* return: NULL error or !=NULL open program
*/	*/
	#ifdef POPEN_STREAM
FILE *	FILE *
	#else
	int
	#endif
e_popen(const char command, const char type, pid_t *ppid)	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;	int pdes[2], pid, twoway, cloexec;
char *argv[4];	char *argv[4];
struct pid *p;

	if (!command \|\| !type)
	#ifdef POPEN_STREAM
	return NULL;
	#else
	return -1;
	#endif

cloexec = strchr(type, 'e') != NULL;	cloexec = strchr(type, 'e') != NULL;
/*	/*
* Lite2 introduced two-way popen() pipes using _socketpair().	* Lite2 introduced two-way popen() pipes using _socketpair().
Line 35 e_popen(const char command, const char type, pid_t *	Line 89 e_popen(const char command, const char type, pid_t *
if (strchr(type, '+')) {	if (strchr(type, '+')) {
twoway = 1;	twoway = 1;
type = "r+";	type = "r+";
} else {	} else {
twoway = 0;	twoway = 0;
if ((type != 'r' && type != 'w') \|\|	if ((type != 'r' && type != 'w') \|\|
(type[1] && (type[1] != 'e' \|\| type[2])))	(type[1] && (type[1] != 'e' \|\| type[2])))
return (NULL);	#ifdef POPEN_STREAM
	return NULL;
	#else
	return -1;
	#endif
}	}
if ((cloexec ? pipe2(pdes, O_CLOEXEC) : pipe(pdes)) < 0)	if (socketpair(AF_UNIX, SOCK_STREAM \| (cloexec ? O_CLOEXEC : 0),
return (NULL);	0, pdes) < 0) {
	LOGERR;
	#ifdef POPEN_STREAM
	return NULL;
	#else
	return -1;
	#endif
	}

if ((cur = e_malloc(sizeof(struct pid))) == NULL) {	if (!(cur = e_malloc(sizeof(struct tagPIOPID)))) {
close(pdes[0]);	close(pdes[0]);
close(pdes[1]);	close(pdes[1]);
return (NULL);	#ifdef POPEN_STREAM
	return NULL;
	#else
	return -1;
	#endif
}	}

argv[0] = "sh";	argv[0] = "sh";
argv[1] = "-c";	argv[1] = "-c";
argv[2] = (char *)command;	argv[2] = (char *) command;
argv[3] = NULL;	argv[3] = NULL;

THREAD_LOCK();	THREAD_LOCK();
switch (pid = vfork()) {	switch (pid = vfork()) {
case -1: /* Error. */	case -1: /* Error. */
	LOGERR;
THREAD_UNLOCK();	THREAD_UNLOCK();
close(pdes[0]);	close(pdes[0]);
close(pdes[1]);	close(pdes[1]);
e_free(cur);	e_free(cur);
return (NULL);	#ifdef POPEN_STREAM
	return NULL;
	#else
	return -1;
	#endif
/* NOTREACHED */	/* NOTREACHED */
case 0: /* Child. */	case 0: /* Child. */
if (*type == 'r') {	if (*type == 'r') {
Line 99 e_popen(const char command, const char type, pid_t *	Line 173 e_popen(const char command, const char type, pid_t *
close(pdes[1]);	close(pdes[1]);
}	}
SLIST_FOREACH(p, &pio_pidlist, next)	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);	execve(_PATH_BSHELL, argv, environ);
_exit(127);	_exit(127);
/* NOTREACHED */	/* NOTREACHED */
Line 111 e_popen(const char command, const char type, pid_t *	Line 189 e_popen(const char command, const char type, pid_t *

/* Parent; assume fdopen can't fail. */	/* Parent; assume fdopen can't fail. */
if (*type == 'r') {	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]);	close(pdes[1]);
} else {	} 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]);	close(pdes[0]);
}	}

/* Link into list of file descriptors. */	/* Link into list of file descriptors. */
cur->fp = iop;
cur->pid = pid;	cur->pid = pid;
THREAD_LOCK();	THREAD_LOCK();
SLIST_INSERT_HEAD(&pio_pidlist, cur, next);	SLIST_INSERT_HEAD(&pio_pidlist, cur, next);
THREAD_UNLOCK();	THREAD_UNLOCK();

return (iop);	#ifdef POPEN_STREAM
	return cur->f.fp;
	#else
	return cur->f.fd;
	#endif
}	}

/*	/*
Line 135 e_popen(const char command, const char type, pid_t *	Line 224 e_popen(const char command, const char type, pid_t *
* return: -1 error or !=-1 pid status	* return: -1 error or !=-1 pid status
*/	*/
int	int
	#ifdef POPEN_STREAM
e_pclose(FILE *iop)	e_pclose(FILE *iop)
	#else
	e_pclose(int iop)
	#endif
{	{
struct pid cur, last = NULL;	struct tagPIOPID cur, last = NULL;
int pstat;	int pstat;
pid_t pid;	pid_t pid;

	if (!iop)
	return -1;

/*	/*
* Find the appropriate file pointer and remove it from the list.	* Find the appropriate file pointer and remove it from the list.
*/	*/
THREAD_LOCK();	THREAD_LOCK();
SLIST_FOREACH(cur, &pio_pidlist, next) {	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;	break;
last = cur;	last = cur;
}	}
if (cur == NULL) {	if (!cur) {
THREAD_UNLOCK();	THREAD_UNLOCK();
return (-1);	return (-1);
}	}
if (last == NULL)	if (!last)
SLIST_REMOVE_HEAD(&pio_pidlist, next);	SLIST_REMOVE_HEAD(&pio_pidlist, next);
else	else
SLIST_REMOVE_AFTER(last, next);	SLIST_REMOVE_AFTER(last, next);
THREAD_UNLOCK();	THREAD_UNLOCK();

	#ifdef POPEN_STREAM
fclose(iop);	fclose(iop);
	#else
	close(iop);
	#endif

do {	do {
pid = wait4(cur->pid, &pstat, 0, (struct rusage *)0);	pid = wait4(cur->pid, &pstat, 0, NULL);
} while (pid == -1 && errno == EINTR);	} while (pid == -1 && errno == EINTR);

e_free(cur);	e_free(cur);

return (pid == -1 ? -1 : pstat);	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 *
	#ifdef POPEN_STREAM
	pio_pgetpid(FILE *iop)
	#else
	pio_pgetpid(int iop)
	#endif
	{
	struct tagPIOPID *p;

	if (!iop)
	return NULL;

	THREAD_LOCK();
	SLIST_FOREACH(p, &pio_pidlist, next)
	#ifdef POPEN_STREAM
	if (p->f.fp == iop)
	#else
	if (p->f.fd == iop)
	#endif
	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 = NULL;

	if (pids) {
	if (!(pa = array_Init(0)))
	return -1;
	else
	*pids = pa;
	}

	THREAD_LOCK();
	SLIST_FOREACH(p, &pio_pidlist, next)
	#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++;
	}
	THREAD_UNLOCK();

	return ret;
}	}

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.1.2.1
changed lines
	Added in v.1.3.20.1