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

Fixed: [cli_show_auto don't work](https://github.com/clicon/clixon/issues/595)

Browse source
This commit is contained in:
Olof hagsand 2025-03-10 13:50:58 +01:00
parent 302762f5af
commit 40d674bbbc
2 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -24,6 +24,7 @@ Planned: April 2025
### Corrected Bugs ### Corrected Bugs
* Fixed: [cli_show_auto don't work](https://github.com/clicon/clixon/issues/595)
* Fixed: [XPath * stopped working in 7.3](https://github.com/clicon/clixon/issues/594) * Fixed: [XPath * stopped working in 7.3](https://github.com/clicon/clixon/issues/594)
* Fixed: [Templates with nc:operation "merge" causes bad diffs to be shows](https://github.com/clicon/clixon-controller/issues/187) * Fixed: [Templates with nc:operation "merge" causes bad diffs to be shows](https://github.com/clicon/clixon-controller/issues/187)

9
apps/cli/cli_show.c
View file

@ -1201,6 +1201,7 @@ cli_show_auto(clixon_handle h,
yang_stmt *yspec0; yang_stmt *yspec0;
char *api_path = NULL; char *api_path = NULL;
int cvvi = 0; int cvvi = 0;
cvec *cvv2 = NULL; /* cvv2 = cvv0 + cvv1 */
char *api_path_fmt; /* xml key format */ char *api_path_fmt; /* xml key format */
char *api_path_fmt01 = NULL; char *api_path_fmt01 = NULL;
char *str; char *str;
@ -1247,15 +1248,17 @@ cli_show_auto(clixon_handle h,
clixon_err(OE_FATAL, 0, "No DB_SPEC"); clixon_err(OE_FATAL, 0, "No DB_SPEC");
goto done; goto done;
} }
if ((cvv2 = cvec_append(clicon_data_cvec_get(h, "cli-edit-cvv"), cvv)) == NULL)
goto done;
if (mtpoint){ if (mtpoint){
/* Get and combined api-path01 */ /* Get and combined api-path01 */
if (mtpoint_paths(yspec0, mtpoint, api_path_fmt, &api_path_fmt01) < 0) if (mtpoint_paths(yspec0, mtpoint, api_path_fmt, &api_path_fmt01) < 0)
goto done; goto done;
if (api_path_fmt2api_path(api_path_fmt01, cvv, yspec0, &api_path, &cvvi) < 0) if (api_path_fmt2api_path(api_path_fmt01, cvv2, yspec0, &api_path, &cvvi) < 0)
goto done; goto done;
} }
else{ else{
if (api_path_fmt2api_path(api_path_fmt, cvv, yspec0, &api_path, &cvvi) < 0) if (api_path_fmt2api_path(api_path_fmt, cvv2, yspec0, &api_path, &cvvi) < 0)
goto done; goto done;
} }
if (api_path2xpath(api_path, yspec0, &xpath, &nsc, NULL) < 0) if (api_path2xpath(api_path, yspec0, &xpath, &nsc, NULL) < 0)
@ -1270,6 +1273,8 @@ cli_show_auto(clixon_handle h,
goto done; goto done;
retval = 0; retval = 0;
done: done:
if (cvv2)
cvec_free(cvv2);
if (api_path_fmt01) if (api_path_fmt01)
free(api_path_fmt01); free(api_path_fmt01);
if (nsc) if (nsc)