proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-08 03:28:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #12557 from donaldsharp/getenv_two_times

Browse Source 
vtysh: Remove double retrieve of env VTYSH_HISTFILE
This commit is contained in:
Rafael Zalamena 2022-12-21 16:13:23 -03:00 committed by GitHub
commit cb8d1c5598
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
vtysh/vtysh_main.c
View File

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