--- embedtools/src/pceng_run.c 2011/10/24 20:32:11 1.1.2.8 +++ embedtools/src/pceng_run.c 2012/04/05 12:22:44 1.1.2.10 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ - * $Id: pceng_run.c,v 1.1.2.8 2011/10/24 20:32:11 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 -Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 by Michael Pounov . 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; } @@ -148,35 +149,38 @@ LED(u_char ledno, u_char 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 (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; } @@ -185,7 +189,7 @@ Run() { register u_char i; u_int ret, t, slice, states = 0; - char szStr[STRSIZ]; + ait_val_t v; FTRACE(3); @@ -198,9 +202,9 @@ Run() /* 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;