--- embedtools/src/pceng.c 2011/07/23 23:41:00 1.1.2.7 +++ embedtools/src/pceng.c 2014/02/05 15:44:06 1.3 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ - * $Id: pceng.c,v 1.1.2.7 2011/07/23 23:41:00 misho Exp $ + * $Id: pceng.c,v 1.3 2014/02/05 15:44:06 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 - 2014 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -49,7 +49,7 @@ SUCH DAMAGE. int Verbose, Kill; extern char compiled[], compiledby[], compilehost[]; -sl_config cfg; +cfg_root_t cfg; char szConf[MAXPATHLEN] = DEFAULT_PCENG_CFG; @@ -58,7 +58,7 @@ Usage() { printf( "-= PCEngines =- events managment tool\n" "=== %s === %s@%s ===\n\n" - " Syntax: pceng [options] [[led_no <0|1>] ...]\n" + " Syntax: pceng [options] [led_no[=<0|1>] ...]\n" "\n" "\t-v\t\tVerbose ...\n" "\t-D\t\tRun in background mode ...\n" @@ -73,8 +73,8 @@ sigHand(int sig) switch (sig) { case SIGHUP: - UnloadConfig(&cfg); - if (LoadConfig(szConf, &cfg)) { + cfgUnloadConfig(&cfg); + if (cfgLoadConfig(szConf, &cfg)) { syslog(LOG_ERR, "Error:: #%d - %s", cfg_GetErrno(), cfg_GetError()); raise(SIGTERM); } @@ -93,10 +93,10 @@ sigHand(int sig) int main(int argc, char **argv) { - char ch, ledno; + char ch, ledno, *pos; int i, ret = 0, mode = 1; struct sigaction sact; -#ifdef HAVE_IO +#ifdef __FreeBSD__ int io; #endif @@ -118,17 +118,13 @@ main(int argc, char **argv) } argc -= optind; argv += optind; - if (argc && argc % 2) { - printf("Error:: not enough parameters ...\n"); - return 1; - } if (!mode) openlog("pceng", LOG_CONS | LOG_PID, LOG_DAEMON); else openlog("pceng", LOG_CONS | LOG_PID | LOG_PERROR, LOG_USER); -#ifdef HAVE_IO +#ifdef __FreeBSD__ io = open(_PATH_DEVIO, O_RDONLY); if (io == -1) { printf("Error:: in open dev %s #%d - %s\n", _PATH_DEVIO, errno, strerror(errno)); @@ -137,18 +133,25 @@ main(int argc, char **argv) } #endif - if (LoadConfig(szConf, &cfg)) { + if (cfgLoadConfig(szConf, &cfg)) { printf("Error:: #%d - %s\n", cfg_GetErrno(), cfg_GetError()); ret = 1; - return 1; + goto end; } if (argc) { VERB(1) syslog(LOG_WARNING, "LED client ..."); - for (i = 0; !ret && i < argc; i += 2) { - ledno = (char) strtol(argv[i], NULL, 0); - ch = (char) strtol(argv[i + 1], NULL, 0); + for (i = 0; !ret && i < argc; pos = NULL, i++) { + if ((pos = strchr(argv[i], '='))) { + *pos++ = 0; + ledno = (char) strtol(argv[i], NULL, 0); + ch = (char) strtol(pos, NULL, 0); + } else { + ledno = (char) strtol(argv[i], NULL, 0); + ch = -1; + } ret = LED((u_char) ledno, (u_char) ch); + printf("%s:: LED#%d=%d\n", (ch == -1) ? "Get" : "Set", ledno, ret); } goto end; } @@ -187,8 +190,8 @@ main(int argc, char **argv) ret = Run(); end: - UnloadConfig(&cfg); -#ifdef HAVE_IO + cfgUnloadConfig(&cfg); +#ifdef __FreeBSD__ if (io > 2) close(io); #endif