Mirrors/VILLASnode
1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/node/ synced 2025-03-09 00:00:00 +01:00
Code Issues Releases Wiki Activity

tools/conf2json: supply input as argument and use path as include dir

Browse source 
Passing via stdin does not allow to use the input file path for include
lookup, because we only see the stdin file stream from our program.
This commit is contained in:
daniel-k 2017-11-22 15:53:19 +01:00
parent 53fda92226
commit 717659ff87
1 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
tools/conf2json.c
View file

@ -20,6 +20,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*********************************************************************************/
#include <libgen.h>
#include <stdio.h>
#include <jansson.h>
#include <libconfig.h>
@ -28,7 +30,7 @@
void usage()
{
printf("Usage: conf2json < input.conf > output.json\n\n");
printf("Usage: conf2json input.conf > output.json\n\n");
print_copyright();
}
@ -40,22 +42,30 @@ int main(int argc, char *argv[])
config_setting_t *cfg_root;
json_t *json;
if (argc != 1) {
if (argc != 2) {
usage();
exit(EXIT_FAILURE);
}
FILE *f = fopen(argv[1], "r");
if(f == NULL)
return -1;
const char *confdir = dirname(argv[1]);
config_init(&cfg);
ret = config_read(&cfg, stdin);
config_set_include_dir(&cfg, confdir);
ret = config_read(&cfg, f);
if (ret != CONFIG_TRUE)
return ret;
return -2;
cfg_root = config_root_setting(&cfg);
json = config_to_json(cfg_root);
if (!json)
return -1;
return -3;
ret = json_dumpf(json, stdout, JSON_INDENT(2)); fflush(stdout);
if (ret)