Skip to content

Skip variable validation during last-token expansion #142

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
devibinoy wants to merge 1 commit into from
Closed

Skip variable validation during last-token expansion #142

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 26 additions & 16 deletions cligen_match.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,24 +145,26 @@ match_variable(cligen_handle h,

/*! Given a string and one cligen object, return if the string matches
*
* @param[in] h CLIgen handle
* @param[in] str0 Input string to match (NULL is match)
* @param[in] co cligen object
* @param[in] best Only return best match (for command evaluation) instead of all possible options
* @param[out] exact 1 if match is exact (CO_COMMANDS). VARS is 0.
* @param[out] reason if not match and co type is 0, reason points to a (malloced)
* string containing an error explanation string. If reason is
* NULL no such string will be malloced. This string needs to
* be freed.
* @retval 1 Match
* @retval 0 Not match
* @retval -1 Error
* @param[in] h CLIgen handle
* @param[in] str0 Input string to match (NULL is match)
* @param[in] co cligen object
* @param[in] best Only return best match (for command evaluation) instead of all possible options
* @param[in] lasttoken Set to True if this is the final token being matched
* @param[out] exact 1 if match is exact (CO_COMMANDS). VARS is 0.
* @param[out] reason if not match and co type is 0, reason points to a (malloced)
* string containing an error explanation string. If reason is
* NULL no such string will be malloced. This string needs to
* be freed.
* @retval 1 Match
* @retval 0 Not match
* @retval -1 Error
*/
static int
match_object(cligen_handle h,
const char *str0,
cg_obj *co,
int best,
int lasttoken,
int *exact,
char **reason)
{
Expand Down Expand Up @@ -207,9 +209,17 @@ match_object(cligen_handle h,
else
match++;
}
else
if ((match = match_variable(h, co, str0, reason)) < 0)
return -1;
else {
/* During expansion of the last token, do not reject candidates
* based on variable validation failures.
*/
if (!best && lasttoken) {
match++;
} else {
if ((match = match_variable(h, co, str0, reason)) < 0)
return -1;
}
}
break;
case CO_REFERENCE: /* This should never match, it is an abstract object that is expanded */
if (reason){
Expand Down Expand Up @@ -406,7 +416,7 @@ match_vec(cligen_handle h,
tmpreason = NULL;
if ((match = match_object(h,
ISREST(co)?resttokens:token,
co, best, &exact,
co, best, lasttoken, &exact,
&tmpreason /* if match == 0 */
)) < 0)
goto done;
Expand Down
Loading