From 4f3f757d56fbf420ea5030dcf7ea971b3da3ab47 Mon Sep 17 00:00:00 2001
From: Erik Andersen
Date: Fri, 28 Apr 2000 00:18:56 +0000
Subject: Latest and greatest.  Some effort at libc5 (aiming towards newlib)
 compatability.  -Erik

---
 util-linux/more.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'util-linux/more.c')

diff --git a/util-linux/more.c b/util-linux/more.c
index 909ed28..30d2757 100644
--- a/util-linux/more.c
+++ b/util-linux/more.c
@@ -48,6 +48,7 @@ static const char more_usage[] = "more [file ...]\n";
 #endif
 
 FILE *cin;
+
 struct termios initial_settings, new_settings;
 
 void gotsig(int sig)
@@ -65,7 +66,10 @@ void gotsig(int sig)
 
 
 #if defined BB_FEATURE_AUTOWIDTH
-static int terminal_width = 0, terminal_height = 0;
+#ifdef BB_FEATURE_USE_TERMIOS
+static int terminal_width = 0;
+#endif
+static int terminal_height = 0;
 #else
 #define terminal_width	TERMINAL_WIDTH
 #define terminal_height	TERMINAL_HEIGHT
@@ -80,7 +84,7 @@ extern int more_main(int argc, char **argv)
 	struct stat st;
 	FILE *file;
 
-#ifdef BB_FEATURE_AUTOWIDTH
+#if defined BB_FEATURE_AUTOWIDTH && defined BB_FEATURE_USE_TERMIOS
 	struct winsize win = { 0, 0 };
 #endif
 
@@ -151,7 +155,11 @@ extern int more_main(int argc, char **argv)
 					);
 
 				fflush(stdout);
+#ifdef BB_FEATURE_USE_TERMIOS
 				input = getc(cin);
+#else
+				input = getc(stdin);
+#endif
 
 #ifdef BB_FEATURE_USE_TERMIOS
 				/* Erase the "More" message */
-- 
cgit v1.1