From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Wed, 11 Jan 2017 09:50:08 +0000 (+0100)
Subject: top: FEATURE_USE_TERMIOS shouldn't control reading of screen size
X-Git-Tag: 1_27_0~239
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=0fd9fb4244a6dd4ba71f81e355261115cd80d2f1;p=oweals%2Fbusybox.git

top: FEATURE_USE_TERMIOS shouldn't control reading of screen size

It controls whether we take input.

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---

diff --git a/procps/top.c b/procps/top.c
index 71207bac1..491acb574 100644
--- a/procps/top.c
+++ b/procps/top.c
@@ -726,7 +726,6 @@ static void clearmems(void)
 }
 
 #if ENABLE_FEATURE_USE_TERMIOS
-
 static void reset_term(void)
 {
 	if (!OPT_BATCH_MODE)
@@ -738,7 +737,6 @@ static void sig_catcher(int sig)
 	reset_term();
 	kill_myself_with_sig(sig);
 }
-
 #endif /* FEATURE_USE_TERMIOS */
 
 /*
@@ -1165,14 +1163,12 @@ int top_main(int argc UNUSED_PARAM, char **argv)
 		} else {
 			G.lines = 24; /* default */
 			col = 79;
-#if ENABLE_FEATURE_USE_TERMIOS
 			/* We output to stdout, we need size of stdout (not stdin)! */
 			get_terminal_width_height(STDOUT_FILENO, &col, &G.lines);
 			if (G.lines < 5 || col < 10) {
 				sleep(interval);
 				continue;
 			}
-#endif
 			if (col > LINE_BUF_SIZE - 2)
 				col = LINE_BUF_SIZE - 2;
 		}