proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-13 05:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix optional arguments with description interactions

Browse Source 
Ticket: CM-6659
Reviewed by: CCR-3203
Testing: See bug

If you have a cli like this:
"neighbor WORD interface {v6only}"

When in the cli you hit ? after entering v6only you get this:

tor-11(config-router)# neighbor swp1 interface v6only
% There is no matched command.
tor-11(config-router)# neighbor swp1 interface v6only

With this fix we now see:
tor-22(config-router)# neighbor swp1 interface v6only
<cr>
tor-22(config-router)# neighbor swp1 interface v6only

This behavior is now consistent with non-optional last
arguments.
This commit is contained in:
Donald Sharp 2015-08-26 09:01:31 -07:00
parent 6e9197093c
commit 16cf945a50
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/command.c
View File

@ -2102,6 +2102,8 @@ cmd_describe_command_real (vector vline, struct vty *vty, int *status)
char *command;
vector matches = NULL;
vector match_vector;
uint32_t command_found = 0;
const char *last_word;
/* Set index. */
if (vector_active (vline) == 0)
@ -2187,13 +2189,13 @@ cmd_describe_command_real (vector vline, struct vty *vty, int *status)
}
/* Make description vector. */
for (i = 0; i < vector_active (matches); i++)
for (i = 0; i < vector_active (matches); i++) {
if ((cmd_element = vector_slot (cmd_vector, i)) != NULL)
{
unsigned int j;
const char *last_word;
vector vline_trimmed;
command_found++;
last_word = vector_slot(vline, vector_active(vline) - 1);
if (last_word == NULL || !strlen(last_word))
{
@ -2222,6 +2224,18 @@ cmd_describe_command_real (vector vline, struct vty *vty, int *status)
vector_set(matchvec, token);
}
}
}
/*
* We can get into this situation when the command is complete
* but the last part of the command is an optional piece of
* cli.
*/
last_word = vector_slot(vline, vector_active(vline) - 1);
if (command_found == 0 && (last_word == NULL || !strlen(last_word))) {
vector_set(matchvec, &token_cr);
}
vector_free (cmd_vector);
cmd_matches_free(&matches);