--- embedtools/src/butz.c	2014/02/08 16:37:56	1.1.2.3
+++ embedtools/src/butz.c	2014/02/10 16:36:52	1.2.2.1
@@ -3,7 +3,7 @@
 
 cfg_root_t cfg;
 sched_root_task_t *root;
-int Kill, gpio, maxpins, defact, resbut, led = -1;
+int Kill, gpio, flg, maxpins, defact, resbut, led = -1;
 extern char compiled[], compiledby[], compilehost[];
 char szCfgName[PATH_MAX] = BUTZ_CFG;
 char szDevName[PATH_MAX] = _PATH_DEVGPIOC"0";
@@ -76,6 +76,8 @@ sigHandler(sched_task_t *task)
 			EERROR(EINVAL, "Undefined signal %lu!", TASK_VAL(task));
 			break;
 	}
+
+	schedSignalSelf(task);
 	taskExit(task, NULL);
 }
 
@@ -97,6 +99,7 @@ execReset(sched_task_t *task)
 		_exit(127);
 	}
 
+	flg ^= flg;
 	taskExit(task, NULL);
 }
 
@@ -118,6 +121,7 @@ execDefault(sched_task_t *task)
 		_exit(127);
 	}
 
+	flg ^= flg;
 	taskExit(task, NULL);
 }
 
@@ -126,14 +130,7 @@ butReset(sched_task_t *task)
 {
 	struct timespec ts = { 1, 0 };
 	struct gpio_req req;
-	static int flg = 0;
 
-	/* toggle led pin */
-	if (led != -1) {
-		req.gp_pin = led;
-		if (ioctl(gpio, GPIOTOGGLE, &req) == -1)
-			ESYSERR(0);
-	}
 	/* check reset button */
 	req.gp_pin = resbut;
 	if (ioctl(gpio, GPIOGET, &req) == -1) {
@@ -141,16 +138,24 @@ butReset(sched_task_t *task)
 		goto end;
 	}
 	/* switch on */
-	if (!req.gp_value)
+	if (flg != -1 && !req.gp_value)
 		if (++flg == 1)
 			schedSuspend(TASK_ROOT(task), execReset, NULL, flg, NULL, 0);
 	if (defact && flg >= defact) {
 		schedCancelby(TASK_ROOT(task), taskSUSPEND, CRITERIA_CALL, execReset, NULL);
 		schedEvent(TASK_ROOT(task), execDefault, NULL, flg, NULL, 0);
+		flg = -1;
 		goto end;
 	}
-	if (flg && req.gp_value)
+	if (flg > 0 && req.gp_value)
 		schedResumeby(TASK_ROOT(task), CRITERIA_ID, (void*) 1);
+
+	/* toggle led pin */
+	if (flg != -1 && led != -1) {
+		req.gp_pin = led;
+		if (ioctl(gpio, GPIOTOGGLE, &req) == -1)
+			ESYSERR(0);
+	}
 end:
 	schedTimer(TASK_ROOT(task), TASK_FUNC(task), TASK_ARG(task), 
 			ts, TASK_DATA(task), TASK_DATLEN(task));
@@ -162,7 +167,7 @@ int
 main(int argc, char **argv)
 {
 	char ch;
-	int gpio;
+	pid_t pid;
 	struct timespec ts = { 1, 0 };
 
 	while ((ch = getopt(argc, argv, "hc:d:")) != -1)
@@ -181,16 +186,34 @@ main(int argc, char **argv)
 	argc -= optind;
 	argv += optind;
 
+	switch ((pid = fork())) {
+		case -1:
+			printf("Error:: failed fork() #%d - %s\n", errno, strerror(errno));
+			return 1;
+		case 0:
+			setsid();
+			chdir("/");
+
+			gpio = open(_PATH_DEVNULL, O_RDWR);
+			if (gpio > 2) {
+				dup2(gpio, STDIN_FILENO);
+				dup2(gpio, STDOUT_FILENO);
+				dup2(gpio, STDERR_FILENO);
+				close(gpio);
+			}
+			break;
+		default:
+			return 0;
+	}
+
 	openlog("butz", LOG_PID | LOG_CONS, LOG_DAEMON);
 	gpio = open(szDevName, O_RDONLY);
 	if (gpio == -1) {
-		printf("Error:: Can't open /dev/gpioc #%d - %s\n", 
-				errno, strerror(errno));
+		ESYSERR(0);
 		return 1;
 	}
 	if (ioctl(gpio, GPIOMAXPIN, &maxpins) == -1) {
-		printf("Error:: Can't get max gpio pins #%d - %s\n", 
-				errno, strerror(errno));
+		ESYSERR(0);
 		return 1;
 	}
 
@@ -212,7 +235,7 @@ main(int argc, char **argv)
 
 	schedSignal(root, sigHandler, NULL, SIGHUP, NULL, 0);
 	schedSignal(root, sigHandler, NULL, SIGTERM, NULL, 0);
-	schedTimer(root, butReset, (void*) gpio, ts, NULL, 0);
+	schedTimer(root, butReset, NULL, ts, NULL, 0);
 
 	schedRun(root, &Kill);
 	schedEnd(&root);