From: Karel Zak <kzak@redhat.com>
Date: Thu, 29 May 2014 13:08:26 +0000 (+0200)
Subject: lslogins: fix pretty-print columns
X-Git-Tag: v2.25-rc1~66
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=27e6e446b9d3cc487917a1ae3b7114dd1ef37113;p=thirdparty%2Futil-linux.git

lslogins: fix pretty-print columns

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

diff --git a/login-utils/lslogins.c b/login-utils/lslogins.c
index fd8014d8d6..d869a23ef2 100644
--- a/login-utils/lslogins.c
+++ b/login-utils/lslogins.c
@@ -1388,9 +1388,9 @@ int main(int argc, char *argv[])
 	if (lslogins_flag & F_USRAC && lslogins_flag & F_SYSAC)
 		lslogins_flag &= ~(F_USRAC | F_SYSAC);
 
-	if (!ncolumns && outmode == OUT_PRETTY) {
+	if (outmode == OUT_PRETTY && !opt_o) {
 		/* all columns for lslogins <username> */
-		for (i = 0; i < ARRAY_SIZE(coldescs); i++)
+		for (ncolumns = 0, i = 0; i < ARRAY_SIZE(coldescs); i++)
 			 columns[ncolumns++] = i;
 
 	} else if (ncolumns == 2 && !opt_o) {