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

Rewrote parsing of extra config-files to work recursively over structured data

Browse source 
Fixed that modified config variables were not properly overwritten in XML
Added `pretty` parameter to clicon_options_dump
Added testcases for recursive and structure extra config files
This commit is contained in:
Olof hagsand 2023-08-23 11:02:18 +02:00
parent 124afb8788
commit a7ef2c4f12
11 changed files with 135 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

2
apps/backend/backend_main.c
View file

@ -1014,7 +1014,7 @@ main(int argc,
goto done;
/* Explicit dump of config (also debug dump below). */
if (config_dump){
if (clicon_option_dump1(h, stdout, config_dump_format) < 0)
if (clicon_option_dump1(h, stdout, config_dump_format, 1) < 0)
goto done;
}

2
apps/cli/cli_main.c
View file

@ -862,7 +862,7 @@ main(int argc,
* (there is also debug dump below).
*/
if (config_dump){
if (clicon_option_dump1(h, stdout, config_dump_format) < 0)
if (clicon_option_dump1(h, stdout, config_dump_format, 1) < 0)
goto done;
}
/* Debug dump of config options */

2
apps/cli/cli_show.c
View file

@ -1138,6 +1138,8 @@ cli_show_auto_mode(clicon_handle h,
}
/*! Show clixon configuration options as loaded
*
'* @see clicon_option_dump clicon_option_dump1
*/
int
cli_show_options(clicon_handle h,

2
apps/netconf/netconf_main.c
View file

@ -879,7 +879,7 @@ main(int argc,
/* Explicit dump of config (also debug dump below). */
if (config_dump){
if (clicon_option_dump1(h, stdout, config_dump_format) < 0)
if (clicon_option_dump1(h, stdout, config_dump_format, 1) < 0)
goto done;
goto ok;
}

2
apps/restconf/restconf_main_fcgi.c
View file

@ -539,7 +539,7 @@ main(int argc,
/* Explicit dump of config (also debug dump below). */
if (config_dump){
if (clicon_option_dump1(h, stdout, config_dump_format) < 0)
if (clicon_option_dump1(h, stdout, config_dump_format, 1) < 0)
goto done;
goto ok;
}

2
apps/restconf/restconf_main_native.c
View file

@ -1297,7 +1297,7 @@ main(int argc,
/* Explicit dump of config (also debug dump below). */
if (config_dump){
if (clicon_option_dump1(h, stdout, config_dump_format) < 0)
if (clicon_option_dump1(h, stdout, config_dump_format, 1) < 0)
goto done;
goto ok;
}

2
apps/snmp/snmp_main.c
View file

@ -523,7 +523,7 @@ main(int argc,
goto done;
if (config_dump){
if (clicon_option_dump1(h, stdout, config_dump_format) < 0)
if (clicon_option_dump1(h, stdout, config_dump_format, 1) < 0)
goto done;
goto ok;
}