emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

top: FEATURE_USE_TERMIOS shouldn't control reading of screen size

Browse Source 
It controls whether we take input.

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2017-01-11 10:50:08 +01:00
parent c5891fe1af
commit 0fd9fb4244
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
procps/top.c
View File

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