From 99fc3898606bf9bc2a732facffc1a6fe6bfcf3a2 Mon Sep 17 00:00:00 2001 From: nsensfel Date: Tue, 7 Jan 2020 11:06:51 +0100 Subject: ... --- src/config/parameters/parameters.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'src/config/parameters/parameters.c') diff --git a/src/config/parameters/parameters.c b/src/config/parameters/parameters.c index e3328ca..bff7642 100644 --- a/src/config/parameters/parameters.c +++ b/src/config/parameters/parameters.c @@ -103,6 +103,8 @@ int relabsd_parameters_parse_execution_mode return -1; } + relabsd_parameters_initialize_options(parameters); + if ( RELABSD_STRING_EQUALS("-?", argv[1]) @@ -169,8 +171,6 @@ int relabsd_parameters_parse_options RELABSD_S_DEBUG(RELABSD_DEBUG_PROGRAM_FLOW, "Parsing options..."); - relabsd_parameters_initialize_options(parameters); - /* * i = (parameters->read_argc + 1) because reading 2 params is actually * reaching the [2] element of the array, since the [0] element is the @@ -283,7 +283,11 @@ int relabsd_parameters_parse_options } ++i; - parameters->configuration_file = argv[i]; + + if (relabsd_parameters_parse_config_file(argv[i], parameters) < 0) + { + return -1; + } } else { -- cgit v1.2.3-70-g09d2