[Apcupsd-commits] apcupsd/src/lib apcconfig.c, 1.32, 1.33 apcexec.c, 1.21, 1.22 apcstatus.c, 1.39, 1.40

[Adam K. <ad...@us...>]

Update of /cvsroot/apcupsd/apcupsd/src/lib
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv4067/src/lib

Modified Files:
	apcconfig.c apcexec.c apcstatus.c 
Log Message:
Merge Branch-3_14:2008-06-31 thru Branch-3_14:2009-05-25
Changes from releases 3.14.5 and 3.14.6.


Index: apcconfig.c
===================================================================
RCS file: /cvsroot/apcupsd/apcupsd/src/lib/apcconfig.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- apcconfig.c	26 May 2008 23:07:32 -0000	1.32
+++ apcconfig.c	25 May 2009 22:18:09 -0000	1.33
@@ -164,9 +164,7 @@
    {"NISPORT",   match_int,   WHERE(statusport), 0},
 
    /* Configuration parameters for event logging */
-   {"EVENTFILE",     match_str, WHERE(eventfile),    SIZE(eventfile)},
    {"EVENTSFILE",    match_str, WHERE(eventfile),    SIZE(eventfile)},
-   {"EVENTFILEMAX",  match_int, WHERE(eventfilemax), 0},
    {"EVENTSFILEMAX", match_int, WHERE(eventfilemax), 0},
 
    /* Configuration parameters to control system logging */
@@ -567,9 +565,6 @@
  */
 void init_ups_struct(UPSINFO *ups)
 {
-   /* put some basic information for sanity checks */
-   astrncpy(ups->release, APCUPSD_RELEASE, sizeof(ups->release));
-
    ups->fd = -1;
 
    ups->set_plugged();

Index: apcstatus.c
===================================================================
RCS file: /cvsroot/apcupsd/apcupsd/src/lib/apcstatus.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- apcstatus.c	26 Jan 2008 19:58:20 -0000	1.39
+++ apcstatus.c	25 May 2009 22:18:09 -0000	1.40
@@ -64,7 +64,6 @@
 
    gethostname(buf, sizeof buf);
    s_write(ups, "HOSTNAME : %s\n", buf);
-   s_write(ups, "RELEASE  : %s\n", ups->release);
    s_write(ups, "VERSION  : " APCUPSD_RELEASE " (" ADATE ") " APCUPSD_HOST "\n");
 
    if (*ups->upsname)

Index: apcexec.c
===================================================================
RCS file: /cvsroot/apcupsd/apcupsd/src/lib/apcexec.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- apcexec.c	17 Oct 2007 23:08:41 -0000	1.21
+++ apcexec.c	25 May 2009 22:18:09 -0000	1.22
@@ -167,6 +167,20 @@
    asnprintf(powered, sizeof(powered), "%d", (int)ups->is_plugged());
    asnprintf(apccontrol, sizeof(apccontrol), "%s%s", ups->scriptdir, APCCONTROL_FILE);
 
+#ifdef HAVE_QNX_OS
+   /* fork() is supported only in single-threaded applications */
+   argv[0] = apccontrol;        /* Shell script to execute. */
+   argv[1] = cmd.command;       /* Parameter to script. */
+   argv[2] = ups->upsname;      /* UPS name */
+   argv[3] = connected;
+   argv[4] = powered;
+   argv[5] = NULL;
+   if (spawnv(P_NOWAIT, apccontrol, (char * const *)argv) == -1) {
+      log_event(ups, LOG_WARNING, _("execute: cannot spawn(). ERR=%s"),
+         strerror(errno));
+      return FAILURE;
+   }
+#else
    /* fork() and exec() */
    switch (cmd.pid = fork()) {
    case -1:     /* error */
@@ -219,6 +233,7 @@
 
       break;
    }
+#endif /* HAVE_QNX_OS */
 
    return SUCCESS;
 }