--- tftpd/src/tftpd.c 2014/02/24 15:23:39 1.3 +++ tftpd/src/tftpd.c 2014/02/24 22:28:54 1.4 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: tftpd.c,v 1.3 2014/02/24 15:23:39 misho Exp $ +* $Id: tftpd.c,v 1.4 2014/02/24 22:28:54 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -46,6 +46,7 @@ SUCH DAMAGE. #include "global.h" #include "srv.h" #include "buf.h" +#include "exec.h" intptr_t Kill; @@ -53,7 +54,7 @@ struct tagCli cli; cfg_root_t cfg; sched_root_task_t *root; rpack_t *bf; -char szCfgName[PATH_MAX] = DEFAULT_CFGNAME; +char RW, szCfgName[PATH_MAX] = DEFAULT_CFGNAME; struct timespec timeout = { DEFAULT_TIMEOUT, 0 }; extern char compiled[], compiledby[], compilehost[]; @@ -78,6 +79,7 @@ Usage() "\t-c \tConfig file [default=/etc/tftpd.conf]\n" "\t-w\t\tSwitch to read-write mode [default=read-only]\n" "\t-b\t\tRun into batch mode (default is daemon mode)\n" + "\t-R\t\tReboot after complete write file\n" "\t-d\t\tDebug program\n" "\t-v\t\tVerbose (more -v, more verbosity ...)\n" "\t-h\t\tThis help screen!\n" @@ -128,7 +130,7 @@ sigHandler(sched_task_t *task) int main(int argc, char **argv) { - char ch, m = 0, b = 0; + char ch, r = 0, b = 0; const char *str; int fd, uid = 0, ret = 0; struct passwd *pass; @@ -136,13 +138,13 @@ main(int argc, char **argv) sockaddr_t sa; rpack_t *pkt = NULL; - while ((ch = getopt(argc, argv, "hvdbwc:")) != -1) + while ((ch = getopt(argc, argv, "hvdRbwc:")) != -1) switch (ch) { case 'c': strlcpy(szCfgName, optarg, sizeof szCfgName); break; case 'w': - m = 42; /* rw mode */ + RW = 42; /* rw mode */ break; case 'v': e_incVerbose; @@ -153,6 +155,9 @@ main(int argc, char **argv) case 'b': b = 42; break; + case 'R': + r = 42; + break; case 'h': default: Usage(); @@ -264,6 +269,8 @@ main(int argc, char **argv) } memset(&cli, 0, sizeof cli); + if (r) + schedSuspend(root, Reboot, NULL, 0, NULL, 0); schedSignal(root, sigHandler, NULL, SIGHUP, NULL, 0); schedSignal(root, sigHandler, NULL, SIGTERM, NULL, 0); schedSignal(root, sigHandler, NULL, SIGINT, NULL, 0);