diff options
| author | Pau Espin Pedrol <pespin@sysmocom.de> | 2019-06-12 18:35:46 +0200 |
|---|---|---|
| committer | Pau Espin Pedrol <pespin@sysmocom.de> | 2019-06-14 17:44:21 +0200 |
| commit | 32e6710487a716a7ad03860426bb5e237fae8f5a (patch) | |
| tree | 240a28da9901f184191e6e85073e3db14388fc0b | |
| parent | 7e1b03f763350fefa1a68e45764e2076063fdb15 (diff) | |
vty: command.c: Fix: single-choice optional args are no longer passed incomplete to vty func
For instance, take command "single0 [one]":
If user executes "single0 on", VTY func will receive argv[0]="one"
instead of argv[0]="on".
Related: OS#4045
Change-Id: I5f4e2d16c62a2d22717989c6acc77450957168cb
| -rw-r--r-- | src/vty/command.c | 19 | ||||
| -rw-r--r-- | tests/vty/vty_transcript_test.vty | 2 |
2 files changed, 15 insertions, 6 deletions
diff --git a/src/vty/command.c b/src/vty/command.c index 3c91bfd3..89a2bc10 100644 --- a/src/vty/command.c +++ b/src/vty/command.c @@ -2310,16 +2310,26 @@ cmd_execute_command_real(vector vline, struct vty *vty, } vector descvec = vector_slot(matched_element->strvec, i); + const char *tmp_cmd; if (vector_active(descvec) == 1) { + /* Single coice argument, no "(...|...)". */ struct desc *desc = vector_slot(descvec, 0); - if (CMD_VARARG(desc->cmd)) - varflag = 1; + if (CMD_OPTION(desc->cmd)) { + /* we need to first remove the [] chars, then check to see what's inside (var or token) */ + tmp_cmd = cmd_deopt(cmd_deopt_ctx, desc->cmd); + } else { + tmp_cmd = desc->cmd; + } - if (varflag || CMD_VARIABLE(desc->cmd) - || CMD_OPTION(desc->cmd)) + if (CMD_VARARG(tmp_cmd)) + varflag = 1; + if (varflag || CMD_VARIABLE(tmp_cmd)) argv[argc++] = vector_slot(vline, i); + else if (CMD_OPTION(desc->cmd)) + argv[argc++] = tmp_cmd; + /* else : we don't want to add non-opt single-choice static args in argv[] */ } else { /* multi choice argument. look up which choice the user meant (can only be one after @@ -2328,7 +2338,6 @@ cmd_execute_command_real(vector vline, struct vty *vty, want to pass "three" in argv[]. */ for (j = 0; j < vector_active(descvec); j++) { struct desc *desc = vector_slot(descvec, j); - const char *tmp_cmd; if (!desc) continue; if (cmd_match(desc->cmd, vector_slot(vline, i), ANY_MATCH, true) == NO_MATCH) diff --git a/tests/vty/vty_transcript_test.vty b/tests/vty/vty_transcript_test.vty index f2dbacbf..db58830e 100644 --- a/tests/vty/vty_transcript_test.vty +++ b/tests/vty/vty_transcript_test.vty @@ -80,7 +80,7 @@ vty_transcript_test> single0 one ok argc=1 one vty_transcript_test> single0 on -ok argc=1 on +ok argc=1 one vty_transcript_test> single0 ok argc=0 |