--- tftpd/src/tftpd.c	2014/02/21 15:49:51	1.2.2.1
+++ tftpd/src/tftpd.c	2014/02/24 21:55:35	1.3.2.1
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: tftpd.c,v 1.2.2.1 2014/02/21 15:49:51 misho Exp $
+* $Id: tftpd.c,v 1.3.2.1 2014/02/24 21:55:35 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -45,13 +45,16 @@ SUCH DAMAGE.
 */
 #include "global.h"
 #include "srv.h"
+#include "buf.h"
+#include "exec.h"
 
 
 intptr_t Kill;
 struct tagCli cli;
 cfg_root_t cfg;
 sched_root_task_t *root;
-char szCfgName[PATH_MAX] = DEFAULT_CFGNAME;
+rpack_t *bf;
+char RW, szCfgName[PATH_MAX] = DEFAULT_CFGNAME;
 struct timespec timeout = { DEFAULT_TIMEOUT, 0 };
 extern char compiled[], compiledby[], compilehost[];
 
@@ -76,6 +79,7 @@ Usage()
 		"\t-c <config>\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"
@@ -100,6 +104,11 @@ sigHandler(sched_task_t *task)
 			str = cfg_getAttribute(&cfg, "tftpd", "timeout");
 			if (str)
 				timeout.tv_sec = strtol(str, NULL, 10);
+
+			endBuffer();
+			str = cfg_getAttribute(&cfg, "tftpd", "buf_io");
+			if (str)
+				initBuffer(strtol(str, NULL, 0));
 			break;
 		case SIGINT:
 		case SIGTERM:
@@ -121,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;
@@ -129,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;
@@ -146,6 +155,9 @@ main(int argc, char **argv)
 			case 'b':
 				b = 42;
 				break;
+			case 'R':
+				r = 42;
+				break;
 			case 'h':
 			default:
 				Usage();
@@ -239,6 +251,10 @@ main(int argc, char **argv)
 			chdir(str);
 	}
 
+	str = cfg_getAttribute(&cfg, "tftpd", "buf_io");
+	if (str)
+		initBuffer(strtol(str, NULL, 0));
+
 	if (!(pkt = rpack_create(NULL, 0))) {
 		ELIBERR(elwix);
 		close(fd);
@@ -253,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);
@@ -265,6 +283,7 @@ end:
 	schedEnd(&root);
 	rpack_detach(pkt);
 	rpack_destroy(&pkt);
+	endBuffer();
 	cfgUnloadConfig(&cfg);
 	closelog();
 	return ret;