emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Account for remainder, and reset page_height for each and every page.

Browse Source
This commit is contained in:
Eric Andersen 2001-02-22 21:49:32 +00:00
parent b2007bffc5
commit ffc40bf3de
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
more.c
View File

@ -71,7 +71,7 @@ extern int more_main(int argc, char **argv)
int please_display_more_prompt = 0; int please_display_more_prompt = 0;
struct stat st; struct stat st;
FILE *file; FILE *file;
int len; int len, page_height;
#if defined BB_FEATURE_AUTOWIDTH && defined BB_FEATURE_USE_TERMIOS #if defined BB_FEATURE_AUTOWIDTH && defined BB_FEATURE_USE_TERMIOS
struct winsize win = { 0, 0, 0, 0 }; struct winsize win = { 0, 0, 0, 0 };
@ -114,6 +114,7 @@ extern int more_main(int argc, char **argv)
#endif #endif
len = 0; len = 0;
page_height = terminal_height;
while ((c = getc(file)) != EOF) { while ((c = getc(file)) != EOF) {
if (please_display_more_prompt) { if (please_display_more_prompt) {
@ -162,6 +163,7 @@ extern int more_main(int argc, char **argv)
fflush(stdout); fflush(stdout);
#endif #endif
len=0; len=0;
page_height = terminal_height;
} }
/* /*
@ -188,10 +190,14 @@ extern int more_main(int argc, char **argv)
* no lines get lost off the top. */ * no lines get lost off the top. */
if (len) { if (len) {
div_t result = div( len, terminal_width); div_t result = div( len, terminal_width);
if (result.quot) if (result.quot) {
terminal_height-=(result.quot-1); if (result.rem)
page_height-=result.quot;
else
page_height-=(result.quot-1);
}
} }
if (++lines == terminal_height) { if (++lines == page_height) {
please_display_more_prompt = 1; please_display_more_prompt = 1;
} }
len=0; len=0;

14
util-linux/more.c
View File

@ -71,7 +71,7 @@ extern int more_main(int argc, char **argv)
int please_display_more_prompt = 0; int please_display_more_prompt = 0;
struct stat st; struct stat st;
FILE *file; FILE *file;
int len; int len, page_height;
#if defined BB_FEATURE_AUTOWIDTH && defined BB_FEATURE_USE_TERMIOS #if defined BB_FEATURE_AUTOWIDTH && defined BB_FEATURE_USE_TERMIOS
struct winsize win = { 0, 0, 0, 0 }; struct winsize win = { 0, 0, 0, 0 };
@ -114,6 +114,7 @@ extern int more_main(int argc, char **argv)
#endif #endif
len = 0; len = 0;
page_height = terminal_height;
while ((c = getc(file)) != EOF) { while ((c = getc(file)) != EOF) {
if (please_display_more_prompt) { if (please_display_more_prompt) {
@ -162,6 +163,7 @@ extern int more_main(int argc, char **argv)
fflush(stdout); fflush(stdout);
#endif #endif
len=0; len=0;
page_height = terminal_height;
} }
/* /*
@ -188,10 +190,14 @@ extern int more_main(int argc, char **argv)
* no lines get lost off the top. */ * no lines get lost off the top. */
if (len) { if (len) {
div_t result = div( len, terminal_width); div_t result = div( len, terminal_width);
if (result.quot) if (result.quot) {
terminal_height-=(result.quot-1); if (result.rem)
page_height-=result.quot;
else
page_height-=(result.quot-1);
}
} }
if (++lines == terminal_height) { if (++lines == page_height) {
please_display_more_prompt = 1; please_display_more_prompt = 1;
} }
len=0; len=0;