systemctl: don't truncate description when using pager

https://bugs.freedesktop.org/show_bug.cgi?id=35725

diff --git a/src/systemctl.c b/src/systemctl.c
index 599894ef20f69f278d44f6090ec66d169f7268af..1507b52f92e4c4e964e9f56b7fdd2ccd18691e1f 100644 (file)
--- a/src/systemctl.c
+++ b/src/systemctl.c
@@ -387,7 +387,7 @@ static void output_units_list(const struct unit_info *unit_infos, unsigned c) {
         if (on_tty()) {
                 printf("%-25s %-6s %-*s %-*s %-*s", "UNIT", "LOAD",
                        active_len, "ACTIVE", sub_len, "SUB", job_len, "JOB");
         if (on_tty()) {
                 printf("%-25s %-6s %-*s %-*s %-*s", "UNIT", "LOAD",
                        active_len, "ACTIVE", sub_len, "SUB", job_len, "JOB");

-                if (columns() >= 80+12 || arg_full)
+                if (columns() >= 80+12 || arg_full || !arg_no_pager)

                         printf(" %s\n", "DESCRIPTION");
                 else
                         printf("\n");
                         printf(" %s\n", "DESCRIPTION");
                 else
                         printf("\n");


@@ -440,7 +440,7 @@ static void output_units_list(const struct unit_info *unit_infos, unsigned c) {
                         if (u->job_id == 0)
                                 printf(" %-*s", job_len, "");
 
                         if (u->job_id == 0)
                                 printf(" %-*s", job_len, "");
 

-                        if (arg_full)
+                        if (arg_full || !arg_no_pager)

                                 printf(" %s", u->description);
                         else
                                 printf(" %.*s", columns() - a - b - 1, u->description);
                                 printf(" %s", u->description);
                         else
                                 printf(" %.*s", columns() - a - b - 1, u->description);