diff --git a/usr.bin/w/w.c b/usr.bin/w/w.c --- a/usr.bin/w/w.c +++ b/usr.bin/w/w.c @@ -515,22 +515,20 @@ } if (days > 0) - sbuf_printf(&upbuf, " %ld day%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" : ""); - else if (mins > 0) - sbuf_printf(&upbuf, " %ld min%s,", - mins, mins > 1 ? "s" : ""); - else - sbuf_printf(&upbuf, " %ld sec%s,", - secs, secs > 1 ? "s" : ""); + sbuf_printf(&upbuf, ", %ld day%s", + days, days > 1 ? "s" : ""); + if (hrs > 0) + sbuf_printf(&upbuf, ", %ld hour%s", + hrs, hrs > 1 ? "s" : ""); + if (mins > 0) + sbuf_printf(&upbuf, ", %ld minute%s", + mins, mins > 1 ? "s" : ""); + if (secs > 0) + sbuf_printf(&upbuf, ", %ld second%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)); + xo_emit("{:uptime-human/%s}", sbuf_data(&upbuf) + 2); sbuf_delete(&upbuf); }