experiments/clixon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into develop

Browse source 
Conflicts:
	CHANGELOG.md
This commit is contained in:
Olof hagsand 2017-09-24 17:08:44 +02:00
commit a691124189
6 changed files with 21 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
apps/cli/cli_handle.c
View file

@ -146,6 +146,9 @@ cli_syntax_set(clicon_handle h,
cli_syntax_t *stx)
{
struct cli_handle *cl = handle(h);
if (cl->cl_stx)
free(cl->cl_stx);
cl->cl_stx = stx;
return 0;
}

1
apps/cli/cli_main.c
View file

@ -392,6 +392,7 @@ main(int argc, char **argv)
cli_plugin_start(h, argc+1, argv-1);
*(argv-1) = tmp;
cligen_line_scrolling_set(cli_cligen(h), clicon_option_int(h,"CLICON_CLI_LINESCROLLING"));
/* Launch interfactive event loop, unless -1 */
if (restarg != NULL && strlen(restarg)){
char *mode = cli_syntax_mode(h);