systemctl: remove spurious newline

[elogind.git] / src / systemctl / systemctl.c

diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index 21e33d5bfc9607de6b4c8066bdddf6f850126d31..1c6fef484e47c9113e1201e4d1f44666b00dcc0b 100644 (file)
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -594,7 +594,7 @@ static int get_unit_list_recursive(
         assert(_unit_infos);
         assert(_machines);
 
         assert(_unit_infos);
         assert(_machines);
 

-        replies = set_new(NULL, NULL);
+        replies = set_new(NULL);

         if (!replies)
                 return log_oom();
 
         if (!replies)
                 return log_oom();
 


@@ -617,7 +617,7 @@ static int get_unit_list_recursive(
                         return r;
 
                 STRV_FOREACH(i, machines) {
                         return r;
 
                 STRV_FOREACH(i, machines) {

-                        _cleanup_bus_unref_ sd_bus *container = NULL;
+                        _cleanup_bus_close_unref_ sd_bus *container = NULL;

                         int k;
 
                         r = sd_bus_open_system_container(&container, *i);
                         int k;
 
                         r = sd_bus_open_system_container(&container, *i);


@@ -1338,7 +1338,7 @@ static int list_unit_files(sd_bus *bus, char **args) {
                 Iterator i;
                 unsigned n_units;
 
                 Iterator i;
                 unsigned n_units;
 

-                h = hashmap_new(string_hash_func, string_compare_func);
+                h = hashmap_new(&string_hash_ops);

                 if (!h)
                         return log_oom();
 
                 if (!h)
                         return log_oom();
 


@@ -1350,8 +1350,9 @@ static int list_unit_files(sd_bus *bus, char **args) {
                 }
 
                 n_units = hashmap_size(h);
                 }
 
                 n_units = hashmap_size(h);

+

                 units = new(UnitFileList, n_units);
                 units = new(UnitFileList, n_units);

-                if (!units) {
+                if (!units && n_units > 0) {

                         unit_file_list_free(h);
                         return log_oom();
                 }
                         unit_file_list_free(h);
                         return log_oom();
                 }


@@ -1407,14 +1408,13 @@ static int list_unit_files(sd_bus *bus, char **args) {
                         return bus_log_parse_error(r);
         }
 
                         return bus_log_parse_error(r);
         }
 

-        if (c > 0) {
-                qsort(units, c, sizeof(UnitFileList), compare_unit_file_list);
-                output_unit_file_list(units, c);
-        }
+        qsort_safe(units, c, sizeof(UnitFileList), compare_unit_file_list);
+        output_unit_file_list(units, c);

 
 

-        if (avoid_bus())
+        if (avoid_bus()) {

                 for (unit = units; unit < units + c; unit++)
                         free(unit->path);
                 for (unit = units; unit < units + c; unit++)
                         free(unit->path);

+        }

 
         return 0;
 }
 
         return 0;
 }


@@ -1688,7 +1688,7 @@ static int compare_machine_info(const void *a, const void *b) {
 }
 
 static int get_machine_properties(sd_bus *bus, struct machine_info *mi) {
 }
 
 static int get_machine_properties(sd_bus *bus, struct machine_info *mi) {

-        _cleanup_bus_unref_ sd_bus *container = NULL;
+        _cleanup_bus_close_unref_ sd_bus *container = NULL;

         int r;
 
         assert(mi);
         int r;
 
         assert(mi);


@@ -2351,8 +2351,18 @@ static int check_wait_response(WaitData *d) {
                         log_error("Job for %s canceled.", strna(d->name));
                 else if (streq(d->result, "dependency"))
                         log_error("A dependency job for %s failed. See 'journalctl -xn' for details.", strna(d->name));
                         log_error("Job for %s canceled.", strna(d->name));
                 else if (streq(d->result, "dependency"))
                         log_error("A dependency job for %s failed. See 'journalctl -xn' for details.", strna(d->name));

-                else if (!streq(d->result, "done") && !streq(d->result, "skipped"))
-                        log_error("Job for %s failed. See 'systemctl status %s' and 'journalctl -xn' for details.", strna(d->name), strna(d->name));
+                else if (!streq(d->result, "done") && !streq(d->result, "skipped")) {
+                        if (d->name) {
+                                bool quotes;
+
+                                quotes = chars_intersect(d->name, SHELL_NEED_QUOTES);
+
+                                log_error("Job for %s failed. See \"systemctl status %s%s%s\" and \"journalctl -xn\" for details.",
+                                          d->name,
+                                          quotes ? "'" : "", d->name, quotes ? "'" : "");
+                        } else
+                                log_error("Job failed. See \"journalctl -xn\" for details.");
+                }

         }
 
         if (streq(d->result, "timeout"))
         }
 
         if (streq(d->result, "timeout"))


@@ -2382,7 +2392,7 @@ static int wait_for_jobs(sd_bus *bus, Set *s) {
         while (!set_isempty(s)) {
                 q = bus_process_wait(bus);
                 if (q < 0) {
         while (!set_isempty(s)) {
                 q = bus_process_wait(bus);
                 if (q < 0) {

-                        log_error("Failed to wait for response: %s", strerror(-r));
+                        log_error("Failed to wait for response: %s", strerror(-q));

                         return q;
                 }
 
                         return q;
                 }
 


@@ -2736,7 +2746,7 @@ static int start_unit(sd_bus *bus, char **args) {
                         return r;
                 }
 
                         return r;
                 }
 

-                s = set_new(string_hash_func, string_compare_func);
+                s = set_new(&string_hash_ops);

                 if (!s)
                         return log_oom();
         }
                 if (!s)
                         return log_oom();
         }


@@ -4439,7 +4449,6 @@ static int show(sd_bus *bus, char **args) {
 }
 
 static int cat(sd_bus *bus, char **args) {
 }
 
 static int cat(sd_bus *bus, char **args) {

-        _cleanup_free_ char *unit = NULL;

         _cleanup_strv_free_ char **names = NULL;
         char **name;
         bool first = true;
         _cleanup_strv_free_ char **names = NULL;
         char **name;
         bool first = true;


@@ -4457,7 +4466,7 @@ static int cat(sd_bus *bus, char **args) {
         STRV_FOREACH(name, names) {
                 _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
                 _cleanup_strv_free_ char **dropin_paths = NULL;
         STRV_FOREACH(name, names) {
                 _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
                 _cleanup_strv_free_ char **dropin_paths = NULL;

-                _cleanup_free_ char *fragment_path = NULL;
+                _cleanup_free_ char *fragment_path = NULL, *unit = NULL;

                 char **path;
 
                 unit = unit_dbus_path_from_name(*name);
                 char **path;
 
                 unit = unit_dbus_path_from_name(*name);


@@ -4827,7 +4836,7 @@ static int switch_root(sd_bus *bus, char **args) {
                 const char *root_systemd_path = NULL, *root_init_path = NULL;
 
                 root_systemd_path = strappenda(root, "/" SYSTEMD_BINARY_PATH);
                 const char *root_systemd_path = NULL, *root_init_path = NULL;
 
                 root_systemd_path = strappenda(root, "/" SYSTEMD_BINARY_PATH);

-                root_init_path = strappenda3(root, "/", init);
+                root_init_path = strappenda(root, "/", init);

 
                 /* If the passed init is actually the same as the
                  * systemd binary, then let's suppress it. */
 
                 /* If the passed init is actually the same as the
                  * systemd binary, then let's suppress it. */


@@ -5432,7 +5441,7 @@ static int is_system_running(sd_bus *bus, char **args) {
         return streq(state, "running") ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
         return streq(state, "running") ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 

-static int systemctl_help(void) {
+static void systemctl_help(void) {

 
         pager_open_if_enabled();
 
 
         pager_open_if_enabled();
 


@@ -5557,12 +5566,9 @@ static int systemctl_help(void) {
                "  hibernate                       Hibernate the system\n"
                "  hybrid-sleep                    Hibernate and suspend the system\n",
                program_invocation_short_name);
                "  hibernate                       Hibernate the system\n"
                "  hybrid-sleep                    Hibernate and suspend the system\n",
                program_invocation_short_name);

-
-        return 0;

 }
 
 }
 

-static int halt_help(void) {
-
+static void halt_help(void) {

         printf("%s [OPTIONS...]%s\n\n"
                "%s the system.\n\n"
                "     --help      Show this help\n"
         printf("%s [OPTIONS...]%s\n\n"
                "%s the system.\n\n"
                "     --help      Show this help\n"


@@ -5578,12 +5584,9 @@ static int halt_help(void) {
                arg_action == ACTION_REBOOT   ? "Reboot" :
                arg_action == ACTION_POWEROFF ? "Power off" :
                                                "Halt");
                arg_action == ACTION_REBOOT   ? "Reboot" :
                arg_action == ACTION_POWEROFF ? "Power off" :
                                                "Halt");

-
-        return 0;

 }
 
 }
 

-static int shutdown_help(void) {
-
+static void shutdown_help(void) {

         printf("%s [OPTIONS...] [TIME] [WALL...]\n\n"
                "Shut down the system.\n\n"
                "     --help      Show this help\n"
         printf("%s [OPTIONS...] [TIME] [WALL...]\n\n"
                "Shut down the system.\n\n"
                "     --help      Show this help\n"


@@ -5595,12 +5598,9 @@ static int shutdown_help(void) {
                "     --no-wall   Don't send wall message before halt/power-off/reboot\n"
                "  -c             Cancel a pending shutdown\n",
                program_invocation_short_name);
                "     --no-wall   Don't send wall message before halt/power-off/reboot\n"
                "  -c             Cancel a pending shutdown\n",
                program_invocation_short_name);

-
-        return 0;

 }
 
 }
 

-static int telinit_help(void) {
-
+static void telinit_help(void) {

         printf("%s [OPTIONS...] {COMMAND}\n\n"
                "Send control commands to the init daemon.\n\n"
                "     --help      Show this help\n"
         printf("%s [OPTIONS...] {COMMAND}\n\n"
                "Send control commands to the init daemon.\n\n"
                "     --help      Show this help\n"


@@ -5613,32 +5613,26 @@ static int telinit_help(void) {
                "  q, Q           Reload init daemon configuration\n"
                "  u, U           Reexecute init daemon\n",
                program_invocation_short_name);
                "  q, Q           Reload init daemon configuration\n"
                "  u, U           Reexecute init daemon\n",
                program_invocation_short_name);

-
-        return 0;

 }
 
 }
 

-static int runlevel_help(void) {
-
+static void runlevel_help(void) {

         printf("%s [OPTIONS...]\n\n"
                "Prints the previous and current runlevel of the init system.\n\n"
                "     --help      Show this help\n",
                program_invocation_short_name);
         printf("%s [OPTIONS...]\n\n"
                "Prints the previous and current runlevel of the init system.\n\n"
                "     --help      Show this help\n",
                program_invocation_short_name);

-
-        return 0;

 }
 
 }
 

-static int help_types(void) {
+static void help_types(void) {

         int i;
         const char *t;
 
         int i;
         const char *t;
 

-        puts("Available unit types:");
+        if (!arg_no_legend)
+                puts("Available unit types:");

         for (i = 0; i < _UNIT_TYPE_MAX; i++) {
                 t = unit_type_to_string(i);
                 if (t)
                         puts(t);
         }
         for (i = 0; i < _UNIT_TYPE_MAX; i++) {
                 t = unit_type_to_string(i);
                 if (t)
                         puts(t);
         }

-
-        return 0;

 }
 
 static int systemctl_parse_argv(int argc, char *argv[]) {
 }
 
 static int systemctl_parse_argv(int argc, char *argv[]) {


@@ -5720,12 +5714,13 @@ static int systemctl_parse_argv(int argc, char *argv[]) {
         assert(argc >= 0);
         assert(argv);
 
         assert(argc >= 0);
         assert(argv);
 

-        while ((c = getopt_long(argc, argv, "ht:p:alqfs:H:M:n:o:ir", options, NULL)) >= 0) {
+        while ((c = getopt_long(argc, argv, "ht:p:alqfs:H:M:n:o:ir", options, NULL)) >= 0)

 
                 switch (c) {
 
                 case 'h':
 
                 switch (c) {
 
                 case 'h':

-                        return systemctl_help();
+                        systemctl_help();
+                        return 0;

 
                 case ARG_VERSION:
                         puts(PACKAGE_STRING);
 
                 case ARG_VERSION:
                         puts(PACKAGE_STRING);


@@ -5993,7 +5988,6 @@ static int systemctl_parse_argv(int argc, char *argv[]) {
                 default:
                         assert_not_reached("Unhandled option");
                 }
                 default:
                         assert_not_reached("Unhandled option");
                 }

-        }

 
         if (arg_transport != BUS_TRANSPORT_LOCAL && arg_scope != UNIT_FILE_SYSTEM) {
                 log_error("Cannot access user instance remotely.");
 
         if (arg_transport != BUS_TRANSPORT_LOCAL && arg_scope != UNIT_FILE_SYSTEM) {
                 log_error("Cannot access user instance remotely.");


@@ -6033,11 +6027,12 @@ static int halt_parse_argv(int argc, char *argv[]) {
                 if (runlevel == '0' || runlevel == '6')
                         arg_force = 2;
 
                 if (runlevel == '0' || runlevel == '6')
                         arg_force = 2;
 

-        while ((c = getopt_long(argc, argv, "pfwdnih", options, NULL)) >= 0) {
+        while ((c = getopt_long(argc, argv, "pfwdnih", options, NULL)) >= 0)

                 switch (c) {
 
                 case ARG_HELP:
                 switch (c) {
 
                 case ARG_HELP:

-                        return halt_help();
+                        halt_help();
+                        return 0;

 
                 case ARG_HALT:
                         arg_action = ACTION_HALT;
 
                 case ARG_HALT:
                         arg_action = ACTION_HALT;


@@ -6080,7 +6075,6 @@ static int halt_parse_argv(int argc, char *argv[]) {
                 default:
                         assert_not_reached("Unhandled option");
                 }
                 default:
                         assert_not_reached("Unhandled option");
                 }

-        }

 
         if (arg_action == ACTION_REBOOT && (argc == optind || argc == optind + 1)) {
                 r = update_reboot_param_file(argc == optind + 1 ? argv[optind] : NULL);
 
         if (arg_action == ACTION_REBOOT && (argc == optind || argc == optind + 1)) {
                 r = update_reboot_param_file(argc == optind + 1 ? argv[optind] : NULL);


@@ -6165,11 +6159,12 @@ static int shutdown_parse_argv(int argc, char *argv[]) {
         assert(argc >= 0);
         assert(argv);
 
         assert(argc >= 0);
         assert(argv);
 

-        while ((c = getopt_long(argc, argv, "HPrhkt:afFc", options, NULL)) >= 0) {
+        while ((c = getopt_long(argc, argv, "HPrhkt:afFc", options, NULL)) >= 0)

                 switch (c) {
 
                 case ARG_HELP:
                 switch (c) {
 
                 case ARG_HELP:

-                        return shutdown_help();
+                        shutdown_help();
+                        return 0;

 
                 case 'H':
                         arg_action = ACTION_HALT;
 
                 case 'H':
                         arg_action = ACTION_HALT;


@@ -6218,7 +6213,6 @@ static int shutdown_parse_argv(int argc, char *argv[]) {
                 default:
                         assert_not_reached("Unhandled option");
                 }
                 default:
                         assert_not_reached("Unhandled option");
                 }

-        }

 
         if (argc > optind && arg_action != ACTION_CANCEL_SHUTDOWN) {
                 r = parse_time_spec(argv[optind], &arg_when);
 
         if (argc > optind && arg_action != ACTION_CANCEL_SHUTDOWN) {
                 r = parse_time_spec(argv[optind], &arg_when);


@@ -6279,11 +6273,12 @@ static int telinit_parse_argv(int argc, char *argv[]) {
         assert(argc >= 0);
         assert(argv);
 
         assert(argc >= 0);
         assert(argv);
 

-        while ((c = getopt_long(argc, argv, "", options, NULL)) >= 0) {
+        while ((c = getopt_long(argc, argv, "", options, NULL)) >= 0)

                 switch (c) {
 
                 case ARG_HELP:
                 switch (c) {
 
                 case ARG_HELP:

-                        return telinit_help();
+                        telinit_help();
+                        return 0;

 
                 case ARG_NO_WALL:
                         arg_no_wall = true;
 
                 case ARG_NO_WALL:
                         arg_no_wall = true;


@@ -6295,10 +6290,10 @@ static int telinit_parse_argv(int argc, char *argv[]) {
                 default:
                         assert_not_reached("Unhandled option");
                 }
                 default:
                         assert_not_reached("Unhandled option");
                 }

-        }

 
         if (optind >= argc) {
 
         if (optind >= argc) {

-                telinit_help();
+                log_error("%s: required argument missing.",
+                          program_invocation_short_name);

                 return -EINVAL;
         }
 
                 return -EINVAL;
         }
 


@@ -6344,11 +6339,12 @@ static int runlevel_parse_argv(int argc, char *argv[]) {
         assert(argc >= 0);
         assert(argv);
 
         assert(argc >= 0);
         assert(argv);
 

-        while ((c = getopt_long(argc, argv, "", options, NULL)) >= 0) {
+        while ((c = getopt_long(argc, argv, "", options, NULL)) >= 0)

                 switch (c) {
 
                 case ARG_HELP:
                 switch (c) {
 
                 case ARG_HELP:

-                        return runlevel_help();
+                        runlevel_help();
+                        return 0;

 
                 case '?':
                         return -EINVAL;
 
                 case '?':
                         return -EINVAL;


@@ -6356,7 +6352,6 @@ static int runlevel_parse_argv(int argc, char *argv[]) {
                 default:
                         assert_not_reached("Unhandled option");
                 }
                 default:
                         assert_not_reached("Unhandled option");
                 }

-        }

 
         if (optind < argc) {
                 log_error("Too many arguments.");
 
         if (optind < argc) {
                 log_error("Too many arguments.");


@@ -6842,7 +6837,7 @@ static int runlevel_main(void) {
 }
 
 int main(int argc, char*argv[]) {
 }
 
 int main(int argc, char*argv[]) {

-        _cleanup_bus_unref_ sd_bus *bus = NULL;
+        _cleanup_bus_close_unref_ sd_bus *bus = NULL;

         int r;
 
         setlocale(LC_ALL, "");
         int r;
 
         setlocale(LC_ALL, "");