libsmartcols: fix minimal column width calculation

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/libsmartcols/src/table_print.c b/libsmartcols/src/table_print.c
index 28f6f7a5c73cb2dcc65b4043fead31f7cee20e71..d625f8148609dae9a12b76335d6bee68594a2216 100644 (file)
--- a/libsmartcols/src/table_print.c
+++ b/libsmartcols/src/table_print.c
@@ -963,10 +963,12 @@ static int count_column_width(struct libscols_table *tb,
        assert(cl);
 
        cl->width = 0;
-
        if (!cl->width_min) {
-               if (cl->width_hint < 1 && scols_table_is_maxout(tb) && tb->is_term)
-                       cl->width_min = (size_t) (cl->width_hint * tb->termwidth) - (is_last_column(cl) ? 0 : 1);
+               if (cl->width_hint < 1 && scols_table_is_maxout(tb) && tb->is_term) {
+                       cl->width_min = (size_t) (cl->width_hint * tb->termwidth);
+                       if (cl->width_min && !is_last_column(cl))
+                               cl->width_min--;
+               }
                if (scols_cell_get_data(&cl->header)) {
                        size_t len = mbs_safe_width(scols_cell_get_data(&cl->header));
                        cl->width_min = max(cl->width_min, len);