From: Craig Small <csmall@debian.org>
Date: Tue, 24 Nov 2009 00:00:43 +0000 (+1100)
Subject: w: use COLUMNS environment if TIOCGWINSZ fails
X-Git-Tag: v3.3.2~174
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=88f485e20acd1a3e26a1b6d9d583c8afc4c12de9;p=procps-ng

w: use COLUMNS environment if TIOCGWINSZ fails

A patch from Debian.

Backported-by: Sami Kerola <kerolasa@iki.fi>
---

diff --git a/w.c b/w.c
index d429612c..2026b120 100644
--- a/w.c
+++ b/w.c
@@ -242,7 +242,7 @@ static void showinfo(utmp_t *u, int formtype, int maxcmd, int from) {
 
 /***** main */
 int main(int argc, char **argv) {
-    char *user = NULL;
+    char *user = NULL, *p;
     utmp_t *u;
     struct winsize win;
     int header=1, longform=1, from=1, args, maxcmd=80, ch;
@@ -278,6 +278,10 @@ int main(int argc, char **argv) {
 
     if (ioctl(1, TIOCGWINSZ, &win) != -1 && win.ws_col > 0)
 	maxcmd = win.ws_col;
+    else if (p = getenv("COLUMNS"))
+        maxcmd = atoi(p);
+    else
+        maxcmd = 80;
     if (maxcmd < 71) {
 	fprintf(stderr, "%d column window is too narrow\n", maxcmd);
 	exit(1);