--- embedtools/src/pceng.c 2011/07/22 15:10:53 1.1.2.6 +++ embedtools/src/pceng.c 2011/07/25 09:13:34 1.1.2.8 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ - * $Id: pceng.c,v 1.1.2.6 2011/07/22 15:10:53 misho Exp $ + * $Id: pceng.c,v 1.1.2.8 2011/07/25 09:13:34 misho Exp $ * ************************************************************************* The ELWIX and AITNET software is distributed under the following @@ -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" @@ -93,9 +93,12 @@ sigHand(int sig) int main(int argc, char **argv) { - char ch, ledno; - int i, io, ret = 0, mode = 1; + char ch, ledno, *pos; + int i, ret = 0, mode = 1; struct sigaction sact; +#ifdef HAVE_IO + int io; +#endif while ((ch = getopt(argc, argv, "vhDc:")) != -1) switch (ch) { @@ -115,39 +118,43 @@ 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); - io = open(_PATH_DEVIO, O_RDWR); +#ifdef HAVE_IO + io = open(_PATH_DEVIO, O_RDONLY); if (io == -1) { printf("Error:: in open dev %s #%d - %s\n", _PATH_DEVIO, errno, strerror(errno)); ret = 2; goto end; } +#endif + if (LoadConfig(szConf, &cfg)) { + printf("Error:: #%d - %s\n", cfg_GetErrno(), cfg_GetError()); + ret = 1; + return 1; + } + 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); - ret = LED(io, (u_char) ledno, (u_char) ch); + 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); } goto end; } - if (LoadConfig(szConf, &cfg)) { - printf("Error:: #%d - %s\n", cfg_GetErrno(), cfg_GetError()); - ret = 1; - goto end; - } - sact.sa_handler = sigHand; sigemptyset(&sact.sa_mask); sigaction(SIGHUP, &sact, NULL); @@ -179,12 +186,14 @@ main(int argc, char **argv) goto end; } - ret = Run(io); + ret = Run(); end: UnloadConfig(&cfg); +#ifdef HAVE_IO if (io > 2) close(io); +#endif closelog(); return ret; }