From: Karel Zak <kzak@redhat.com>
Date: Tue, 13 Feb 2024 09:53:41 +0000 (+0100)
Subject: dmesg: don't affect delta by --since
X-Git-Tag: v2.42-start~533^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=68d4b8f02adba9b53f563095d6abe99146d4d8ad;p=thirdparty%2Futil-linux.git

dmesg: don't affect delta by --since

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

diff --git a/sys-utils/dmesg.c b/sys-utils/dmesg.c
index cc24334de..3dde45d54 100644
--- a/sys-utils/dmesg.c
+++ b/sys-utils/dmesg.c
@@ -1122,8 +1122,12 @@ static void print_record(struct dmesg_control *ctl,
 	double delta = 0;
 	size_t format_iter = 0;
 
-	if (!accept_record(ctl, rec))
+	if (!accept_record(ctl, rec)) {
+		/* remember time of the rejected record to not affect delta for
+		 * the following records */
+		ctl->lasttime = rec->tv;
 		return;
+	}
 
 	if (!rec->mesg_size) {
 		if (!ctl->json)