Be entirely consistant when using ioctl(0, TIOCGWINSZ, &winsize)

to ensure proper fallback behavior on, i.e. serial consoles.
 -Erik


git-svn-id: svn://busybox.net/trunk/busybox@7526 69ca8d6d-28ef-0310-b511-8ec308f3f277

1 files changed, 6 insertions, 11 deletions

diff --git a/util-linux/more.c b/util-linux/more.c
index 1ec3007bf..f4018f5d1 100644
--- a/util-linux/more.c
+++ b/util-linux/more.c
@@ -69,10 +69,6 @@ extern int more_main(int argc, char **argv)
         FILE *file;
         int len, page_height;
 
-#if defined CONFIG_FEATURE_AUTOWIDTH && defined CONFIG_FEATURE_USE_TERMIOS
-        struct winsize win = { 0, 0, 0, 0 };
-#endif
-
         argc--;
         argv++;
 
@@ -115,13 +111,12 @@ extern int more_main(int argc, char **argv)
                 if(please_display_more_prompt>0)
                         please_display_more_prompt = 0;
 
-#if defined CONFIG_FEATURE_AUTOWIDTH && defined CONFIG_FEATURE_USE_TERMIOS
-                ioctl(fileno(stdout), TIOCGWINSZ, &win);
-                if (win.ws_row > 4)
-                        terminal_height = win.ws_row - 2;
-                if (win.ws_col > 0)
-                        terminal_width = win.ws_col - 1;
-#endif
+                get_terminal_width_height(0, &terminal_width, &terminal_height);
+                if (terminal_height > 4)
+                        terminal_height -= 2;
+                if (terminal_width > 0)
+                        terminal_width -= 1;
+
                 len=0;
                 lines = 0;
                 page_height = terminal_height;