X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=more.c;h=8ae2661ab64bf7e9c45247e254cd910be9431135;hb=f3e79ba6e3b3bfa380241205829d0a78570c9af3;hp=2cfb3a8152dadd48fcd2e847d7067c243bb11d9b;hpb=ffc40bf3de05a50a0f58be80fe76202b6b5972f8;p=oweals%2Fbusybox.git

diff --git a/more.c b/more.c
index 2cfb3a815..8ae2661ab 100644
--- a/more.c
+++ b/more.c
@@ -31,9 +31,6 @@
 #include <stdlib.h>
 #include <sys/ioctl.h>
 #include "busybox.h"
-#define BB_DECLARE_EXTERN
-#define bb_need_help
-#include "messages.c"
 
 /* ED: sparc termios is broken: revert back to old termio handling. */
 #ifdef BB_FEATURE_USE_TERMIOS
@@ -67,8 +64,8 @@ static int terminal_height = 24;
 
 extern int more_main(int argc, char **argv)
 {
-	int c, lines = 0, input = 0;
-	int please_display_more_prompt = 0;
+	int c, lines, input = 0;
+	int please_display_more_prompt;
 	struct stat st;
 	FILE *file;
 	int len, page_height;
@@ -91,7 +88,7 @@ extern int more_main(int argc, char **argv)
 #ifdef BB_FEATURE_USE_TERMIOS
 		cin = fopen("/dev/tty", "r");
 		if (!cin)
-			cin = fopen("/dev/console", "r");
+			cin = xfopen("/dev/console", "r");
 		getTermSettings(fileno(cin), &initial_settings);
 		new_settings = initial_settings;
 		new_settings.c_cc[VMIN] = 1;
@@ -113,24 +110,24 @@ extern int more_main(int argc, char **argv)
 		(void) signal(SIGTERM, gotsig);
 
 #endif
-		len = 0;
+		len=0;
+		lines = 0;
 		page_height = terminal_height;
+		please_display_more_prompt = 0;
 		while ((c = getc(file)) != EOF) {
 
 			if (please_display_more_prompt) {
-				lines = 0;
-				please_display_more_prompt = 0;
 				len = printf("--More-- ");
 				if (file != stdin) {
 #if _FILE_OFFSET_BITS == 64
 					len += printf("(%d%% of %lld bytes)",
+						   (int) (100 * ((double) ftell(file) /
+						   (double) st.st_size)), (long long)st.st_size);
 #else
 					len += printf("(%d%% of %ld bytes)",
+						   (int) (100 * ((double) ftell(file) /
+						   (double) st.st_size)), (long)st.st_size);
 #endif
-								   (int) (100 *
-										  ((double) ftell(file) /
-										   (double) st.st_size)),
-								   st.st_size);
 				}
 				len += printf("%s",
 #ifdef BB_FEATURE_USE_TERMIOS
@@ -154,22 +151,25 @@ extern int more_main(int argc, char **argv)
 
 #ifdef BB_FEATURE_USE_TERMIOS
 				/* Erase the "More" message */
+				putc('\r', stdout);
 				while (--len >= 0)
-					putc('\b', stdout);
-				while (++len <= terminal_width)
 					putc(' ', stdout);
-				while (--len >= 0)
-					putc('\b', stdout);
+				putc('\r', stdout);
 				fflush(stdout);
 #endif
 				len=0;
+				lines = 0;
 				page_height = terminal_height;
+				please_display_more_prompt = 0;
+
+				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"
+			 * c     : the character we are reading from the file being "mored"
 			 * input : a character received from the keyboard
 			 *
 			 * If we hit a newline in the _file_ stream, we want to test and
@@ -177,18 +177,13 @@ extern int more_main(int argc, char **argv)
 			 * allows the user to quit while in the middle of a file.
 			 */
 			if (c == '\n') {
-				switch (input) {
-				case 'q':
-					goto end;
-				case '\n':
-					/* increment by just one line if we are at 
-					 * the end of this line*/
+				/* increment by just one line if we are at
+				 * the end of this line */
+				if (input == '\n')
 					please_display_more_prompt = 1;
-					break;
-				}
 				/* Adjust the terminal height for any overlap, so that
 				 * no lines get lost off the top. */
-				if (len) {
+				if (len >= terminal_width) {
 					div_t result = div( len, terminal_width); 
 					if (result.quot) {
 						if (result.rem)
@@ -197,7 +192,7 @@ extern int more_main(int argc, char **argv)
 							page_height-=(result.quot-1);
 					}
 				}
-				if (++lines == page_height) {
+				if (++lines >= page_height) {
 					please_display_more_prompt = 1;
 				}
 				len=0;
@@ -216,7 +211,7 @@ extern int more_main(int argc, char **argv)
 	} while (--argc > 0);
   end:
 #ifdef BB_FEATURE_USE_TERMIOS
-	gotsig(0);
+	setTermSettings(fileno(cin), &initial_settings);
 #endif
-	return(TRUE);
+	return 0;
 }