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

* Fixed Yang parsing of comments in (extension) unknown statements, to allow multiple white space

Browse source 
* Fixed cli_start_shell: comments and cli_error
* Fixed [making cli_show_options's output more human readable #199](https://github.com/clicon/clixon/issues/199)
* Fixed SSL/evhtp limited read buffer problem
This commit is contained in:
Olof hagsand 2021-04-01 12:41:36 +02:00
parent 0020c7ff3f
commit 2def5d2367
8 changed files with 142 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

17
apps/cli/cli_common.c
View file

@ -550,8 +550,7 @@ cli_set_mode(clicon_handle h,
}
/*! Start bash from cli callback
* XXX Application specific??
* XXX replace fprintf with clicon_err?
* Typical usage: shell("System Bash") <source:rest>, cli_start_shell();
*/
int
cli_start_shell(clicon_handle h,
@ -567,13 +566,11 @@ cli_start_shell(clicon_handle h,
cmd = (cvec_len(vars)>1 ? cv_string_get(cv1) : NULL);
if ((pw = getpwuid(getuid())) == NULL){
fprintf(stderr, "%s: getpwuid: %s\n",
__FUNCTION__, strerror(errno));
clicon_err(OE_UNIX, errno, "getpwuid");
goto done;
}
if (chdir(pw->pw_dir) < 0){
fprintf(stderr, "%s: chdir(%s): %s\n",
__FUNCTION__, pw->pw_dir, strerror(errno));
clicon_err(OE_UNIX, errno, "chdir");
endpwent();
goto done;
}
@ -584,22 +581,20 @@ cli_start_shell(clicon_handle h,
snprintf(bcmd, 128, "bash -l -c \"%s\"", cmd);
if (system(bcmd) < 0){
cli_signal_block(h);
fprintf(stderr, "%s: system(bash -c): %s\n",
__FUNCTION__, strerror(errno));
clicon_err(OE_UNIX, errno, "system(bash -c)");
goto done;
}
}
else
if (system("bash -l") < 0){
cli_signal_block(h);
fprintf(stderr, "%s: system(bash): %s\n",
__FUNCTION__, strerror(errno));
clicon_err(OE_UNIX, errno, "system(bash)");
goto done;
}
cli_signal_block(h);
#if 0 /* Allow errcodes from bash */
if (retval != 0){
fprintf(stderr, "%s: system(%s) code=%d\n", __FUNCTION__, cmd, retval);
clicon_err(OE_UNIX, errno, "system(%s) %d", cmd, retval);
goto done;
}
#endif