From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 22 Nov 2018 18:30:03 +0000 (+0100)
Subject: run: port to DEFINE_MAIN_FUNCTION()
X-Git-Tag: v240~237^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ef08ad7aa86e9ccc883bcd0e950f7bcbc2169cbb;p=thirdparty%2Fsystemd.git

run: port to DEFINE_MAIN_FUNCTION()
---

diff --git a/src/run/run.c b/src/run/run.c
index 2459009d641..acbc3c7bcac 100644
--- a/src/run/run.c
+++ b/src/run/run.c
@@ -14,6 +14,7 @@
 #include "env-util.h"
 #include "fd-util.h"
 #include "format-util.h"
+#include "main-func.h"
 #include "parse-util.h"
 #include "path-util.h"
 #include "pretty-print.h"
@@ -1539,7 +1540,7 @@ static int start_transient_trigger(
         return 0;
 }
 
-int main(int argc, char* argv[]) {
+static int run(int argc, char* argv[]) {
         _cleanup_(sd_bus_flush_close_unrefp) sd_bus *bus = NULL;
         _cleanup_free_ char *description = NULL;
         int r, retval = EXIT_SUCCESS;
@@ -1612,5 +1613,7 @@ finish:
         strv_free(arg_cmdline);
         free(arg_working_directory);
 
-        return r < 0 ? EXIT_FAILURE : retval;
+        return r < 0 ? r : retval;
 }
+
+DEFINE_MAIN_FUNCTION_WITH_POSITIVE_FAILURE(run);