Respect the setting of the COLUMNS environment variable, use it instead of

the TTY width obtained by ioctl() when set & non-null. (SUSv3)

1 files changed, 13 insertions, 0 deletions

diff --git a/usr.bin/who/who.1 b/usr.bin/who/who.1
index d2d93f0..d84a24c 100644
--- a/usr.bin/who/who.1
+++ b/usr.bin/who/who.1
@@ -118,6 +118,19 @@ or one of the special characters '|', '}' and '~'.  Logouts produce
 an output line without any user name.  For more information on the
 special characters, see
 .Xr utmp 5 .
+.Sh ENVIRONMENT
+The following environment variables affect the execution of
+.Nm :
+.Bl -tag -width ".Ev COLUMNS"
+.It Ev COLUMNS
+If set, specifies the user's preferred output width in column positions.
+This is used when the
+.Fl q
+option is specified to calculate how many user names to display per line.
+By default,
+.Nm
+attempts to automatically determine the terminal width.
+.El
 .Sh FILES
 .Bl -tag -width /var/log/wtmp.[0-6] -compact
 .It Pa /var/run/utmp