--- embedtools/src/pceng_run.c	2011/07/29 12:12:40	1.1.2.5
+++ embedtools/src/pceng_run.c	2012/04/05 12:22:44	1.1.2.10
@@ -3,7 +3,7 @@
  *  by Michael Pounov <misho@aitbg.com>
  *
  * $Author: misho $
- * $Id: pceng_run.c,v 1.1.2.5 2011/07/29 12:12:40 misho Exp $
+ * $Id: pceng_run.c,v 1.1.2.10 2012/04/05 12:22:44 misho Exp $
  *
  *************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -12,7 +12,7 @@ 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
+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
@@ -57,20 +57,21 @@ static inline board_t
 getBoard()
 {
 	board_t type;
-	char szStr[STRSIZ];
+	ait_val_t v;
 
 	FTRACE(3);
 
-	cfg_LoadAttribute(&cfg, CFG("pceng"), CFG("board"), CFG(szStr), sizeof szStr, DEFAULT_BOARD);
-	if (!strcasecmp(szStr, "alix"))
+	cfg_loadAttribute(&cfg, "pceng", "board", &v, DEFAULT_BOARD);
+	if (!strcasecmp(AIT_GET_STR(&v), "alix"))
 		type = alix;
-	else if (!strcasecmp(szStr, "wrap"))
+	else if (!strcasecmp(AIT_GET_STR(&v), "wrap"))
 		type = wrap;
 	else {
 		type = unknown;
-		syslog(LOG_ERR, "Error:: unknown board type %s", szStr);
+		syslog(LOG_ERR, "Error:: unknown board type %s", AIT_GET_STR(&v));
 	}
 
+	AIT_FREE_VAL(&v);
 	return type;
 }
 
@@ -116,6 +117,7 @@ LED(u_char ledno, u_char state)
 	switch (type) {
 		case wrap:
 			n = inl(led_base[type - 1][ledno]);
+			/* read */
 			if (state == (u_char) -1)
 				return (n &= (1 << led_bit[type - 1][ledno]));
 
@@ -125,6 +127,7 @@ LED(u_char ledno, u_char state)
 				n &= ~(1 << led_bit[type - 1][ledno]);
 			break;
 		case alix:
+			/* read */
 			if (state == (u_char) -1) {
 				n = inl(led_base[type - 1][ledno]);
 				return !(n &= (1 << led_bit[type - 1][ledno]));
@@ -135,46 +138,49 @@ LED(u_char ledno, u_char state)
 			else
 				n = (1 << led_bit[type - 1][ledno]);
 			break;
-		default:
+		default:	/* unknown */
 			return -1;
 	}
 
 	outl(led_base[type - 1][ledno], n);
-	return 0;
+	return (int) state;
 }
 
 static int
 RunCmd(u_char pin, u_int state)
 {
-	char szStr[STRSIZ], szArg[STRSIZ] = { 0 };
+	char szArg[STRSIZ] = { 0 };
+	ait_val_t v;
 
 	FTRACE(3);
 
 	switch (pin) {
 		case 0:		/* button */
-			cfg_LoadAttribute(&cfg, CFG("event"), CFG("button_exec"), 
-					CFG(szStr), sizeof szStr, NULL);
+			cfg_loadAttribute(&cfg, "event", "button_exec", &v, NULL);
 			break;
 		case 1:		/* LEDs */
 		case 2:
 		case 3:
-			cfg_LoadAttribute(&cfg, CFG("event"), CFG("led_exec"), 
-					CFG(szStr), sizeof szStr, NULL);
+			cfg_loadAttribute(&cfg, "event", "led_exec", &v, NULL);
 			break;
 	}
-	if (!*szStr)
+	if (AIT_ISEMPTY(&v))
 		return 0;
+	if (pin)
+		snprintf(szArg, sizeof szArg, "%d=%d", pin, state);
 	else
 		snprintf(szArg, sizeof szArg, "%d", state);
 
-	switch (vfork()) {
+	switch (fork()) {
 		case -1:
 			syslog(LOG_ERR, "Error:: RunCmd #%d - %s\n", errno, strerror(errno));
+			AIT_FREE_VAL(&v);
 			return -1;
 		case 0:		/* execute command */
-			return execl(szStr, szStr, szArg, NULL);
+			return execl(AIT_GET_STR(&v), AIT_GET_STR(&v), szArg, NULL);
 	}
 
+	AIT_FREE_VAL(&v);
 	return 0;
 }
 
@@ -183,7 +189,7 @@ Run()
 {
 	register u_char i;
 	u_int ret, t, slice, states = 0;
-	char szStr[STRSIZ];
+	ait_val_t v;
 
 	FTRACE(3);
 
@@ -192,13 +198,13 @@ Run()
 		if ((ret = gpioRead(i)) == -1)
 			return 126;
 		else
-			states |= (1 << i);
+			states |= ret ? (1 << i) : 0;
 
 	/* state machine */
 	while (!Kill) {
-		cfg_LoadAttribute(&cfg, CFG("event"), CFG("button_slice"), 
-				CFG(szStr), sizeof szStr, DEFAULT_SLICE);
-		slice = strtol(szStr, NULL, 0);
+		cfg_loadAttribute(&cfg, "event", "button_slice", &v, DEFAULT_SLICE);
+		slice = strtol(AIT_GET_STR(&v), NULL, 0);
+		AIT_FREE_VAL(&v);
 		if (!slice)
 			slice = strtol(DEFAULT_SLICE, NULL, 0);
 		slice *= 1000;
@@ -208,7 +214,7 @@ Run()
 				return 127;
 
 			if (ret != ((states >> i) & 0x1)) {
-				if (!i) {
+				if (!i) {	/* button */
 					t = 0;
 					do {
 						t++;
@@ -216,7 +222,7 @@ Run()
 						if (gpioRead(i) != ret)
 							break;
 					} while (!Kill);
-				} else {
+				} else {	/* leds */
 					t = ret;
 					if (ret)
 						states |= (1 << i);
@@ -227,6 +233,8 @@ Run()
 				RunCmd(i, t);
 			}
 		}
+
+		usleep(slice);
 	}
 
 	return 0;