From: Karel Zak <kzak@redhat.com>
Date: Tue, 11 Jul 2023 09:40:39 +0000 (+0200)
Subject: dmesg: Delete redundant pager setup
X-Git-Tag: v2.40-rc1~340
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0619aa8fda39e40776dd2a73346bd7cc5ab4a33f;p=thirdparty%2Futil-linux.git

dmesg: Delete redundant pager setup

The pager is necessary only for SYSLOG_ACTION_READ* actions (print
kernel messages). Let's remove redundant global initialization.

Based on patch from Dragan Simic.

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

diff --git a/sys-utils/dmesg.c b/sys-utils/dmesg.c
index 02358e449e..59b79245b4 100644
--- a/sys-utils/dmesg.c
+++ b/sys-utils/dmesg.c
@@ -1607,7 +1607,7 @@ int main(int argc, char *argv[])
 			ctl.suspended_time = dmesg_get_suspended_time();
 	}
 
-	if (delta)
+	if (delta) {
 		switch (ctl.time_fmt) {
 		case DMESG_TIMEFTM_CTIME:
 			ctl.time_fmt = DMESG_TIMEFTM_CTIME_DELTA;
@@ -1621,15 +1621,13 @@ int main(int argc, char *argv[])
 		default:
 			ctl.time_fmt = DMESG_TIMEFTM_DELTA;
 		}
-
+	}
 
 	if (!ctl.json)
 		ctl.color = colors_init(colormode, "dmesg") ? 1 : 0;
 	if (ctl.follow)
 		nopager = 1;
 	ctl.pager = nopager ? 0 : ctl.pager;
-	if (ctl.pager)
-		pager_redirect();
 
 	switch (ctl.action) {
 	case SYSLOG_ACTION_READ_ALL: