Merge 6ecb7fe into 373241b

jimklimov · web-flow · commit ad58b274d3d5 · 2025-02-11T04:04:16.000Z
diff --git a/NEWS.adoc b/NEWS.adoc
@@ -479,8 +479,8 @@ relocated into new `shutdown.default` INSTCMD definitions. [#2670]
    * custom `distcheck-something` targets did not inherit `DISTCHECK_FLAGS`
      properly. [#2541]
    * added `status_get()` in NUT driver state API, to check if a status
-     token string had been set recently, and to avoid duplicate settings.
-     [PR #2565]
+     token string had been set recently, and to avoid duplicate settings;
+     fixed `status_set()` for multi-token arguments. [PR #2565, issue #2708]
    * local socket/pipe protocol introduced a `LOGOUT` command for cleaner
      disconnection handling. [#2572]
    * codebase adapted to the liking of `clang-18` and newer revisions of
diff --git a/docs/new-drivers.txt b/docs/new-drivers.txt
@@ -247,6 +247,10 @@ Possible values for status_set:
 	BOOST   -- UPS is boosting incoming voltage
 	FSD     -- Forced Shutdown (restricted use, see the note below)
 
+Internally, an `ALARM` value would be added (typically as first in the list)
+if the `ups.alarm` is currently not empty. For more details, see below in
+`alarm_set()` description.
+
 Anything else will not be recognized by the usual clients expecting a
 particular NUT standard release.  New tokens may appear over time, but
 driver developers should coordinate with the nut-upsdev list before creating
diff --git a/drivers/bestfortress.c b/drivers/bestfortress.c
@@ -35,7 +35,7 @@
 #endif
 
 #define DRIVER_NAME     "Best Fortress UPS driver"
-#define DRIVER_VERSION  "0.10"
+#define DRIVER_VERSION  "0.11"
 
 /* driver description structure */
 upsdrv_info_t   upsdrv_info = {
@@ -401,13 +401,13 @@ void upsdrv_updateinfo(void)
 
 	status_init();
 	if (low_batt)
-		status_set("LB ");
+		status_set("LB");
 	else if (trimming)
 		status_set("TRIM");
 	else if (boosting)
 		status_set("BOOST");
 	else
-		status_set(is_online ? (is_off ? "OFF " : "OL ") : "OB ");
+		status_set(is_online ? (is_off ? "OFF" : "OL") : "OB");
 
 	/* setinfo(INFO_STATUS, "%s%s",
 	 *	(util < lownorm) ? "BOOST ", "",
diff --git a/drivers/dstate.c b/drivers/dstate.c
@@ -1648,7 +1648,11 @@ int status_get(const char *buf)
 	if (!s)
 		return 0;
 
-	offset = status_buf - s;
+	offset = s - status_buf;
+#if 0
+	upsdebugx(3, "%s: '%s' in '%s': offset=%" PRIuSIZE" buflen=%" PRIuSIZE" s[buflen]='0x%2X'\n",
+		__func__, buf, status_buf, offset, buflen, s[buflen]);
+#endif
 	if (offset == 0 || status_buf[offset - 1] == ' ') {
 		/* We have hit the start of token */
 		if (s[buflen] == '\0' || s[buflen] == ' ') {
@@ -1664,6 +1668,39 @@ int status_get(const char *buf)
 /* add a status element */
 void status_set(const char *buf)
 {
+#if 0
+	upsdebugx(3, "%s: '%s'\n", __func__, buf);
+#endif
+	if (strstr(buf, " ")) {
+		/* Recurse adding each sub-status one by one (avoid duplicates)
+		 * We frown upon adding "A FEW TOKENS" at once, but in e.g.
+		 * snmp-ups subdrivers with a mapping table this is not easily
+		 * avoidable...
+		 */
+		char	*tmp = xstrdup(buf), *p = tmp, *s = tmp;
+		while (*p) {
+			if (*p == ' ') {
+				*p = '\0';
+				if (s != p) {
+					/* Only recurse to set non-trivial tokens */
+					status_set(s);
+				}
+				p++;
+				s = p;	/* Start of new word... or a consecutive space to ignore on next cycle */
+			} else {
+				p++;
+			}
+		}
+
+		if (s != p) {
+			/* Last valid token did end with (*p=='\0') */
+			status_set(s);
+		}
+
+		free(tmp);
+		return;
+	}
+
 	if (ignorelb && !strcasecmp(buf, "LB")) {
 		upsdebugx(2, "%s: ignoring LB flag from device", __func__);
 		return;
diff --git a/drivers/liebert-gxe.c b/drivers/liebert-gxe.c
@@ -24,7 +24,7 @@
 #include "ydn23.h"
 
 #define DRIVER_NAME	"Liebert GXE Series UPS driver"
-#define DRIVER_VERSION	"0.02"
+#define DRIVER_VERSION	"0.03"
 
 #define PROBE_RETRIES	3
 #define DEFAULT_STALE_RETRIES	3
@@ -173,9 +173,10 @@ static void upsdrv_updateinfo_onoff(void)
 		status_set("OB");
 	else if (pwrval == 0x01)
 		status_set("OL");
-	else if (pwrval == 0x02)
-		status_set("OL BYPASS");
-	else
+	else if (pwrval == 0x02) {
+		status_set("OL");
+		status_set("BYPASS");
+	} else
 		upslogx(LOG_WARNING, "unknown ups state: %x %x",
 			(unsigned int)pwrval,
 			(unsigned int)rectval);
diff --git a/tests/generic_gpio_utest.c b/tests/generic_gpio_utest.c
@@ -143,6 +143,7 @@ int main(int argc, char **argv) {
 	char testDescFileNameBuf[LARGEBUF];
 	char *testDescFileName = "generic_gpio_test.txt";
 	unsigned int i;
+	const char	*valueStr = NULL;
 
 	test_with_exit=0;
 
@@ -384,6 +385,26 @@ int main(int argc, char **argv) {
 		}
 	}
 
+	/* FIXME: Standalone test with driver-program dependencies? */
+	status_init();
+	nut_debug_level = 6;
+	status_set(" OL ");
+	status_set("OL BOOST");
+	status_set("OB ");
+	status_set(" BOOST");
+	status_commit();
+	valueStr = dstate_getinfo("ups.status");
+	nut_debug_level = 0;
+	if (!strcmp(valueStr, "OL BOOST OB")) {
+		printf("pass");
+		cases_passed++;
+	} else {
+		printf("fail");
+		cases_failed++;
+	}
+	i++;
+	printf(" test for ups.status: '%s'; any duplicates?\n", NUT_STRARG(valueStr));
+
 	printf("test_rules completed. Total cases %d, passed %d, failed %d\n",
 		cases_passed+cases_failed, cases_passed, cases_failed);
 	fclose(testData);
