From nobody Thu Oct 23 10:29:10 2025 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 4csj1y6Kv6z6D6TW; Thu, 23 Oct 2025 10:29:10 +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 4csj1y4wH8z3pSm; Thu, 23 Oct 2025 10:29:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761215350; 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=fyrqfKGLFgZW3lM0KwVnVolfP7rshlm9RxXe+phRf9I=; b=ASlf7v227ZiCaOpMjg0/jSh0pUB27E+TglQrHFFgiwhy00uXeuyv9Q+weVc0DLYLj3D82o myN+J+ictxXRHIvSLEVNmbH7wApEL0or1aAfXkxrFNUrMOHkCCLKz9sPewH1fojRb/j3o1 N9Z/xLP4kyArWJsLXxFjPps/4Eld6b2BJIn2NVSF4fpITupeXzfgapJaO2NHHbeLLNKt1q +dzlU8rt2mBh9+4lVnvrxxnOJ6XGi/SgUDBJWJvhrCO/2EERcVZ7+tM4XmKZGl+YUNDnR3 SK0ZzR0wm30qP3aBkRWlfxbF4z0CA87mNwnJb1C9xRBNA7Pq6smCsxJwumBLIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761215350; 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=fyrqfKGLFgZW3lM0KwVnVolfP7rshlm9RxXe+phRf9I=; b=yTc17iESdJBqq3KV4G1DjMQLNzCUl78tAgrw73wpEGeq7UslfGOeLcm2Dpeml+zJicEplS 2EnYY5kUZQzVOa6ixAEDc2G8Jwgw3YnqpDibzKumR6mCaBBot9r/1VOWvDMquOx+S4QMVc g0xA3wryD9EYUtsj4Cyn8OzLBE9QpeFheIcaNk5k5Dg/rmQdmree1jj1NZF8q3XLkVQSwp yUzbQS0l7363OqEPVjUDW7al80xyXy21exEzCczPENyKd+tjcQdUnbibj+01sa8h3IIsp+ kqzsNC+7foNx5OlynJjSgppP0X0RBdlnBSBW4go76yLLzHuH7TrwM53rHagaEw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761215350; a=rsa-sha256; cv=none; b=JGUgL+0IDn4Jr+dBI/xLwbUWD2KXDGkZuEWpzOKOxSNsmiLLx45xYX9Vhv0lFuWIuATaBq 8U0yyzYFvCkKx7uAq/d9BEzDI7HPtgqTob+DzvQRfsBIjjMKaAwNX/JksqXu/n3HI/4kma Fwdxxc1OKH/re2yEU4zPNGJa757Y6U0thVKfJhoCEdx4E6/OEfdnOUZZDWoQB+XXGP3DA4 V0vD413F6z0nPOXQYbL2/NiPRlc2yfBTTq+fE5c4v306FxXb4rEF1QNlQk1EYJZb4lbRmX HSuUJKlypwiaUOjNxrTvxns0SRkO3UA4iJFPkt6TSj++L2z0T5gRXiHu3fc4XA== 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 4csj1y4P63z19J1; Thu, 23 Oct 2025 10:29:10 +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 59NATAif037027; Thu, 23 Oct 2025 10:29:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59NATA04037024; Thu, 23 Oct 2025 10:29:10 GMT (envelope-from git) Date: Thu, 23 Oct 2025 10:29:10 GMT Message-Id: <202510231029.59NATA04037024@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 4d5789532a94 - main - w: Trim whitespace and commas from time and uptime 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 4d5789532a940144c869d66505e756ce816f8a50 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=4d5789532a940144c869d66505e756ce816f8a50 commit 4d5789532a940144c869d66505e756ce816f8a50 Author: Dag-Erling Smørgrav AuthorDate: 2025-10-23 10:28:44 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-10-23 10:29:01 +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 --- 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); }