diff options
| author | Erik Andersen <andersen@codepoet.org> | 2000-04-28 00:18:56 +0000 |
|---|---|---|
| committer | Erik Andersen <andersen@codepoet.org> | 2000-04-28 00:18:56 +0000 |
| commit | 4f3f757d56fbf420ea5030dcf7ea971b3da3ab47 (patch) | |
| tree | d986e9bb9f03bf1f83465c274c35c0d58ed544e4 /util-linux/more.c | |
| parent | 227a59b05d6df9b4be5990915646249d6f548822 (diff) | |
| download | busybox-4f3f757d56fbf420ea5030dcf7ea971b3da3ab47.tar.gz | |
Latest and greatest. Some effort at libc5 (aiming towards newlib)
compatability.
-Erik
Diffstat (limited to 'util-linux/more.c')
| -rw-r--r-- | util-linux/more.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/util-linux/more.c b/util-linux/more.c index 909ed286b..30d2757cd 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 */ |