From: Donald Sharp <sharpd@nvidia.com>
Date: Wed, 21 Dec 2022 13:04:34 +0000 (-0500)
Subject: vtysh: Remove double retrieve of env VTYSH_HISTFILE
X-Git-Tag: base_8.5~115^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=refs%2Fpull%2F12557%2Fhead;p=mirror%2Ffrr.git

vtysh: Remove double retrieve of env VTYSH_HISTFILE

The code is double checking the VTYSH_HISTFILE env variable,
additionally clang-15 when running SA over it doesn't fully
understand the code pattern.  Reduce the double check to
one check to reduce program run-time (ha!) and make SA happy.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
---

diff --git a/vtysh/vtysh_main.c b/vtysh/vtysh_main.c
index a72cb6e809..be7eb3ecdf 100644
--- a/vtysh/vtysh_main.c
+++ b/vtysh/vtysh_main.c
@@ -354,6 +354,7 @@ int main(int argc, char **argv, char **env)
 	const char *pathspace_arg = NULL;
 	char pathspace[MAXPATHLEN] = "";
 	const char *histfile = NULL;
+	const char *histfile_env = getenv("VTYSH_HISTFILE");
 
 	/* SUID: drop down to calling user & go back up when needed */
 	elevuid = geteuid();
@@ -611,10 +612,8 @@ int main(int argc, char **argv, char **env)
 	 * VTYSH_HISTFILE is preferred over command line
 	 * argument (-H/--histfile).
 	 */
-	if (getenv("VTYSH_HISTFILE")) {
-		const char *file = getenv("VTYSH_HISTFILE");
-
-		strlcpy(history_file, file, sizeof(history_file));
+	if (histfile_env) {
+		strlcpy(history_file, histfile_env, sizeof(history_file));
 	} else if (histfile) {
 		strlcpy(history_file, histfile, sizeof(history_file));
 	} else {