systemctl: rework exit codes for all utility programs to follow LSB or other standards

[elogind.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 53a455b5059fb3413ab9767a373b58379e487a1e..2e6ccfaa30d37f3e7a74234f4722cb296a150b66 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -876,7 +876,7 @@ fail:
 
 int main(int argc, char *argv[]) {
         Manager *m = NULL;
 
 int main(int argc, char *argv[]) {
         Manager *m = NULL;

-        int r, retval = 1;
+        int r, retval = EXIT_FAILURE;

         FDSet *fds = NULL;
         bool reexecute = false;
 
         FDSet *fds = NULL;
         bool reexecute = false;
 


@@ -937,10 +937,10 @@ int main(int argc, char *argv[]) {
                 goto finish;
         } else if (arg_action == ACTION_DUMP_CONFIGURATION_ITEMS) {
                 unit_dump_config_items(stdout);
                 goto finish;
         } else if (arg_action == ACTION_DUMP_CONFIGURATION_ITEMS) {
                 unit_dump_config_items(stdout);

-                retval = 0;
+                retval = EXIT_SUCCESS;

                 goto finish;
         } else if (arg_action == ACTION_DONE) {
                 goto finish;
         } else if (arg_action == ACTION_DONE) {

-                retval = 0;
+                retval = EXIT_SUCCESS;

                 goto finish;
         }
 
                 goto finish;
         }
 


@@ -1072,7 +1072,7 @@ int main(int argc, char *argv[]) {
                 if (arg_action == ACTION_TEST) {
                         printf("-> By jobs:\n");
                         manager_dump_jobs(m, stdout, "\t");
                 if (arg_action == ACTION_TEST) {
                         printf("-> By jobs:\n");
                         manager_dump_jobs(m, stdout, "\t");

-                        retval = 0;
+                        retval = EXIT_SUCCESS;

                         goto finish;
                 }
         }
                         goto finish;
                 }
         }


@@ -1086,7 +1086,7 @@ int main(int argc, char *argv[]) {
                 switch (m->exit_code) {
 
                 case MANAGER_EXIT:
                 switch (m->exit_code) {
 
                 case MANAGER_EXIT:

-                        retval = 0;
+                        retval = EXIT_SUCCESS;

                         log_debug("Exit.");
                         goto finish;
 
                         log_debug("Exit.");
                         goto finish;