Refactor nut_report_config_flags() from many programs into common.c [n…

…etworkupstools#1826, networkupstools#1709]
jimklimov · Jan 21, 2023 · 4d64fa0 · 4d64fa0
1 parent 630f0d1
commit 4d64fa0
Show file tree

Hide file tree

Showing 10 changed files with 28 additions and 35 deletions.
diff --git a/clients/upsc.c b/clients/upsc.c
@@ -57,8 +57,7 @@ static void usage(const char *prog)
 	printf("  -c         - lists each client connected on <ups>, one per line.\n");
 	printf("  <ups>      - upsd server, <upsname>[@<hostname>[:<port>]] form\n");
 
-	upsdebugx(1, "Network UPS Tools version %s configured with flags: %s",
-		UPS_VERSION, CONFIG_FLAGS);
+	nut_report_config_flags();
 }
 
 static void printvar(const char *var)
@@ -235,8 +234,7 @@ int main(int argc, char **argv)
 			break;
 
 		case 'V':
-			upsdebugx(1, "Network UPS Tools version %s configured with flags: %s",
-				UPS_VERSION, CONFIG_FLAGS);
+			nut_report_config_flags();
 
 			fatalx(EXIT_SUCCESS, "Network UPS Tools upscmd %s", UPS_VERSION);
 #ifndef HAVE___ATTRIBUTE__NORETURN

diff --git a/clients/upscmd.c b/clients/upscmd.c
@@ -65,8 +65,7 @@ static void usage(const char *prog)
 	printf("  <command>	Valid instant command - test.panel.start, etc.\n");
 	printf("  [<value>]	Additional data for command - number of seconds, etc.\n");
 
-	upsdebugx(1, "Network UPS Tools version %s configured with flags: %s",
-		UPS_VERSION, CONFIG_FLAGS);
+	nut_report_config_flags();
 }
 
 static void print_cmd(char *cmdname)
@@ -312,8 +311,7 @@ int main(int argc, char **argv)
 			break;
 
 		case 'V':
-			upsdebugx(1, "Network UPS Tools version %s configured with flags: %s",
-				UPS_VERSION, CONFIG_FLAGS);
+			nut_report_config_flags();
 
 			fatalx(EXIT_SUCCESS, "Network UPS Tools upscmd %s", UPS_VERSION);
 #ifndef HAVE___ATTRIBUTE__NORETURN

diff --git a/clients/upslog.c b/clients/upslog.c
@@ -176,8 +176,7 @@ static void help(const char *prog)
 	printf("\n");
 	printf("See the upslog(8) man page for more information.\n");
 
-	upsdebugx(1, "Network UPS Tools version %s configured with flags: %s",
-		UPS_VERSION, CONFIG_FLAGS);
+	nut_report_config_flags();
 
 	exit(EXIT_SUCCESS);
 }
@@ -504,8 +503,7 @@ int main(int argc, char **argv)
 				break;
 
 			case 'V':
-				upsdebugx(1, "Network UPS Tools version %s configured with flags: %s",
-					UPS_VERSION, CONFIG_FLAGS);
+				nut_report_config_flags();
 				exit(EXIT_SUCCESS);
 
 			case 'p':

diff --git a/clients/upsmon.c b/clients/upsmon.c
@@ -2182,8 +2182,7 @@ static void help(const char *arg_progname)
 	printf("  -4		IPv4 only\n");
 	printf("  -6		IPv6 only\n");
 
-	upsdebugx(1, "Network UPS Tools version %s configured with flags: %s",
-		UPS_VERSION, CONFIG_FLAGS);
+	nut_report_config_flags();
 
 	exit(EXIT_SUCCESS);
 }
@@ -2500,9 +2499,8 @@ int main(int argc, char *argv[])
 				run_as_user = xstrdup(optarg);
 				break;
 			case 'V':
-				/* just show the banner */
-				upsdebugx(1, "Network UPS Tools version %s configured with flags: %s",
-					UPS_VERSION, CONFIG_FLAGS);
+				/* just show the optional CONFIG_FLAGS banner */
+				nut_report_config_flags();
 				exit(EXIT_SUCCESS);
 			case '4':
 				opt_af = AF_INET;

diff --git a/clients/upsrw.c b/clients/upsrw.c
@@ -66,8 +66,7 @@ static void usage(const char *prog)
 	printf("\n");
 	printf("Call without -s to show all possible read/write variables (same as -l).\n");
 
