From nobody Thu May 16 17:11:23 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VgGpM2B4Sz5LYQY; Thu, 16 May 2024 17:11:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VgGpM1MPSz4NHc; Thu, 16 May 2024 17:11:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715879483; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VDj42nhnlH0PhXGcpaBhZ6AHosQMRSymKbQSopn1kpU=; b=uh+GSXMF/PTW/4ZpMGcLQZY2FJKtKtZ5QGgAernxzI3zQ0SUNVdiuolEIiua+llsDqa8qJ HQ+GFyvV5ozLsklOleH68buxAGV8jA9/R7nHh0cz8lEqYtq+xZuK5/87G3ZSiCWibyYfRf Q6/mx7qlq/i0ibTCNKLtOVSOch+QdgNgB0nxSoungpL6P0KlBcUO/3hfcHXFCTrllQpBpq cCSQ9xj1t2i0hpG7xAaIPGeXRVSRT50vl4TgEfk4ApGjE74IbmuMwwEOVPkFzqxG30ezt5 myQ7ldUQPTxW0IL10ghHplyauydGozoZnCJbvbvWTS24TbkM78yJvz591C8ckw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715879483; a=rsa-sha256; cv=none; b=DyEpqbOQvqshMAmDJ5UJ9lGQY8p/RknAL/l0Up960SiGmK+pVtLjtJ645ikUVp8F2CJh7l pI8OSlmHY66QvqC5GZAEp8VLQTMnqMaMr85WxuRtxDAE+/KO6jNe6HqDtmHLBEO5ugn54r XSAXHwdHuuXXBiX6S1e1zJIpst0n44GndsetbBa8h3H5MS8PD7GZ/mYEzccr4U9QNGbL6u vCErvStSHrr7arr6aIoo0bVV+EbWBXCrgMqX4DEtqex2k12sfO4KvSTjtlkCJyzxMOIwz+ gIP1oPUqVztqobTwIE4Y0RSVpdHnL8XlRJpUzRJMP1HEYqMRtMbIXJbH79aVWw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715879483; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VDj42nhnlH0PhXGcpaBhZ6AHosQMRSymKbQSopn1kpU=; b=w+nkU8kOp6I7XcrNoyiIyOBRaNSIvLv9y8Uqrr91OyMWNWBUoN/e04AaI9y8p2m3igtweb ZI978aV7EwJ8Jps+q8TkA/j8MxJkiYFXZrItdlyn8N/HKe4zCeJFpkvxwQ4VQlnV54720F X9knctm39nxb1eAOJb+R2GsIjd0DfXeI4LMMHrN9hCJzV1bkMgIsgJoESgYSLm2xhH2Yum Km6vt6pLAlHKRaSPXinIZUJH09A/sbp6rcRlgiY7Lf2hQBCDG+QMi0h1bjoR8jYFZtxUXk ETONrNrEVLXYDr4V+hg7yktUJrKiN8qBuY6YDHjhdybvlRPNJcgjYE4JB1ifDg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VgGpM0z1hz16mn; Thu, 16 May 2024 17:11:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44GHBN8x034211; Thu, 16 May 2024 17:11:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44GHBNxH034208; Thu, 16 May 2024 17:11:23 GMT (envelope-from git) Date: Thu, 16 May 2024 17:11:23 GMT Message-Id: <202405161711.44GHBNxH034208@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: ae9c0ba8ef2f - main - netstat(8): for -W, use IFNAMSIZ List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ae9c0ba8ef2f540f9030909cf07e3c59f876fd23 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=ae9c0ba8ef2f540f9030909cf07e3c59f876fd23 commit ae9c0ba8ef2f540f9030909cf07e3c59f876fd23 Author: Lexi Winter AuthorDate: 2024-05-14 23:40:32 +0000 Commit: Warner Losh CommitDate: 2024-05-16 17:07:34 +0000 netstat(8): for -W, use IFNAMSIZ If -W is specified, use IFNAMSIZ as the width of the Netif column, instead of the default 12. Reviewed by: imp,zlei,Mina Galić Pull Request: https://github.com/freebsd/freebsd-src/pull/1223 --- usr.bin/netstat/nhops.c | 2 +- usr.bin/netstat/route.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.bin/netstat/nhops.c b/usr.bin/netstat/nhops.c index 1db3c2d37167..1a5d8eee74b1 100644 --- a/usr.bin/netstat/nhops.c +++ b/usr.bin/netstat/nhops.c @@ -64,7 +64,7 @@ #include "common.h" /* column widths; each followed by one space */ -#define WID_IF_DEFAULT 12 /* width of netif column */ +#define WID_IF_DEFAULT (Wflag ? IFNAMSIZ : 12) /* width of netif column */ #ifndef INET6 #define WID_DST_DEFAULT(af) 18 /* width of destination column */ #define WID_GW_DEFAULT(af) 18 /* width of gateway column */ diff --git a/usr.bin/netstat/route.c b/usr.bin/netstat/route.c index 93e882052de2..482fb07ff950 100644 --- a/usr.bin/netstat/route.c +++ b/usr.bin/netstat/route.c @@ -184,7 +184,7 @@ pr_family(int af1) } /* column widths; each followed by one space */ -#define WID_IF_DEFAULT 12 /* width of netif column */ +#define WID_IF_DEFAULT (Wflag ? IFNAMSIZ : 12) /* width of netif column */ #ifndef INET6 #define WID_DST_DEFAULT(af) 18 /* width of destination column */ #define WID_GW_DEFAULT(af) 18 /* width of gateway column */