From c44bc986b738977c5cd9741d9752a41ac022602f Mon Sep 17 00:00:00 2001 From: Rob Landley Date: Sun, 28 May 2006 01:19:06 +0000 Subject: Fix some warnings in allbareconfig. --- util-linux/more.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'util-linux') diff --git a/util-linux/more.c b/util-linux/more.c index beba64282..2ad1e797c 100644 --- a/util-linux/more.c +++ b/util-linux/more.c @@ -67,9 +67,6 @@ int more_main(int argc, char **argv) int len, page_height; int terminal_width; int terminal_height; -#ifndef CONFIG_FEATURE_USE_TERMIOS - int cin_fileno; -#endif argc--; argv++; @@ -80,9 +77,9 @@ int more_main(int argc, char **argv) cin = fopen(CURRENT_TTY, "r"); if (!cin) cin = bb_xfopen(CONSOLE_DEV, "r"); - cin_fileno = fileno(cin); please_display_more_prompt = 2; #ifdef CONFIG_FEATURE_USE_TERMIOS + cin_fileno = fileno(cin); getTermSettings(cin_fileno, &initial_settings); new_settings = initial_settings; new_settings.c_lflag &= ~ICANON; @@ -112,7 +109,7 @@ int more_main(int argc, char **argv) please_display_more_prompt &= ~1; - get_terminal_width_height(cin_fileno, &terminal_width, &terminal_height); + get_terminal_width_height(fileno(cin), &terminal_width, &terminal_height); if (terminal_height > 4) terminal_height -= 2; if (terminal_width > 0) -- cgit v1.2.3