From nobody Tue Oct 28 11:09:03 2025 X-Original-To: dev-commits-src-branches@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 4cwngg731zz6Dhp1; Tue, 28 Oct 2025 11:09:03 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cwngg6MjMz3P2Z; Tue, 28 Oct 2025 11:09:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761649743; 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=VyI6Ny3bv4yFSr1szG3w77Y0EzOvd7MiLI/hxzQ47Xw=; b=fUlvjC/hlhFSJrl11CbcltXG1iWm9+3mk1Bx7EcK1fHDbUHEg8FewfISOoWxuGwUHixC1f i60F8X30JzuC8zcY1aNdxZlIzH5gbufVi/ePH7pmHETjIjqyyd4DttnZOzbq2ddPLWm1Fu B9kWF6Nb2zwf6XJYkP68bYFc8NZ+oyF0flzM+IF35FSFp4TuC8Ig3BrphcIpsDjIrjLvk/ f7fplthiPq43tx1dk1I37R+yUUGqFwZcmImXOSgnVtH0A6E6hWBdrvUE87twBwWet376mB W88/HWPvGkRWgbDIVsaX/RdHv8T75OhzVmpz9IKIiu3tu7LzpXNRGCpJJfNbjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761649743; 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=VyI6Ny3bv4yFSr1szG3w77Y0EzOvd7MiLI/hxzQ47Xw=; b=PE+xv8pNiYk8GxxfYJ7pqv7ii2QZUUObhp+KlZzaN0yxFU6CCaFNyInxVtBO7YKEvjSyDf LKgN9w4RNiF32ZF1eC0l55xdWbnoD6ltGcz9jbHE6P3VgWLGZNT5pgi1+gerfF7VStxee+ KGAni+iIzho3amGXYZHZjbu2Dxni/k+a+vbGaRPaGuqlo09hfvP/sEpcLhYu3hUw5zi5V/ 4izjEQx7oPc+KknLIW+uRMZbACKdXEcvCKQ8US2MnOBSE4cRCqB04nux2WeIoAwJRq7oJi zelrx+DXdh+SpdzaIowTea3k3tAVHN9nhUV8FWrPMCn7fibIokx2woZsFlkNXg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761649743; a=rsa-sha256; cv=none; b=NypWvhG8Pf7Y94mUgy7wk9J90FyOYJ2NYsvcaZEAPphcFiCeGNG18TpeEuTM1Q/wtD3hbf psjyfLzhEI1aPYqwDO7JkxQz582dDN6cR6JcKRznS3Ph4/5xQSLeaKrN2D1dMCy0k8qtFx 8azx5l9+pwNgqpQW+UARKOX3Al+W0PRxwz/8wq9gRhKBz+euVuf3mC7m3Rp8h59cmYGLua ilybaaRM+TpFEZMAFwPtFv7R6wlxikx8pbjwJHkXkLvfH+QfGNjix5EgQNgVMJPJ479vRa AbnGi+Ozwx3Gm6SyzjSCEfFnk3S0yTiCHtFAB/HyX9NyExnhKnYs0loFNnuYnA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cwngg5qZ4znbD; Tue, 28 Oct 2025 11:09:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59SB937t008460; Tue, 28 Oct 2025 11:09:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59SB93kX008457; Tue, 28 Oct 2025 11:09:03 GMT (envelope-from git) Date: Tue, 28 Oct 2025 11:09:03 GMT Message-Id: <202510281109.59SB93kX008457@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: ca16a115a0fa - stable/15 - w: Trim whitespace and commas from time and uptime List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: ca16a115a0fa4da67b153d0b90c9ec08adc9b2fb Auto-Submitted: auto-generated The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=ca16a115a0fa4da67b153d0b90c9ec08adc9b2fb commit ca16a115a0fa4da67b153d0b90c9ec08adc9b2fb Author: Dag-Erling Smørgrav AuthorDate: 2025-10-23 10:28:44 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-10-28 11:08:12 +0000 w: Trim whitespace and commas from time and uptime When producing formatted output, trim leading whitespace and trailing commas from the human-readable time and uptime before emitting them. The text output remains unchanged. PR: 290089 Fixes: 6e6febb54da9 ("w: Fix idle time in json output, add login/idle times to json output") Reviewed by: marius.h_lden.org Differential Revision: https://reviews.freebsd.org/D53167 (cherry picked from commit 4d5789532a940144c869d66505e756ce816f8a50) --- usr.bin/w/w.c | 33 +++++++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/usr.bin/w/w.c b/usr.bin/w/w.c index ac1df96077d3..502bf5a412b9 100644 --- a/usr.bin/w/w.c +++ b/usr.bin/w/w.c @@ -473,7 +473,7 @@ main(int argc, char *argv[]) static void pr_header(time_t *nowp, int nusers) { - char buf[64]; + char buf[64], *s, *e; struct sbuf upbuf; double avenrun[3]; struct timespec tp; @@ -484,8 +484,15 @@ pr_header(time_t *nowp, int nusers) * Print time of day. */ if (strftime(buf, sizeof(buf), - use_ampm ? "%l:%M%p" : "%k:%M", localtime(nowp)) != 0) - xo_emit("{:time-of-day/%s} ", buf); + use_ampm ? "%l:%M%p" : "%k:%M", localtime(nowp)) != 0) { + s = buf; + if (xo_get_style(NULL) != XO_STYLE_TEXT) { + /* trim leading whitespace */ + while (isspace((unsigned char)*s)) + s++; + } + xo_emit("{:time-of-day/%s} ", s); + } /* * Print how long system has been up. */ @@ -516,21 +523,31 @@ pr_header(time_t *nowp, int nusers) if (days > 0) sbuf_printf(&upbuf, " %ld day%s,", - days, days > 1 ? "s" : ""); + days, days > 1 ? "s" : ""); if (hrs > 0 && mins > 0) sbuf_printf(&upbuf, " %2ld:%02ld,", hrs, mins); else if (hrs > 0) sbuf_printf(&upbuf, " %ld hr%s,", - hrs, hrs > 1 ? "s" : ""); + hrs, hrs > 1 ? "s" : ""); else if (mins > 0) sbuf_printf(&upbuf, " %ld min%s,", - mins, mins > 1 ? "s" : ""); + mins, mins > 1 ? "s" : ""); else sbuf_printf(&upbuf, " %ld sec%s,", - secs, secs > 1 ? "s" : ""); + secs, secs > 1 ? "s" : ""); if (sbuf_finish(&upbuf) != 0) xo_err(1, "Could not generate output"); - xo_emit("{:uptime-human/%s}", sbuf_data(&upbuf)); + s = sbuf_data(&upbuf); + if (xo_get_style(NULL) != XO_STYLE_TEXT) { + e = s + sbuf_len(&upbuf) - 1; + /* trim leading whitespace */ + while (isspace((unsigned char)*s)) + s++; + /* trim trailing comma */ + if (e > s && *e == ',') + *e = '\0'; + } + xo_emit("{:uptime-human/%s}", s); sbuf_delete(&upbuf); }