From c1b355d378f73028c1f897b77088679f72b39644 Mon Sep 17 00:00:00 2001 From: Ed Maste Date: Mon, 17 Aug 2020 18:53:23 +0000 Subject: [PATCH] ipfw: line up `ipfw -t list` with and without timestamp From the PR: When I run `ipfw -t list` on release/12 or current, I get misaligned output between lines that do and do not have a last match timestamp, like so: 00100 Tue Aug 11 03:03:26 2020 allow ip from any to any via lo0 00200 deny ip from any to 127.0.0.0/8 (specifically, the "allow" and "deny" strings do not line up) PR: 248608 Submitted by: Taylor Stearns MFC after: 3 days --- sbin/ipfw/ipfw2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/ipfw/ipfw2.c b/sbin/ipfw/ipfw2.c index 830b35d2f72..e0b5371adb9 100644 --- a/sbin/ipfw/ipfw2.c +++ b/sbin/ipfw/ipfw2.c @@ -2199,7 +2199,7 @@ show_static_rule(struct cmdline_opts *co, struct format_opts *fo, *strchr(timestr, '\n') = '\0'; bprintf(bp, "%s ", timestr); } else { - bprintf(bp, "%*s", twidth, " "); + bprintf(bp, "%*s", twidth + 1, " "); } }