--- tftpd/src/exec.c 2014/02/17 10:12:26 1.1.2.4 +++ tftpd/src/exec.c 2014/02/24 22:02:19 1.4.2.2 @@ -1,3 +1,48 @@ +/************************************************************************* +* (C) 2014 AITNET ltd - Sofia/Bulgaria - +* by Michael Pounov +* +* $Author: misho $ +* $Id: exec.c,v 1.4.2.2 2014/02/24 22:02:19 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 + +Copyright 2004 - 2014 + by Michael Pounov . 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 +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 "exec.h" @@ -6,7 +51,7 @@ void * execProg(sched_task_t *task) { pid_t pid, res; - const char *str; + const char *str, *addr; char port[STRSIZ] = { [0 ... STRSIZ - 1] = 0 }, opc[STRSIZ] = { [0 ... STRSIZ - 1] = 0 }; ait_val_t v = AIT_VAL_INITIALIZER(v); @@ -25,18 +70,31 @@ execProg(sched_task_t *task) case 0: snprintf(opc, STRSIZ, "%hu", (u_short) TASK_DATLEN(task)); snprintf(port, STRSIZ, "%hu", (u_short) e_n2port(&cli.addr)); - execl(_PATH_BSHELL, _PATH_BSHELL, "-c", str, TASK_ARG(task), opc, - cli.file, cli.mode, e_n2addr(&cli.addr, &v), port, NULL); + addr = e_n2addr(&cli.addr, &v); + EVERBOSE(1, "Execute %s %s %s %s %s %s %s", str, (char*) TASK_ARG(task), + opc, cli.file, cli.mode, addr, port); + execl(_PATH_BSHELL, _PATH_BSHELL, str, TASK_ARG(task), opc, + cli.file, cli.mode, addr, port, NULL); AIT_FREE_VAL(&v); _exit(127); break; default: - EVERBOSE(1, "Execute %s", str); + EVERBOSE(2, "Wait to finish executed program %s", str); do { res = waitpid(pid, &stat, 0); } while (res == -1 && errno == EINTR); break; } + + taskExit(task, NULL); +} + +void * +Reboot(sched_task_t *task) +{ + ETRACE(); + + reboot(RB_NOSYNC); taskExit(task, NULL); }