From de9674f090c2ae71cacd5f8bd6dcf5e8657ad686 Mon Sep 17 00:00:00 2001 From: Dimitri Staessens Date: Wed, 16 Aug 2023 13:36:18 +0200 Subject: irmd: Fix exit status when failing on configfile If there was an error reading the configuration file, the IRMd would shutdown, but still return EXIT_SUCCESS instead of EXIT_FAILURE. Signed-off-by: Dimitri Staessens Signed-off-by: Sander Vrijders --- src/irmd/main.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/irmd/main.c b/src/irmd/main.c index 99ab0b24..bb65297f 100644 --- a/src/irmd/main.c +++ b/src/irmd/main.c @@ -2745,6 +2745,7 @@ int main(int argc, char ** argv) { sigset_t sigset; + int ret = EXIT_SUCCESS; sigemptyset(&sigset); sigaddset(&sigset, SIGINT); @@ -2769,8 +2770,10 @@ int main(int argc, goto fail_irm_start; #ifdef HAVE_TOML - if (irm_configure(irmd.cfg_file) < 0) + if (irm_configure(irmd.cfg_file) < 0) { irmd_set_state(IRMD_NULL); + ret = EXIT_FAILURE; + } #endif irm_sigwait(sigset); @@ -2784,7 +2787,7 @@ int main(int argc, log_fini(); - exit(EXIT_SUCCESS); + exit(ret); fail_irm_start: irm_fini(); -- cgit v1.2.3