-	upsdebugx(1, "Network UPS Tools version %s configured with flags: %s",
-		UPS_VERSION, CONFIG_FLAGS);
+	nut_report_config_flags();
 }
 
 static void clean_exit(void)
@@ -669,8 +668,7 @@ int main(int argc, char **argv)
 			break;
 		case 'V':
 			printf("Network UPS Tools %s %s\n", prog, UPS_VERSION);
-			upsdebugx(1, "Network UPS Tools version %s configured with flags: %s",
-				UPS_VERSION, CONFIG_FLAGS);
+			nut_report_config_flags();
 			exit(EXIT_SUCCESS);
 		case 'h':
 		default:

diff --git a/common/common.c b/common/common.c
@@ -937,6 +937,12 @@ int upsnotify(upsnotify_state_t state, const char *fmt, ...)
 	return ret;
 }
 
+void nut_report_config_flags(void)
+{
+	upsdebugx(1, "Network UPS Tools version %s configured with flags: %s",
+		UPS_VERSION, CONFIG_FLAGS);
+}
+
 static void vupslog(int priority, const char *fmt, va_list va, int use_strerror)
 {
 	int	ret;

diff --git a/drivers/main.c b/drivers/main.c
@@ -134,8 +134,7 @@ static void help_msg(void)
 {
 	vartab_t	*tmp;
 
-	upsdebugx(1, "Network UPS Tools version %s configured with flags: %s",
-		UPS_VERSION, CONFIG_FLAGS);
+	nut_report_config_flags();
 
 	printf("\nusage: %s (-a <id>|-s <id>) [OPTIONS]\n", progname);
 
@@ -831,8 +830,7 @@ int main(int argc, char **argv)
 				break;
 			case 'V':
 				/* already printed the banner for program name */
-				upsdebugx(1, "Network UPS Tools version %s configured with flags: %s",
-					UPS_VERSION, CONFIG_FLAGS);
+				nut_report_config_flags();
 				exit(EXIT_SUCCESS);
 			case 'x':
 				splitxarg(optarg);

diff --git a/include/common.h b/include/common.h
@@ -312,6 +312,11 @@ void fatal_with_errno(int status, const char *fmt, ...)
 void fatalx(int status, const char *fmt, ...)
 	__attribute__ ((__format__ (__printf__, 2, 3))) __attribute__((noreturn));
 
+/* Report CONFIG_FLAGS used for this build of NUT similarly to how
+ * upsdebugx(1, ...) would do it, but not limiting the string length
+ */
+void nut_report_config_flags(void);
+
 extern int nut_debug_level;
 extern int nut_log_level;
 

diff --git a/server/upsd.c b/server/upsd.c
@@ -1507,8 +1507,7 @@ static void help(const char *arg_progname)
 	printf("  -4		IPv4 only\n");
 	printf("  -6		IPv6 only\n");
 
-	upsdebugx(1, "Network UPS Tools version %s configured with flags: %s",
-		UPS_VERSION, CONFIG_FLAGS);
+	nut_report_config_flags();
 
 	exit(EXIT_SUCCESS);
 }
@@ -1636,8 +1635,7 @@ int main(int argc, char **argv)
 
 			case 'V':
 				/* Note - we already printed the banner for program name */
-				upsdebugx(1, "Network UPS Tools version %s configured with flags: %s",
-					UPS_VERSION, CONFIG_FLAGS);
+				nut_report_config_flags();
 
 				exit(EXIT_SUCCESS);
 

diff --git a/tools/nut-scanner/nut-scanner.c b/tools/nut-scanner/nut-scanner.c
@@ -178,8 +178,7 @@ static void show_usage()
 /* NOTE: This code uses `nutscan_avail_*` global vars from nutscan-init.c */
 	puts("nut-scanner : utility for detection of available power devices.\n");
 
-	upsdebugx(1, "Network UPS Tools version %s configured with flags: %s",
-		NUT_VERSION_MACRO, CONFIG_FLAGS);
+	nut_report_config_flags();
 
 	puts("OPTIONS:");
 	printf("  -C, --complete_scan: Scan all available devices except serial ports (default).\n");
@@ -652,10 +651,7 @@ int main(int argc, char *argv[])
 				break;
 			case 'V':
 				printf("Network UPS Tools - %s\n", NUT_VERSION_MACRO);
-
-				upsdebugx(1, "Network UPS Tools version %s configured with flags: %s",
-					NUT_VERSION_MACRO, CONFIG_FLAGS);
-
+				nut_report_config_flags();
 				exit(EXIT_SUCCESS);
 			case 'a':
 				printf("OLDNUT\n");