X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=util-linux%2Fmore.c;h=beba64282f0866f87d2f57c68855731a7b4a0ca7;hb=eaa34ca5b4babe9887f36a14764bc94f26f90d0e;hp=c26e4fe548a00305aab56cc56ad1ec50e61ecdd3;hpb=b4a1baa312746a1ddc934b1ddb035b64e72e746b;p=oweals%2Fbusybox.git

diff --git a/util-linux/more.c b/util-linux/more.c
index c26e4fe54..beba64282 100644
--- a/util-linux/more.c
+++ b/util-linux/more.c
@@ -3,10 +3,10 @@
  * Mini more implementation for busybox
  *
  * Copyright (C) 1995, 1996 by Bruce Perens <bruce@pixar.com>.
- * Copyright (C) 1999-2002 by Erik Andersen <andersee@debian.org>
+ * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
  *
- * Latest version blended together by Erik Andersen <andersen@lineo.com>,
- * based on the original more implementation by Bruce, and code from the 
+ * Latest version blended together by Erik Andersen <andersen@codepoet.org>,
+ * based on the original more implementation by Bruce, and code from the
  * Debian boot-floppies team.
  *
  * Termios corrects by Vladimir Oleynik <dzo@simtreas.ru>
@@ -35,9 +35,9 @@
 #include <sys/ioctl.h>
 #include "busybox.h"
 
-static FILE *cin;
 
 #ifdef CONFIG_FEATURE_USE_TERMIOS
+static int cin_fileno;
 #include <termios.h>
 #define setTermSettings(fd,argp) tcsetattr(fd,TCSANOW,argp)
 #define getTermSettings(fd,argp) tcgetattr(fd, argp);
@@ -46,7 +46,7 @@ static struct termios initial_settings, new_settings;
 
 static void set_tty_to_initial_mode(void)
 {
-	setTermSettings(fileno(cin), &initial_settings);
+	setTermSettings(cin_fileno, &initial_settings);
 }
 
 static void gotsig(int sig)
@@ -57,20 +57,18 @@ static void gotsig(int sig)
 #endif /* CONFIG_FEATURE_USE_TERMIOS */
 
 
-static int terminal_width = 79;	/* not 80 in case terminal has linefold bug */
-static int terminal_height = 24;
-
-
-extern int more_main(int argc, char **argv)
+int more_main(int argc, char **argv)
 {
 	int c, lines, input = 0;
-	int please_display_more_prompt = -1;
+	int please_display_more_prompt = 0;
 	struct stat st;
 	FILE *file;
+	FILE *cin;
 	int len, page_height;
-
-#if defined CONFIG_FEATURE_AUTOWIDTH && defined CONFIG_FEATURE_USE_TERMIOS
-	struct winsize win = { 0, 0, 0, 0 };
+	int terminal_width;
+	int terminal_height;
+#ifndef CONFIG_FEATURE_USE_TERMIOS
+	int cin_fileno;
 #endif
 
 	argc--;
@@ -78,56 +76,54 @@ extern int more_main(int argc, char **argv)
 
 
 	/* not use inputing from terminal if usage: more > outfile */
-	if(isatty(fileno(stdout))) {
+	if(isatty(STDOUT_FILENO)) {
 		cin = fopen(CURRENT_TTY, "r");
 		if (!cin)
-			cin = xfopen(CONSOLE_DEV, "r");
-		please_display_more_prompt = 0;
+			cin = bb_xfopen(CONSOLE_DEV, "r");
+		cin_fileno = fileno(cin);
+		please_display_more_prompt = 2;
 #ifdef CONFIG_FEATURE_USE_TERMIOS
-		getTermSettings(fileno(cin), &initial_settings);
+		getTermSettings(cin_fileno, &initial_settings);
 		new_settings = initial_settings;
 		new_settings.c_lflag &= ~ICANON;
 		new_settings.c_lflag &= ~ECHO;
-#ifndef linux
-                /* Hmm, in linux c_cc[] not parsed if set ~ICANON */
 		new_settings.c_cc[VMIN] = 1;
 		new_settings.c_cc[VTIME] = 0;
-#endif
-		setTermSettings(fileno(cin), &new_settings);
+		setTermSettings(cin_fileno, &new_settings);
 		atexit(set_tty_to_initial_mode);
 		(void) signal(SIGINT, gotsig);
 		(void) signal(SIGQUIT, gotsig);
 		(void) signal(SIGTERM, gotsig);
 #endif
+	} else {
+		cin = stdin;
 	}
 
 	do {
 		if (argc == 0) {
 			file = stdin;
 		} else
-			file = wfopen(*argv, "r");
+			file = bb_wfopen(*argv, "r");
 		if(file==0)
 			goto loop;
-			
+
 		st.st_size = 0;
 		fstat(fileno(file), &st);
 
-		if(please_display_more_prompt>0)
-			please_display_more_prompt = 0;
+		please_display_more_prompt &= ~1;
+
+		get_terminal_width_height(cin_fileno, &terminal_width, &terminal_height);
+		if (terminal_height > 4)
+			terminal_height -= 2;
+		if (terminal_width > 0)
+			terminal_width -= 1;
 
-#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
 		len=0;
 		lines = 0;
 		page_height = terminal_height;
 		while ((c = getc(file)) != EOF) {
 
-			if (please_display_more_prompt>0) {
+			if ((please_display_more_prompt & 3) == 3) {
 				len = printf("--More-- ");
 				if (file != stdin && st.st_size > 0) {
 #if _FILE_OFFSET_BITS == 64
@@ -156,17 +152,16 @@ extern int more_main(int argc, char **argv)
 				while (--len >= 0)
 					putc(' ', stdout);
 				putc('\r', stdout);
-				fflush(stdout);
 				len=0;
 				lines = 0;
 				page_height = terminal_height;
-				please_display_more_prompt = 0;
+				please_display_more_prompt &= ~1;
 
 				if (input == 'q')
 					goto end;
 			}
 
-			/* 
+			/*
 			 * There are two input streams to worry about here:
 			 *
 			 * c     : the character we are reading from the file being "mored"
@@ -180,8 +175,7 @@ extern int more_main(int argc, char **argv)
 				/* increment by just one line if we are at
 				 * the end of this line */
 				if (input == '\n')
-					if(please_display_more_prompt==0)
-					please_display_more_prompt = 1;
+					please_display_more_prompt |= 1;
 				/* Adjust the terminal height for any overlap, so that
 				 * no lines get lost off the top. */
 				if (len >= terminal_width) {
@@ -196,8 +190,7 @@ extern int more_main(int argc, char **argv)
 					}
 				}
 				if (++lines >= page_height) {
-					if(please_display_more_prompt==0)
-					please_display_more_prompt = 1;
+					please_display_more_prompt |= 1;
 				}
 				len=0;
 			}