From: Todd C. Miller <Todd.Miller@courtesan.com>
Date: Thu, 7 Oct 2010 17:59:39 +0000 (-0400)
Subject: Fix TCGETWINSZ compat.
X-Git-Tag: SUDO_1_7_5~134
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=839aa09b6f4f2dbbfc105b1e03352c707397b6b5;p=sudo

Fix TCGETWINSZ compat.

--HG--
branch : 1.7
---

diff --git a/exec_pty.c b/exec_pty.c
index 9c152d8f6..19898905a 100644
--- a/exec_pty.c
+++ b/exec_pty.c
@@ -76,7 +76,7 @@
 # define TIOCGWINSZ	TIOCGSIZE
 # define TIOCSWINSZ	TIOCSSIZE
 # define winsize	ttysize
-# define ws_cols	ts_col
+# define ws_col		ts_cols
 #endif
 
 struct io_buffer {
diff --git a/lbuf.c b/lbuf.c
index 4ec226218..78c16adcb 100644
--- a/lbuf.c
+++ b/lbuf.c
@@ -58,7 +58,7 @@
 #if !defined(TIOCGWINSZ) && defined(TIOCGSIZE)
 # define TIOCGWINSZ	TIOCGSIZE
 # define winsize	ttysize
-# define ws_cols	ts_col
+# define ws_col		ts_cols
 #endif
 
 int
@@ -69,8 +69,8 @@ get_ttycols()
 #ifdef TIOCGWINSZ
     struct winsize wsize;
 
-    if (ioctl(STDERR_FILENO, TIOCGWINSZ, &wsize) == 0 && wsize.ws_cols != 0)
-	return((int)wsize.ws_cols);
+    if (ioctl(STDERR_FILENO, TIOCGWINSZ, &wsize) == 0 && wsize.ws_col != 0)
+	return((int)wsize.ws_col);
 #endif
 
     /* Fall back on $COLUMNS. */