delta: draw arrows with draw_special_char()

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

diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index aa231e2422c7489d5b2213731b0814dd76f5ac53..7bc8ece0424c3f063caebe822424e292d0e58836 100644 (file)
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -998,6 +998,7 @@ static int get_last_trigger(
 }
 
 struct timer_info {
 }
 
 struct timer_info {

+        const char* machine;

         const char* id;
         usec_t next_elapse;
         usec_t last_trigger;
         const char* id;
         usec_t next_elapse;
         usec_t last_trigger;


@@ -1005,9 +1006,21 @@ struct timer_info {
 };
 
 static int timer_info_compare(const struct timer_info *a, const struct timer_info *b) {
 };
 
 static int timer_info_compare(const struct timer_info *a, const struct timer_info *b) {

+        int o;
+

         assert(a);
         assert(b);
 
         assert(a);
         assert(b);
 

+        if (!a->machine && b->machine)
+                return -1;
+        if (a->machine && !b->machine)
+                return 1;
+        if (a->machine && b->machine) {
+                o = strcasecmp(a->machine, b->machine);
+                if (o != 0)
+                        return o;
+        }
+

         if (a->next_elapse < b->next_elapse)
                 return -1;
         if (a->next_elapse > b->next_elapse)
         if (a->next_elapse < b->next_elapse)
                 return -1;
         if (a->next_elapse > b->next_elapse)


@@ -1054,7 +1067,7 @@ static int output_timers_list(struct timer_info *timer_infos, unsigned n) {
                         passedlen = MAX(passedlen, strlen(trel));
                 }
 
                         passedlen = MAX(passedlen, strlen(trel));
                 }
 

-                unitlen = MAX(unitlen, strlen(t->id));
+                unitlen = MAX(unitlen, strlen(t->id) + (t->machine ? strlen(t->machine)+1 : 0));

 
                 STRV_FOREACH(a, t->triggered)
                         ul += strlen(*a) + 2*(a != t->triggered);
 
                 STRV_FOREACH(a, t->triggered)
                         ul += strlen(*a) + 2*(a != t->triggered);


@@ -1073,6 +1086,8 @@ static int output_timers_list(struct timer_info *timer_infos, unsigned n) {
                                           "ACTIVATES");
 
                 for (t = timer_infos; t < timer_infos + n; t++) {
                                           "ACTIVATES");
 
                 for (t = timer_infos; t < timer_infos + n; t++) {

+                        _cleanup_free_ char *j = NULL;
+                        const char *unit;

                         char tstamp1[FORMAT_TIMESTAMP_MAX] = "n/a", trel1[FORMAT_TIMESTAMP_RELATIVE_MAX] = "n/a";
                         char tstamp2[FORMAT_TIMESTAMP_MAX] = "n/a", trel2[FORMAT_TIMESTAMP_RELATIVE_MAX] = "n/a";
                         char **a;
                         char tstamp1[FORMAT_TIMESTAMP_MAX] = "n/a", trel1[FORMAT_TIMESTAMP_RELATIVE_MAX] = "n/a";
                         char tstamp2[FORMAT_TIMESTAMP_MAX] = "n/a", trel2[FORMAT_TIMESTAMP_RELATIVE_MAX] = "n/a";
                         char **a;


@@ -1083,8 +1098,16 @@ static int output_timers_list(struct timer_info *timer_infos, unsigned n) {
                         format_timestamp(tstamp2, sizeof(tstamp2), t->last_trigger);
                         format_timestamp_relative(trel2, sizeof(trel2), t->last_trigger);
 
                         format_timestamp(tstamp2, sizeof(tstamp2), t->last_trigger);
                         format_timestamp_relative(trel2, sizeof(trel2), t->last_trigger);
 

+                        if (t->machine) {
+                                j = strjoin(t->machine, ":", t->id, NULL);
+                                if (!j)
+                                        return log_oom();
+                                unit = j;
+                        } else
+                                unit = t->id;
+

                         printf("%-*s %-*s %-*s %-*s %-*s",
                         printf("%-*s %-*s %-*s %-*s %-*s",

-                               nextlen, tstamp1, leftlen, trel1, lastlen, tstamp2, passedlen, trel2, unitlen, t->id);
+                               nextlen, tstamp1, leftlen, trel1, lastlen, tstamp2, passedlen, trel2, unitlen, unit);

 
                         STRV_FOREACH(a, t->triggered)
                                 printf("%s %s",
 
                         STRV_FOREACH(a, t->triggered)
                                 printf("%s %s",


@@ -1136,8 +1159,8 @@ static usec_t calc_next_elapse(dual_timestamp *nw, dual_timestamp *next) {
 }
 
 static int list_timers(sd_bus *bus, char **args) {
 }
 
 static int list_timers(sd_bus *bus, char **args) {

-
-        _cleanup_bus_message_unref_ sd_bus_message *reply = NULL;
+        _cleanup_(message_set_freep) Set *replies = NULL;
+        _cleanup_strv_free_ char **machines = NULL;

         _cleanup_free_ struct timer_info *timer_infos = NULL;
         _cleanup_free_ UnitInfo *unit_infos = NULL;
         struct timer_info *t;
         _cleanup_free_ struct timer_info *timer_infos = NULL;
         _cleanup_free_ UnitInfo *unit_infos = NULL;
         struct timer_info *t;


@@ -1149,7 +1172,7 @@ static int list_timers(sd_bus *bus, char **args) {
 
         pager_open_if_enabled();
 
 
         pager_open_if_enabled();
 

-        n = get_unit_list(bus, NULL, strv_skip_first(args), &unit_infos, 0, &reply);
+        n = get_unit_list_recursive(bus, strv_skip_first(args), &unit_infos, &replies, &machines);

         if (n < 0)
                 return n;
 
         if (n < 0)
                 return n;
 


@@ -1181,6 +1204,7 @@ static int list_timers(sd_bus *bus, char **args) {
                 m = calc_next_elapse(&nw, &next);
 
                 timer_infos[c++] = (struct timer_info) {
                 m = calc_next_elapse(&nw, &next);
 
                 timer_infos[c++] = (struct timer_info) {

+                        .machine = u->machine,

                         .id = u->id,
                         .next_elapse = m,
                         .last_trigger = last,
                         .id = u->id,
                         .next_elapse = m,
                         .last_trigger = last,


@@ -1406,7 +1430,7 @@ static int list_dependencies_print(const char *name, int level, unsigned int bra
                                 printf("%s...\n",max_len % 2 ? "" : " ");
                                 return 0;
                         }
                                 printf("%s...\n",max_len % 2 ? "" : " ");
                                 return 0;
                         }

-                        printf("%s", draw_special_char(branches & (1 << i) ? DRAW_TREE_VERT : DRAW_TREE_SPACE));
+                        printf("%s", draw_special_char(branches & (1 << i) ? DRAW_TREE_VERTICAL : DRAW_TREE_SPACE));

                 }
                 len += 2;
 
                 }
                 len += 2;
 


@@ -1574,9 +1598,9 @@ static int list_dependencies_one(
 
                 state = check_one_unit(bus, *c, "activating\0active\0reloading\0", true);
                 if (state > 0)
 
                 state = check_one_unit(bus, *c, "activating\0active\0reloading\0", true);
                 if (state > 0)

-                        printf("%s%s%s", ansi_highlight_green(), draw_special_char(DRAW_BLACK_CIRCLE), ansi_highlight_off());
+                        printf("%s%s%s ", ansi_highlight_green(), draw_special_char(DRAW_BLACK_CIRCLE), ansi_highlight_off());

                 else
                 else

-                        printf("%s%s%s", ansi_highlight_red(), draw_special_char(DRAW_BLACK_CIRCLE), ansi_highlight_off());
+                        printf("%s%s%s ", ansi_highlight_red(), draw_special_char(DRAW_BLACK_CIRCLE), ansi_highlight_off());

 
                 r = list_dependencies_print(*c, level, branches, c[1] == NULL);
                 if (r < 0)
 
                 r = list_dependencies_print(*c, level, branches, c[1] == NULL);
                 if (r < 0)


@@ -1809,7 +1833,7 @@ static void output_machines_list(struct machine_info *machine_infos, unsigned n)
                         on_failed = off_failed = "";
 
                 if (circle_len > 0)
                         on_failed = off_failed = "";
 
                 if (circle_len > 0)

-                        printf("%s%s%s", on_state, circle ? draw_special_char(DRAW_BLACK_CIRCLE) : "  ", off_state);
+                        printf("%s%s%s ", on_state, circle ? draw_special_char(DRAW_BLACK_CIRCLE) : " ", off_state);

 
                 if (m->is_host)
                         printf("%-*s (host) %s%-*s%s %s%*u%s %*u\n",
 
                 if (m->is_host)
                         printf("%-*s (host) %s%-*s%s %s%*u%s %*u\n",


@@ -1944,7 +1968,7 @@ static int set_default(sd_bus *bus, char **args) {
                 return log_oom();
 
         if (!bus || avoid_bus()) {
                 return log_oom();
 
         if (!bus || avoid_bus()) {

-                r = unit_file_set_default(arg_scope, arg_root, unit, arg_force, &changes, &n_changes);
+                r = unit_file_set_default(arg_scope, arg_root, unit, true, &changes, &n_changes);

                 if (r < 0) {
                         log_error("Failed to set default target: %s", strerror(-r));
                         return r;
                 if (r < 0) {
                         log_error("Failed to set default target: %s", strerror(-r));
                         return r;


@@ -1966,7 +1990,7 @@ static int set_default(sd_bus *bus, char **args) {
                                 "SetDefaultTarget",
                                 &error,
                                 &reply,
                                 "SetDefaultTarget",
                                 &error,
                                 &reply,

-                                "sb", unit, arg_force);
+                                "sb", unit, true);

                 if (r < 0) {
                         log_error("Failed to set default target: %s", bus_error_message(&error, -r));
                         return r;
                 if (r < 0) {
                         log_error("Failed to set default target: %s", bus_error_message(&error, -r));
                         return r;


@@ -3210,7 +3234,7 @@ static void print_status_info(
         } else
                 active_on = active_off = "";
 
         } else
                 active_on = active_off = "";
 

-        printf("%s%s%s%s", active_on, draw_special_char(DRAW_BLACK_CIRCLE), active_off, strna(i->id));
+        printf("%s%s%s %s", active_on, draw_special_char(DRAW_BLACK_CIRCLE), active_off, strna(i->id));

 
         if (i->description && !streq_ptr(i->id, i->description))
                 printf(" - %s", i->description);
 
         if (i->description && !streq_ptr(i->id, i->description))
                 printf(" - %s", i->description);


@@ -4314,7 +4338,7 @@ static int show_system_status(sd_bus *bus) {
         } else
                 on = off = "";
 
         } else
                 on = off = "";
 

-        printf("%s%s%s%s\n", on, draw_special_char(DRAW_BLACK_CIRCLE), off, arg_host ? arg_host : hn);
+        printf("%s%s%s %s\n", on, draw_special_char(DRAW_BLACK_CIRCLE), off, arg_host ? arg_host : hn);

 
         printf("    State: %s%s%s\n",
                on, strna(mi.state), off);
 
         printf("    State: %s%s%s\n",
                on, strna(mi.state), off);


@@ -5994,13 +6018,10 @@ static int halt_parse_argv(int argc, char *argv[]) {
                 }
         }
 
                 }
         }
 

-        if (arg_action == ACTION_REBOOT && argc == optind + 1) {
-                r = write_string_file(REBOOT_PARAM_FILE, argv[optind]);
-                if (r < 0) {
-                        log_error("Failed to write reboot param to "
-                                  REBOOT_PARAM_FILE": %s", strerror(-r));
+        if (arg_action == ACTION_REBOOT && (argc == optind || argc == optind + 1)) {
+                r = update_reboot_param_file(argc == optind + 1 ? argv[optind] : NULL);
+                if (r < 0)

                         return r;
                         return r;

-                }

         } else if (optind < argc) {
                 log_error("Too many arguments.");
                 return -EINVAL;
         } else if (optind < argc) {
                 log_error("Too many arguments.");
                 return -EINVAL;