From nobody Thu Jul 07 05:20:36 2022 X-Original-To: dev-commits-src-main@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 976691CFF593; Thu, 7 Jul 2022 05:20:37 +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 4Ldl9d0Dl5z3JBK; Thu, 7 Jul 2022 05:20:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657171237; 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=frmtZGtWtM+F46/vIjlc18ptk34hiO5n223MpsGxv9A=; b=t+GFQAb/si2z4i46010wKEH4kvO59IvysTa5DWrD7/xlI0yoY2qyMBBAyt5GexOlLU4Puu pLhZAOlLw0tHJoNqgPujqc58E2Wx+7lsUFp4lqmSOI1W8mzTEoYhW2rYjlIP/6mzbDu5YI 7APfRZEUDqF/u3ptq/m/O06pVXRWqs6heGbIs22+I/rSkAMelrUvyTqVLEAFjVqI6LpJSU 1sd1M4v0GamaH0m2jez4yNic4yB7KPM8v4NckMFGluuL5A992lrXYHRW0hd3YsEoug/KW0 KA7c0TyrMDf/UCouxViH6TFIfMVIMrG/TqJ2VAsE8qCCMqmHJfJfRLzXg09L8Q== 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 4Ldl9c6BHjzWsR; Thu, 7 Jul 2022 05:20:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2675KacD081653; Thu, 7 Jul 2022 05:20:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2675KajJ081652; Thu, 7 Jul 2022 05:20:36 GMT (envelope-from git) Date: Thu, 7 Jul 2022 05:20:36 GMT Message-Id: <202207070520.2675KajJ081652@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: c5bdcd1f10a8 - main - sockstat(1): widen the FD printing format List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c5bdcd1f10a86e8b7754ba37d4a173294b727521 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657171237; 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=frmtZGtWtM+F46/vIjlc18ptk34hiO5n223MpsGxv9A=; b=MJ0EcLYoF9XGOxKg2Kq9Dw2QzuVAQNpL66IMjFt4WAfWNmuXHLwsqYe5quO2p1iFJMVJUT YYQ5y48i5LxRqv1Ww7F+zMulGfrEfUFF5f88r1RpHkg2cbuxfpr/Ji6T9MLUKfmo5h3L5P gfNGXum4MaAMj/J+kp4MFu81kg67GpZ/szRR5On4+31i/4Ubq1unescs+pbitRuRTxxBpm 5Pm3oIp2y5iDqMjQncHrownlGGNXtJGD++3oYkBGxeCO1xMjsrJMRATHB8UlKiBiYQ8uuE 6gdeHWPqnb8VOy5yZXGJuCOuzHsHufN9AbpXEK5BVDLArZkGI4so/B8+i8Dntw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657171237; a=rsa-sha256; cv=none; b=qJXvsuDDaZBm7DtCRQrE6gqtO/UaaHawnLNi5NgtGabVpSZZRS+vuzSrs5G87ojnjuVTnC +ijeVFWlBH17pnsdKDUaObWBzojB8UGK59QonEM1qnQoJTObBQ0Xd0PQB4XeNcN5lHzOMt BOw/7XIW3wimY7GhtXFL4Ww8cGPoUFfxWtpPzpO/isDlaTS44OgsC6uzrsIgsgECxNvSWf plD1njBwm8kdnuAZYQsyKCMgDZlBpDZAaeiXpS/edmJqZo0HrdKSBMe2PVdZ7upWaMPlEB ccmC934KdlaGvaexoEs6uDqKnv+uVYIFByGNcfQ+3Sf1N+dFZ2CR1jzkBCSrfw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=c5bdcd1f10a86e8b7754ba37d4a173294b727521 commit c5bdcd1f10a86e8b7754ba37d4a173294b727521 Author: Gleb Smirnoff AuthorDate: 2022-07-07 05:19:08 +0000 Commit: Gleb Smirnoff CommitDate: 2022-07-07 05:19:08 +0000 sockstat(1): widen the FD printing format Three digit file descriptors are very common these days. So let the columns not break with them. Reviewed by: tuexen Differential revision: https://reviews.freebsd.org/D35725 --- usr.bin/sockstat/sockstat.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/usr.bin/sockstat/sockstat.c b/usr.bin/sockstat/sockstat.c index 7f9286b95f92..143f4f0f7aca 100644 --- a/usr.bin/sockstat/sockstat.c +++ b/usr.bin/sockstat/sockstat.c @@ -1071,7 +1071,7 @@ displaysock(struct sock *s, int pos) struct addr *laddr, *faddr; struct sock *s_tmp; - while (pos < 29) + while (pos < 30) pos += xprintf(" "); pos += xprintf("%s", s->protoname); if (s->vflag & INP_IPV4) @@ -1084,7 +1084,7 @@ displaysock(struct sock *s, int pos) faddr = s->faddr; first = 1; while (laddr != NULL || faddr != NULL) { - offset = 36; + offset = 37; while (pos < offset) pos += xprintf(" "); switch (s->family) { @@ -1233,7 +1233,7 @@ display(void) int n, pos; if (opt_q != 1) { - printf("%-8s %-10s %-5s %-2s %-6s %-*s %-*s", + printf("%-8s %-10s %-5s %-3s %-6s %-*s %-*s", "USER", "COMMAND", "PID", "FD", "PROTO", opt_w ? 45 : 21, "LOCAL ADDRESS", opt_w ? 45 : 21, "FOREIGN ADDRESS"); @@ -1276,7 +1276,7 @@ display(void) pos += xprintf("%lu ", (u_long)xf->xf_pid); while (pos < 26) pos += xprintf(" "); - pos += xprintf("%d ", xf->xf_fd); + pos += xprintf("%-3d ", xf->xf_fd); displaysock(s, pos); } }