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

* CLI-spec variable CLICON_PROMPT %W changed semantics due to long prompt

Browse source 
* From "Full Working edit path" to "Last element of working path"
  * New `%w` has "Full working path"
This commit is contained in:
Olof hagsand 2022-01-18 12:22:44 +01:00
parent f922211212
commit 519fe1f576
3 changed files with 24 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
CHANGELOG.md
View file

@ -64,6 +64,9 @@ Planned: January, 2022
Users may have to change how they access the system Users may have to change how they access the system
* CLI-spec variable `CLICON_PROMPT` `%W` changed semantics due to long prompt
* From "Full Working edit path" to "Last element of working path"
* New `%w` has "Full working path"
* Auto-cli edit-modes changed * Auto-cli edit-modes changed
* Edit modes only for list and container nodes * Edit modes only for list and container nodes
* Change cli spec entry to `edit @datamodelmode, cli_auto_edit("basemodel");` * Change cli spec entry to `edit @datamodelmode, cli_auto_edit("basemodel");`

22
apps/cli/cli_plugin.c
View file

@ -308,7 +308,7 @@ cli_load_syntax_file(clicon_handle h,
fclose(f); fclose(f);
/* Get CLICON specific global variables: /* Get CLICON specific global variables:
* CLICON_MODE: which mode(s) this syntax applies to * CLICON_MODE: which mode(s) this syntax applies to
* CLICON_PROMPT: Cli prompt in this mode * CLICON_PROMPT: Cli prompt in this mode (see cli_prompt_get)
* CLICON_PLUGIN: Name of C API plugin * CLICON_PLUGIN: Name of C API plugin
* Note: the base case is that it is: * Note: the base case is that it is:
* (1) a single mode or * (1) a single mode or
@ -677,7 +677,25 @@ cli_prompt_get(clicon_handle h,
strcpy(tty, "notty"); strcpy(tty, "notty");
cprintf(cb, "%s", tty); cprintf(cb, "%s", tty);
break; break;
case 'W': /* working edit path */ case 'W': /* Last element of working path */
if (clicon_data_get(h, "cli-edit-mode", &path) == 0 &&
strlen(path)){
int i;
for (i=strlen(path)-1; i>=0; i--)
if (path[i] == '/' || path[i] == ':')
/* see yang2api_path_fmt_1() why occasional trailing / */
if (i < strlen(path)-1)
break;
if (i >= 0)
cprintf(cb, "%s", &path[i+1]);
else
cprintf(cb, "%s", path);
}
else
cprintf(cb, "/");
break;
case 'w': /* Full Working edit path */
if (clicon_data_get(h, "cli-edit-mode", &path) == 0 && if (clicon_data_get(h, "cli-edit-mode", &path) == 0 &&
strlen(path)) strlen(path))
cprintf(cb, "%s", path); cprintf(cb, "%s", path);

2
test/test_autocli_editmode.sh
View file

@ -65,7 +65,7 @@ EOF
cat <<EOF > $fspec cat <<EOF > $fspec
CLICON_MODE="example"; CLICON_MODE="example";
CLICON_PROMPT="%U@%H %W> "; CLICON_PROMPT="%U@%H %w> ";
CLICON_PLUGIN="example_cli"; CLICON_PLUGIN="example_cli";
# Autocli syntax tree operations # Autocli syntax tree operations