ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

libsmartcols: reduce also SCOLS_FL_WRAP columns 

Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
Karel Zak 2016-01-25 15:17:36 +01:00
parent e90f4b6715
commit 5243e4ebc8
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libsmartcols/src/table_print.c
View File

@ -995,7 +995,7 @@ static int recount_widths(struct libscols_table *tb, struct libscols_buffer *buf
continue; /* never truncate columns with absolute sizes */ continue; /* never truncate columns with absolute sizes */
if (scols_column_is_tree(cl) && width <= cl->width_treeart) if (scols_column_is_tree(cl) && width <= cl->width_treeart)
continue; /* never truncate the tree */ 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; continue;
if (cl->width == cl->width_min) if (cl->width == cl->width_min)
continue; continue;
@ -1015,7 +1015,6 @@ static int recount_widths(struct libscols_table *tb, struct libscols_buffer *buf
cl->width--; cl->width--;
width--; width--;
} }
} }
if (org == width) { if (org == width) {
if (trunc_only) if (trunc_only)