diff options
| author | Donald Sharp <sharpd@nvidia.com> | 2022-12-21 14:04:34 +0100 |
|---|---|---|
| committer | Donald Sharp <sharpd@nvidia.com> | 2022-12-21 14:04:34 +0100 |
| commit | 99a9f25ce8c1e070f7f37c4cbd439c11bb7432eb (patch) | |
| tree | ea8037ea9e68056f0854d59058203e050b649178 /vtysh/vtysh_main.c | |
| parent | Merge pull request #12552 from Jafaral/rel-notes (diff) | |
| download | frr-99a9f25ce8c1e070f7f37c4cbd439c11bb7432eb.tar.xz frr-99a9f25ce8c1e070f7f37c4cbd439c11bb7432eb.zip | |
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>
Diffstat (limited to 'vtysh/vtysh_main.c')
| -rw-r--r-- | vtysh/vtysh_main.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/vtysh/vtysh_main.c b/vtysh/vtysh_main.c index a72cb6e80..be7eb3ecd 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 { |