From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 9 Jan 2020 17:24:00 +0000 (+0100)
Subject: format-table: allow forcing arbitrary width tables
X-Git-Tag: v245-rc1~155
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bcf00b6c0a6f1399447c1a77fb62d509b8a96aa0;p=thirdparty%2Fsystemd.git

format-table: allow forcing arbitrary width tables

Useful for implementing systemctl's --full.

See #14470
---

diff --git a/src/shared/format-table.c b/src/shared/format-table.c
index 47d56dd085b..62ba0c5df3b 100644
--- a/src/shared/format-table.c
+++ b/src/shared/format-table.c
@@ -117,7 +117,8 @@ struct Table {
         size_t n_cells;
 
         bool header;   /* Whether to show the header row? */
-        size_t width;  /* If != (size_t) -1 the width to format this table in */
+        size_t width;  /* If == 0 format this as wide as necessary. If (size_t) -1 format this to console
+                        * width or less wide, but not wider. Otherwise the width to format this table in. */
 
         TableData **data;
         size_t n_allocated;
@@ -1619,9 +1620,9 @@ int table_print(Table *t, FILE *f) {
         }
 
         /* Calculate effective table width */
-        if (t->width != (size_t) -1)
+        if (t->width != 0 && t->width != (size_t) -1)
                 table_effective_width = t->width;
-        else if (pager_have() || !isatty(STDOUT_FILENO))
+        else if (t->width == 0 || pager_have() || !isatty(STDOUT_FILENO))
                 table_effective_width = table_requested_width;
         else
                 table_effective_width = MIN(table_requested_width, columns());