Merge pull request #3164 from atanas-vladimirov/master

upsset.c: Recognize RANGE NUMBER and NUMBER types.

Author: jimklimov

NEWS.adoc

@@ -191,6 +191,8 @@ NOTE: If using `upssched` and monitoring multiple UPSes, consider setting up
 a `START-TIMER-SHARED` rule with a short (approx. 1 second) timeout to group
 several `FSD` notifications into one executed action. [PR #3097]
 
+ - `upsset` should now recognize `RANGE NUMBER` and `NUMBER` types. [#3164]
+
  - `upssched` tool updates:
    * Previously in PR #2896 (NUT releases v2.8.3 and v2.8.4) the `UPSNAME` and
      `NOTIFYTYPE` environment variables were neutered for the timer daemon,

clients/upsset.c

@@ -770,6 +770,19 @@ static void do_type(const char *varname)
 			return;
 		}
 
+		if (!strcasecmp(answer[i], "NUMBER")) {
+			/* 20 is a reasonable default size for the text box */
+			do_string(varname, 20);
+			return;
+		}
+
+		/* RANGE is usually paired with NUMBER.
+		   We can ignore 'RANGE' and let the 'NUMBER'
+		   case (which should come next) handle it. */
+		if (!strcasecmp(answer[i], "RANGE")) {
+			continue;
+		}
+
 		/* ignore this one */
 		if (!strcasecmp(answer[i], "RW"))
 			continue;