From: Karel Zak Date: Mon, 25 Jan 2016 14:17:36 +0000 (+0100) Subject: libsmartcols: reduce also SCOLS_FL_WRAP columns X-Git-Tag: v2.28-rc1~157 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5243e4ebc8acab655c10c0fcb397132375180eb6;p=thirdparty%2Futil-linux.git libsmartcols: reduce also SCOLS_FL_WRAP columns Signed-off-by: Karel Zak --- diff --git a/libsmartcols/src/table_print.c b/libsmartcols/src/table_print.c index 02d9462d56..3a8db7f879 100644 --- a/libsmartcols/src/table_print.c +++ b/libsmartcols/src/table_print.c @@ -995,7 +995,7 @@ static int recount_widths(struct libscols_table *tb, struct libscols_buffer *buf continue; /* never truncate columns with absolute sizes */ if (scols_column_is_tree(cl) && width <= cl->width_treeart) continue; /* never truncate the tree */ - if (trunc_only && !scols_column_is_trunc(cl)) + if (trunc_only && !(scols_column_is_trunc(cl) || scols_column_is_wrap(cl))) continue; if (cl->width == cl->width_min) continue; @@ -1015,7 +1015,6 @@ static int recount_widths(struct libscols_table *tb, struct libscols_buffer *buf cl->width--; width--; } - } if (org == width) { if (trunc_only)