--- ansh/src/proc.c	2011/10/04 22:37:46	1.1
+++ ansh/src/proc.c	2012/07/22 22:41:33	1.4
@@ -3,22 +3,59 @@
  *  by Michael Pounov <misho@elwix.org>
  *
  * $Author: misho $
- * $Id: proc.c,v 1.1 2011/10/04 22:37:46 misho Exp $
+ * $Id: proc.c,v 1.4 2012/07/22 22:41:33 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
+	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 "anshd.h"
 #include "proc.h"
 
 
 struct tagProc *
-InitProc(int h, struct sockaddr *sa, u_short id, int len)
+InitProc(int h, io_sockaddr_t *sa, u_short id, int len)
 {
 	struct tagProc *proc;
 
 	FTRACE(5);
 
-	proc = malloc(sizeof(struct tagProc));
+	proc = io_malloc(sizeof(struct tagProc));
 	if (!proc) {
 		ERR("Not enough memory #%d - %s", errno, strerror(errno));
 		return NULL;
@@ -27,18 +64,18 @@ InitProc(int h, struct sockaddr *sa, u_short id, int l
 	proc->proc_sock = h;
 	proc->proc_id = id;
 	if (sa)
-		memcpy(&proc->proc_cli, sa, sizeof(struct sockaddr));
+		memcpy(&proc->proc_cli, sa, sizeof(io_sockaddr_t));
 
 	proc->proc_blen = len;
-	proc->proc_buf_[0] = malloc(proc->proc_blen);
+	proc->proc_buf_[0] = io_malloc(proc->proc_blen);
 	if (!proc->proc_buf_[0]) {
-		free(proc);
+		io_free(proc);
 		proc = NULL;
 	}
-	proc->proc_buf_[1] = malloc(proc->proc_blen);
+	proc->proc_buf_[1] = io_malloc(proc->proc_blen);
 	if (!proc->proc_buf_[1]) {
-		free(proc->proc_buf_[0]);
-		free(proc);
+		io_free(proc->proc_buf_[0]);
+		io_free(proc);
 		proc = NULL;
 	}
 
@@ -68,10 +105,10 @@ FreeProc(struct tagProc ** __restrict proc)
 		return;
 
 	if ((*proc)->proc_buf_[1])
-		free((*proc)->proc_buf_[1]);
+		io_free((*proc)->proc_buf_[1]);
 	if ((*proc)->proc_buf_[0])
-		free((*proc)->proc_buf_[0]);
-	free(*proc);
+		io_free((*proc)->proc_buf_[0]);
+	io_free(*proc);
 	*proc = NULL;
 }
 
@@ -84,4 +121,34 @@ DestroyProc()
 		SLIST_REMOVE_HEAD(&pH, proc_next);
 		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;
 }