summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2013-04-04 21:14:32 -0400
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2013-04-05 00:17:35 -0400
commite8853816bf197afc71819e28f1316a5d5ee4b4c3 (patch)
tree24265a383c2c82815311a6dfa3dcd3e9cf408a12
parent54c7d1f454801d3053b99c16b2a371934deb0219 (diff)
systemctl: align cgroups to 'n' in 'name='
Also drop ':' in repeated Docs lines.
-rw-r--r--src/systemctl/systemctl.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index fe71085d42..a7c2eef5d4 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -2387,7 +2387,7 @@ static void print_status_info(UnitStatusInfo *i) {
printf(" %*s: %s\n", maxlen, "What", i->what);
STRV_FOREACH(t, i->documentation)
- printf(" %*s: %s\n", maxlen, t == i->documentation ? "Docs" : "", *t);
+ printf(" %*s %s\n", maxlen+1, t == i->documentation ? "Docs:" : "", *t);
STRV_FOREACH_PAIR(t, t2, i->listen)
printf(" %*s%s: %s\n", maxlen - (int)strlen(*t), "Listen", *t, *t2);
@@ -2494,10 +2494,13 @@ static void print_status_info(UnitStatusInfo *i) {
if (arg_transport != TRANSPORT_SSH) {
unsigned k = 0;
pid_t extra[2];
+ char prefix[maxlen + 4];
+ memset(prefix, ' ', sizeof(prefix) - 1);
+ prefix[sizeof(prefix) - 1] = '\0';
c = columns();
- if (c > 18)
- c -= 18;
+ if (c > sizeof(prefix) - 1)
+ c -= sizeof(prefix) - 1;
else
c = 0;
@@ -2507,7 +2510,8 @@ static void print_status_info(UnitStatusInfo *i) {
if (i->control_pid > 0)
extra[k++] = i->control_pid;
- show_cgroup_and_extra_by_spec(i->default_control_group, "\t\t ", c, false, extra, k, flags);
+ show_cgroup_and_extra_by_spec(i->default_control_group, prefix,
+ c, false, extra, k, flags);
}
}