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 d429612c4ce87d7c62c74aaf8f9e6b12e7d53cee..2026b12037029c00010e533eaf48838dc42a8ae5 100644 (file)
--- 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);