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

* Fixed: Autocli YANG patterns including " were not properly escaped: \"

Browse source
This commit is contained in:
Olof hagsand 2022-01-19 14:52:32 +01:00
parent 77b4468eb3
commit 95f6fe8b1a
4 changed files with 23 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

28
apps/cli/cli_generate.c
View file

@ -332,6 +332,7 @@ yang2cli_var_range(yang_stmt *ys,
* @param[in] patterns Cvec of regexp patterns
* @param[out] cb Buffer where cligen code is written
* @see cv_validate_pattern for netconf validate code
* @note for cligen, need to escape " -> \"
*/
static int
yang2cli_var_pattern(clicon_handle h,
@ -343,32 +344,43 @@ yang2cli_var_pattern(clicon_handle h,
cg_var *cvp;
char *pattern;
int invert;
char *posix;
char *posix = NULL;
int i;
mode = clicon_yang_regexp(h);
cvp = NULL; /* Loop over compiled regexps */
while ((cvp = cvec_each(patterns, cvp)) != NULL){
pattern = cv_string_get(cvp);
invert = cv_flag(cvp, V_INVERT);
cprintf(cb, " regexp:%s\"", invert?"!":"");
if (mode == REGEXP_POSIX){
posix = NULL;
if (regexp_xsd2posix(pattern, &posix) < 0)
goto done;
cprintf(cb, " regexp:%s\"%s\"",
invert?"!":"",
posix);
for (i=0; i<strlen(posix); i++){
if (posix[i] == '\"')
cbuf_append(cb, '\\');
cbuf_append(cb, posix[i]);
}
if (posix){
free(posix);
posix = NULL;
}
}
else
cprintf(cb, " regexp:%s\"%s\"",
invert?"!":"",
pattern);
else{
for (i=0; i<strlen(pattern); i++){
if (pattern[i] == '\"')
cbuf_append(cb, '\\');
cbuf_append(cb, pattern[i]);
}
}
cprintf(cb, "\"");
}
retval = 0;
done:
if (posix)
free(posix);
return retval;
}