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

Fix same -V version string

Browse source 
Restconf exit segv
This commit is contained in:
Olof hagsand 2024-02-17 22:04:21 +01:00
parent 6ff1588397
commit 3b0b734de1
11 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
apps/backend/backend_main.c
View file

@ -569,7 +569,7 @@ main(int argc,
help = 1; help = 1;
break; break;
case 'V': case 'V':
cligen_output(stdout, "Clixon version %s\n", CLIXON_VERSION_STRING); cligen_output(stdout, "Clixon version: %s\n", CLIXON_VERSION_STRING);
print_version++; /* plugins may also print versions w ca-version callback */ print_version++; /* plugins may also print versions w ca-version callback */
break; break;
case 'D' : { /* debug */ case 'D' : { /* debug */

2
apps/cli/cli_main.c
View file

@ -580,7 +580,7 @@ main(int argc,
help = 1; help = 1;
break; break;
case 'V': /* version */ case 'V': /* version */
cligen_output(stdout, "Clixon version %s\n", CLIXON_VERSION_STRING); cligen_output(stdout, "Clixon version: %s\n", CLIXON_VERSION_STRING);
print_version++; /* plugins may also print versions w ca-version callback */ print_version++; /* plugins may also print versions w ca-version callback */
break; break;
case 'D' : { /* debug */ case 'D' : { /* debug */

2
apps/netconf/netconf_main.c
View file

@ -709,7 +709,7 @@ main(int argc,
usage(h, argv[0]); usage(h, argv[0]);
break; break;
case 'V': /* version */ case 'V': /* version */
cligen_output(stdout, "Clixon version %s\n", CLIXON_VERSION_STRING); cligen_output(stdout, "Clixon version: %s\n", CLIXON_VERSION_STRING);
print_version++; /* plugins may also print versions w ca-version callback */ print_version++; /* plugins may also print versions w ca-version callback */
break; break;
case 'D' : { /* debug */ case 'D' : { /* debug */

2
apps/restconf/restconf_lib.c
View file

@ -376,9 +376,9 @@ restconf_terminate(clixon_handle h)
if ((x = clicon_conf_xml(h)) != NULL) if ((x = clicon_conf_xml(h)) != NULL)
xml_free(x); xml_free(x);
xpath_optimize_exit(); xpath_optimize_exit();
restconf_handle_exit(h);
clixon_err_exit(); clixon_err_exit();
clixon_debug(CLIXON_DBG_RESTCONF, "pid:%u done", getpid()); clixon_debug(CLIXON_DBG_RESTCONF, "pid:%u done", getpid());
restconf_handle_exit(h);
clixon_log_exit(); /* Must be after last clixon_debug */ clixon_log_exit(); /* Must be after last clixon_debug */
return 0; return 0;
} }

2
apps/restconf/restconf_main_fcgi.c
View file

@ -345,7 +345,7 @@ main(int argc,
usage(h, argv[0]); usage(h, argv[0]);
break; break;
case 'V': case 'V':
cligen_output(stdout, "Clixon version %s\n", CLIXON_VERSION_STRING); cligen_output(stdout, "Clixon version: %s\n", CLIXON_VERSION_STRING);
print_version++; /* plugins may also print versions w ca-version callback */ print_version++; /* plugins may also print versions w ca-version callback */
break; break;
case 'D' : { /* debug */ case 'D' : { /* debug */

2
apps/restconf/restconf_main_native.c
View file

@ -1168,7 +1168,7 @@ main(int argc,
usage(h, argv0); usage(h, argv0);
break; break;
case 'V': /* version */ case 'V': /* version */
cligen_output(stdout, "Clixon version %s\n", CLIXON_VERSION_STRING); cligen_output(stdout, "Clixon version: %s\n", CLIXON_VERSION_STRING);
print_version++; /* plugins may also print versions w ca-version callback */ print_version++; /* plugins may also print versions w ca-version callback */
break; break;
case 'D' : { /* debug. Note this overrides any setting in the config */ case 'D' : { /* debug. Note this overrides any setting in the config */

2
apps/snmp/snmp_main.c
View file

@ -381,7 +381,7 @@ main(int argc,
usage(h, argv[0]); usage(h, argv[0]);
break; break;
case 'V': /* version */ case 'V': /* version */
cligen_output(stdout, "Clixon version %s\n", CLIXON_VERSION_STRING); cligen_output(stdout, "Clixon version: %s\n", CLIXON_VERSION_STRING);
exit(0); exit(0);
break; break;
case 'D' : { /* debug */ case 'D' : { /* debug */

2
lib/clixon/clixon_plugin.h
View file

@ -340,7 +340,7 @@ typedef int (errmsg_t)(clixon_handle h, const char *fn, const int line,
* *
* A plugin can customize a version (or banner) output on stdout. * A plugin can customize a version (or banner) output on stdout.
* Several version strings can be printed if there are multiple callbacks. * Several version strings can be printed if there are multiple callbacks.
* If not regstered plugins exist, clixon prints CLIXON_VERSION_STRING * If not registered plugins exist, clixon prints CLIXON_VERSION_STRING
* Typically invoked by command-line option -V * Typically invoked by command-line option -V
* @param[in] h Clixon handle * @param[in] h Clixon handle
* @param[in] f Output file * @param[in] f Output file

1
lib/src/clixon_xml.c
View file

@ -1588,7 +1588,6 @@ xml_rm_children(cxobj *xp,
return retval; return retval;
} }
/*! Remove top XML object and all children except a single child /*! Remove top XML object and all children except a single child
* *
* Given a root xml node, and the i:th child, remove the child from its parent * Given a root xml node, and the i:th child, remove the child from its parent

2
lib/src/clixon_xml_map.c
View file

@ -408,6 +408,8 @@ xml_diff1(cxobj *x0,
for (;;){ for (;;){
if (x0c == NULL && x1c == NULL) if (x0c == NULL && x1c == NULL)
goto ok; goto ok;
y0c = NULL;
y1c = NULL;
/* If cl:ignore-compare extension, return equal */ /* If cl:ignore-compare extension, return equal */
if (x0c && (y0c = xml_spec(x0c)) != NULL){ if (x0c && (y0c = xml_spec(x0c)) != NULL){
if (yang_extension_value(y0c, "ignore-compare", CLIXON_LIB_NS, &extflag, NULL) < 0) if (yang_extension_value(y0c, "ignore-compare", CLIXON_LIB_NS, &extflag, NULL) < 0)

2
test/test_cli.sh
View file

@ -177,7 +177,7 @@ new "wait backend"
wait_backend wait_backend
new "cli version" new "cli version"
expectpart "$($clixon_cli -1 -f $cfg -V)" 0 "Clixon version $CLIXON_VERSION" "Clixon main example version" expectpart "$($clixon_cli -1 -f $cfg -V)" 0 "Clixon version: $CLIXON_VERSION" "Clixon main example version"
new "cli configure top" new "cli configure top"
expectpart "$($clixon_cli -1 -f $cfg set interfaces)" 0 "^$" expectpart "$($clixon_cli -1 -f $cfg set interfaces)" 0 "^$"