From: Karel Zak <kzak@redhat.com>
Date: Tue, 12 Dec 2017 12:19:36 +0000 (+0100)
Subject: libsmartcols: don't add blank padding after left aligned title
X-Git-Tag: v2.31.1~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1b4613f7571b93347c83019ff4befc3bafce7173;p=thirdparty%2Futil-linux.git

libsmartcols: don't add blank padding after left aligned title

Let's use the same semantic for the title as for the last column in
the table. If aligned on left, table is not "maxout" and title padding
symbol is undefined (or blank) then keep title as short as possible.

Addresses: https://github.com/karelzak/util-linux/issues/549
Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/libsmartcols/src/table_print.c b/libsmartcols/src/table_print.c
index 6acaf9b4e8..2e1c55ee11 100644
--- a/libsmartcols/src/table_print.c
+++ b/libsmartcols/src/table_print.c
@@ -761,7 +761,7 @@ static int print_title(struct libscols_table *tb)
 {
 	int rc, color = 0;
 	mbs_align_t align;
-	size_t width, bufsz, titlesz;
+	size_t width, len = 0, bufsz, titlesz;
 	char *title = NULL, *buf = NULL;
 
 	assert(tb);
@@ -773,7 +773,7 @@ static int print_title(struct libscols_table *tb)
 
 	/* encode data */
 	if (tb->no_encode) {
-		bufsz = strlen(tb->title.data) + 1;
+		len = bufsz = strlen(tb->title.data) + 1;
 		buf = strdup(tb->title.data);
 		if (!buf) {
 			rc = -ENOMEM;
@@ -791,8 +791,8 @@ static int print_title(struct libscols_table *tb)
 			goto done;
 		}
 
-		if (!mbs_safe_encode_to_buffer(tb->title.data, &bufsz, buf, NULL) ||
-		    !bufsz || bufsz == (size_t) -1) {
+		if (!mbs_safe_encode_to_buffer(tb->title.data, &len, buf, NULL) ||
+		    !len || len == (size_t) -1) {
 			rc = -EINVAL;
 			goto done;
 		}
@@ -818,6 +818,14 @@ static int print_title(struct libscols_table *tb)
 	case SCOLS_CELL_FL_LEFT:
 	default:
 		align = MBS_ALIGN_LEFT;
+		/*
+		 * Don't print extra blank chars after the title if on left
+		 * (that's same as we use for the last column in the table).
+		 */
+		if (len < width
+		    && !scols_table_is_maxout(tb)
+		    && isblank(*titlepadding_symbol(tb)))
+			width = len;
 		break;
 
 	}