ansh/src/proc.c - diff

Return to proc.c CVS log

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

Diff for /ansh/src/proc.c between versions 1.1 and 1.5

version 1.1, 2011/10/04 22:37:46	version 1.5, 2015/05/19 23:25:30
Line 5	Line 5
* $Author$	* $Author$
* $Id$	* $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, 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"	#include "global.h"
#include "anshd.h"	#include "anshd.h"
#include "proc.h"	#include "proc.h"


struct tagProc *	struct tagProc *
InitProc(int h, struct sockaddr *sa, u_short id, int len)	InitProc(int h, sockaddr_t *sa, u_short id, int len)
{	{
struct tagProc *proc;	struct tagProc *proc;

FTRACE(5);	FTRACE(5);

proc = malloc(sizeof(struct tagProc));	proc = e_malloc(sizeof(struct tagProc));
if (!proc) {	if (!proc) {
ERR("Not enough memory #%d - %s", errno, strerror(errno));	ERR("Not enough memory #%d - %s", errno, strerror(errno));
return NULL;	return NULL;
Line 27 InitProc(int h, struct sockaddr *sa, u_short id, int l	Line 64 InitProc(int h, struct sockaddr *sa, u_short id, int l
proc->proc_sock = h;	proc->proc_sock = h;
proc->proc_id = id;	proc->proc_id = id;
if (sa)	if (sa)
memcpy(&proc->proc_cli, sa, sizeof(struct sockaddr));	memcpy(&proc->proc_cli, sa, sizeof(sockaddr_t));

proc->proc_blen = len;	proc->proc_blen = len;
proc->proc_buf_[0] = malloc(proc->proc_blen);	proc->proc_buf_[0] = e_malloc(proc->proc_blen);
if (!proc->proc_buf_[0]) {	if (!proc->proc_buf_[0]) {
free(proc);	e_free(proc);
proc = NULL;	proc = NULL;
}	}
proc->proc_buf_[1] = malloc(proc->proc_blen);	proc->proc_buf_[1] = e_malloc(proc->proc_blen);
if (!proc->proc_buf_[1]) {	if (!proc->proc_buf_[1]) {
free(proc->proc_buf_[0]);	e_free(proc->proc_buf_[0]);
free(proc);	e_free(proc);
proc = NULL;	proc = NULL;
}	}

Line 68 FreeProc(struct tagProc ** __restrict proc)	Line 105 FreeProc(struct tagProc ** __restrict proc)
return;	return;

if ((*proc)->proc_buf_[1])	if ((*proc)->proc_buf_[1])
free((*proc)->proc_buf_[1]);	e_free((*proc)->proc_buf_[1]);
if ((*proc)->proc_buf_[0])	if ((*proc)->proc_buf_[0])
free((*proc)->proc_buf_[0]);	e_free((*proc)->proc_buf_[0]);
free(*proc);	e_free(*proc);
*proc = NULL;	*proc = NULL;
}	}

Line 84 DestroyProc()	Line 121 DestroyProc()
SLIST_REMOVE_HEAD(&pH, proc_next);	SLIST_REMOVE_HEAD(&pH, proc_next);
FreeProc(&proc);	FreeProc(&proc);
}	}
	}


	int
	stopProcess(sched_root_task_t * __restrict root, proc_head_t * __restrict h, pid_t pid, sched_task_func_t func)
	{
	struct tagProc *p;

	FTRACE(3);

	SLIST_FOREACH(p, h, proc_next)
	if (p->proc_pid == pid) {
	break;
	}
	VERB(3) LOG("pid=%d found=%p\n", pid, p);
	if (!p)
	return 1;

	ioFreePTY(p->proc_pty, p->proc_ttyname);
	if (p->proc_pty)
	schedCancelby(root, taskMAX, CRITERIA_FD, (void*) ((intptr_t) p->proc_pty), NULL);

	p->proc_pty = 0;
	p->proc_pid = 0;
	p->proc_seq = 0;
	p->proc_flg = ANSH_FLG_EOF;
	p->proc_rlen_[FD2NET] = 0;

	schedCallOnce(root, func, p, p->proc_sock, NULL, 0);
	return 0;
}	}

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

Removed from v.1.1
changed lines
	Added in v.1.5