kgess-mirror/freebsd-src
1
0
Fork 0
mirror of https://git.freebsd.org/src.git synced 2026-01-11 19:57:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

w: Trim whitespace and commas from time and uptime

Browse source 
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:          6e6febb54d ("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
This commit is contained in:
Dag-Erling Smørgrav 2025-10-23 12:28:44 +02:00
parent bfda98a420
commit 4d5789532a
1 changed files with 25 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
usr.bin/w/w.c
View file

@ -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);
}