From owner-svn-src-all@freebsd.org Mon Aug 17 20:23:52 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 579BF3BB8B1; Mon, 17 Aug 2020 20:23:52 +0000 (UTC) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: from gndrsh.dnsmgr.net (br1.CN84in.dnsmgr.net [69.59.192.140]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4BVlqq4ltSz4DfJ; Mon, 17 Aug 2020 20:23:51 +0000 (UTC) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: from gndrsh.dnsmgr.net (localhost [127.0.0.1]) by gndrsh.dnsmgr.net (8.13.3/8.13.3) with ESMTP id 07HKNh1u061926; Mon, 17 Aug 2020 13:23:43 -0700 (PDT) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: (from freebsd@localhost) by gndrsh.dnsmgr.net (8.13.3/8.13.3/Submit) id 07HKNh1q061925; Mon, 17 Aug 2020 13:23:43 -0700 (PDT) (envelope-from freebsd) From: "Rodney W. Grimes" Message-Id: <202008172023.07HKNh1q061925@gndrsh.dnsmgr.net> Subject: Re: svn commit: r364321 - head/sbin/ipfw In-Reply-To: <202008171853.07HIrNAC082123@repo.freebsd.org> To: Ed Maste Date: Mon, 17 Aug 2020 13:23:43 -0700 (PDT) CC: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Reply-To: rgrimes@freebsd.org X-Mailer: ELM [version 2.4ME+ PL121h (25)] MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII X-Rspamd-Queue-Id: 4BVlqq4ltSz4DfJ X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:13868, ipnet:69.59.192.0/19, country:US] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 Aug 2020 20:23:52 -0000 [ Charset UTF-8 unsupported, converting... ] > Author: emaste > Date: Mon Aug 17 18:53:23 2020 > New Revision: 364321 > URL: https://svnweb.freebsd.org/changeset/base/364321 > > Log: > 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 > > Modified: > head/sbin/ipfw/ipfw2.c > > Modified: head/sbin/ipfw/ipfw2.c > ============================================================================== > --- head/sbin/ipfw/ipfw2.c Mon Aug 17 17:48:28 2020 (r364320) > +++ head/sbin/ipfw/ipfw2.c Mon Aug 17 18:53:23 2020 (r364321) > @@ -2199,7 +2199,7 @@ show_static_rule(struct cmdline_opts *co, struct forma > *strchr(timestr, '\n') = '\0'; > bprintf(bp, "%s ", timestr); ^ Isnt this the +1 space? > } else { > - bprintf(bp, "%*s", twidth, " "); > + bprintf(bp, "%*s", twidth + 1, " "); ^missing from this string? > } > } > > -- Rod Grimes rgrimes@freebsd.org