system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-07-22 02:37:15 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

w: don't truncate if we're writing libxo json/xml

Browse source 
If we're writing structured output (i.e. json or xml) we shouldn't worry
about terminal width, and instead always output full width information.

This means that, for example, if we're called from crontab with 'w
--libxo json' we'll provide full the command field rather than
pointlessly truncating it.

Suggested by:	Phil Shafer
Event:		Aberdeen Hackathon 2022
Differential Revision:	https://reviews.freebsd.org/D25013
This commit is contained in:
Kristof Provost 2022-10-07 18:14:02 +02:00
parent 947fcb84b7
commit 307625842b
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -390,6 +390,9 @@ main(int argc, char *argv[])
argwidth = ttywidth - WUSED;
if (argwidth < 4)
argwidth = 8;
/* Don't truncate if we're outputting json or XML. */
if (xo_get_style(NULL) != XO_STYLE_TEXT)
argwidth = ARG_MAX;
for (ep = ehead; ep != NULL; ep = ep->next) {
if (ep->kp == NULL) {
ep->args = strdup("-");