guard CLICON_CLI_HIST_SIZE with CLIgen default

This commit is contained in:
Olof Hagsand 2019-03-28 09:19:43 +01:00
parent 772d93963c
commit 7ee4a151cf

View file

@ -86,7 +86,11 @@ cli_history_load(clicon_handle h)
FILE *f = NULL;
wordexp_t result = {0,}; /* for tilde expansion */
lines = clicon_option_int(h,"CLICON_CLI_HIST_SIZE");
/* Get history size from clixon option, if not use cligen default. */
if (clicon_option_exists(h, "CLICON_CLI_HIST_SIZE"))
lines = clicon_option_int(h,"CLICON_CLI_HIST_SIZE");
else
lines = CLIGEN_HISTSIZE_DEFAULT;
/* Re-init history with clixon lines (1st time was w cligen defaults) */
if (cligen_hist_init(cli_cligen(h), lines) < 0)
goto done;