From 67af6b4edf4fafef6a7bbf620c7b58d42a6e8155 Mon Sep 17 00:00:00 2001 From: Thijs Paelman Date: Sun, 7 Jan 2024 12:25:05 +0100 Subject: irmd: Error when config not found Error instead of warn when the --config param is set, but the file is not found. This prevents the IRMd from being in a 'half state', where it is started, but the expected config is not applied. One simply has to remove the --config option OR supply a correct filepath. Also fix compile option for the help message. Signed-off-by: Thijs Paelman Signed-off-by: Sander Vrijders --- src/irmd/configfile.c | 5 +++-- src/irmd/main.c | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/irmd/configfile.c b/src/irmd/configfile.c index 35ea8659..35f526a1 100644 --- a/src/irmd/configfile.c +++ b/src/irmd/configfile.c @@ -820,8 +820,8 @@ int irm_configure(const char * path) rp = realpath(path, NULL); if (rp == NULL) { - log_warn("Failed to resolve path for %s", path); - return 0; + log_err("Failed to resolve path for %s", path); + goto fail_resolve; } log_info("Reading configuration from file %s", rp); @@ -846,6 +846,7 @@ int irm_configure(const char * path) fclose(fp); fail_fopen: free(rp); + fail_resolve: return -1; } diff --git a/src/irmd/main.c b/src/irmd/main.c index 2de244b7..6e7e3d15 100644 --- a/src/irmd/main.c +++ b/src/irmd/main.c @@ -2763,7 +2763,7 @@ static int irm_init(void) static void usage(void) { printf("Usage: irmd \n" -#ifdef OUROBOROS_CONFIG_INI +#ifdef HAVE_TOML " [--config (Path to configuration file)]\n" #endif " [--stdout (Log to stdout instead of system log)]\n" -- cgit v1.2.3