clients/upsc.c, clients/upscmd.c, clients/upsrw.c: setproctag() initially and flip to specified upsname later [networkupstools#3302, networkupstools#3368]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>

Author: jimklimov

clients/upsc.c

@@ -380,6 +380,10 @@ static void clean_exit(void)
 	free(upsname);
 	free(hostname);
 	free(ups);
+
+	/* Not a sub-process (do not let common::proctag_cleanup() mis-report us as such) */
+	upsdebugx(1, "%s: finished, exiting", __func__);
+	setproctag(NULL);
 }
 
 int main(int argc, char **argv)
@@ -391,6 +395,7 @@ int main(int argc, char **argv)
 	const char	*net_connect_timeout = NULL;
 	char	*s = NULL;
 
+	setproctag(prog);
 	/* NOTE: Caller must `export NUT_DEBUG_LEVEL` to see debugs for upsc
 	 * and NUT methods called from it. This line aims to just initialize
 	 * the subsystem, and set initial timestamp. Debugging the client is
@@ -466,6 +471,7 @@ int main(int argc, char **argv)
 			fatalx_error_json_simple(0, "invalid UPS definition.\nRequired format: upsname[@hostname[:port]]");
 		}
 	}
+	setproctag(argv[0]);
 	upsdebugx(1, "upsname='%s' hostname='%s' port='%" PRIu16 "'",
 		NUT_STRARG(upsname), NUT_STRARG(hostname), port);
 

clients/upscmd.c

@@ -286,6 +286,10 @@ static void clean_exit(void)
 	free(upsname);
 	free(hostname);
 	free(ups);
+
+	/* Not a sub-process (do not let common::proctag_cleanup() mis-report us as such) */
+	upsdebugx(1, "%s: finished, exiting", __func__);
+	setproctag(NULL);
 }
 
 int main(int argc, char **argv)
@@ -298,6 +302,7 @@ int main(int argc, char **argv)
 	const char	*prog = xbasename(argv[0]);
 	const char	*net_connect_timeout = NULL;
 
+	setproctag(prog);
 	/* NOTE: Caller must `export NUT_DEBUG_LEVEL` to see debugs for upsc
 	 * and NUT methods called from it. This line aims to just initialize
 	 * the subsystem, and set initial timestamp. Debugging the client is
@@ -378,6 +383,7 @@ int main(int argc, char **argv)
 	if (upscli_splitname(argv[0], &upsname, &hostname, &port) != 0) {
 		fatalx(EXIT_FAILURE, "Error: invalid UPS definition.  Required format: upsname[@hostname[:port]]");
 	}
+	setproctag(argv[0]);
 
 	ups = (UPSCONN_t *)xcalloc(1, sizeof(*ups));
 

clients/upsrw.c

@@ -89,6 +89,10 @@ static void clean_exit(void)
 	free(upsname);
 	free(hostname);
 	free(ups);
+
+	/* Not a sub-process (do not let common::proctag_cleanup() mis-report us as such) */
+	upsdebugx(1, "%s: finished, exiting", __func__);
+	setproctag(NULL);
 }
 
 #if (defined HAVE_PRAGMA_GCC_DIAGNOSTIC_PUSH_POP_BESIDEFUNC) && (!defined HAVE_PRAGMA_GCC_DIAGNOSTIC_PUSH_POP_INSIDEFUNC) && ( (defined HAVE_PRAGMA_GCC_DIAGNOSTIC_IGNORED_TYPE_LIMITS_BESIDEFUNC) || (defined HAVE_PRAGMA_GCC_DIAGNOSTIC_IGNORED_TAUTOLOGICAL_CONSTANT_OUT_OF_RANGE_COMPARE_BESIDEFUNC) )
@@ -656,6 +660,7 @@ int main(int argc, char **argv)
 	const char	*net_connect_timeout = NULL;
 	char	*password = NULL, *username = NULL, *setvar = NULL, *s = NULL;
 
+	setproctag(prog);
 	/* NOTE: Caller must `export NUT_DEBUG_LEVEL` to see debugs for upsc
 	 * and NUT methods called from it. This line aims to just initialize
 	 * the subsystem, and set initial timestamp. Debugging the client is
@@ -732,6 +737,7 @@ int main(int argc, char **argv)
 	if (upscli_splitname(argv[0], &upsname, &hostname, &port) != 0) {
 		fatalx(EXIT_FAILURE, "Error: invalid UPS definition.  Required format: upsname[@hostname[:port]]");
 	}
+	setproctag(argv[0]);
 
 	ups = (UPSCONN_t *)xcalloc(1, sizeof(*ups));