Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2024-12-27 16:31:24 +00:00
Code Issues Projects Releases Wiki Activity

Yet another fix. I think I got it this time.

Browse Source 
-Erik
This commit is contained in:
Eric Andersen 2001-02-23 01:39:26 +00:00
parent 41492d6c23
commit 5723934f7c
2 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
more.c
View File

@ -67,8 +67,8 @@ static int terminal_height = 24;
extern int more_main(int argc, char **argv) extern int more_main(int argc, char **argv)
{ {
int c, lines = 0, input = 0; int c, lines, input = 0;
int please_display_more_prompt = 0; int please_display_more_prompt;
struct stat st; struct stat st;
FILE *file; FILE *file;
int len, page_height; int len, page_height;
@ -113,13 +113,13 @@ extern int more_main(int argc, char **argv)
(void) signal(SIGTERM, gotsig); (void) signal(SIGTERM, gotsig);
#endif #endif
len = 0; len=0;
lines = 0;
page_height = terminal_height; page_height = terminal_height;
please_display_more_prompt = 0;
while ((c = getc(file)) != EOF) { while ((c = getc(file)) != EOF) {
if (please_display_more_prompt) { if (please_display_more_prompt) {
lines = 0;
please_display_more_prompt = 0;
len = printf("--More-- "); len = printf("--More-- ");
if (file != stdin) { if (file != stdin) {
#if _FILE_OFFSET_BITS == 64 #if _FILE_OFFSET_BITS == 64
@ -163,13 +163,15 @@ extern int more_main(int argc, char **argv)
fflush(stdout); fflush(stdout);
#endif #endif
len=0; len=0;
lines = 0;
page_height = terminal_height; page_height = terminal_height;
please_display_more_prompt = 0;
} }
/* /*
* There are two input streams to worry about here: * 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 * input : a character received from the keyboard
* *
* If we hit a newline in the _file_ stream, we want to test and * If we hit a newline in the _file_ stream, we want to test and
@ -188,7 +190,7 @@ extern int more_main(int argc, char **argv)
} }
/* Adjust the terminal height for any overlap, so that /* Adjust the terminal height for any overlap, so that
* no lines get lost off the top. */ * no lines get lost off the top. */
if (len) { if (len >= terminal_width) {
div_t result = div( len, terminal_width); div_t result = div( len, terminal_width);
if (result.quot) { if (result.quot) {
if (result.rem) if (result.rem)
@ -197,7 +199,7 @@ extern int more_main(int argc, char **argv)
page_height-=(result.quot-1); page_height-=(result.quot-1);
} }
} }
if (++lines == page_height) { if (++lines >= page_height) {
please_display_more_prompt = 1; please_display_more_prompt = 1;
} }
len=0; len=0;

18
util-linux/more.c
View File

@ -67,8 +67,8 @@ static int terminal_height = 24;
extern int more_main(int argc, char **argv) extern int more_main(int argc, char **argv)
{ {
int c, lines = 0, input = 0; int c, lines, input = 0;
int please_display_more_prompt = 0; int please_display_more_prompt;
struct stat st; struct stat st;
FILE *file; FILE *file;
int len, page_height; int len, page_height;
@ -113,13 +113,13 @@ extern int more_main(int argc, char **argv)
(void) signal(SIGTERM, gotsig); (void) signal(SIGTERM, gotsig);
#endif #endif
len = 0; len=0;
lines = 0;
page_height = terminal_height; page_height = terminal_height;
please_display_more_prompt = 0;
while ((c = getc(file)) != EOF) { while ((c = getc(file)) != EOF) {
if (please_display_more_prompt) { if (please_display_more_prompt) {
lines = 0;
please_display_more_prompt = 0;
len = printf("--More-- "); len = printf("--More-- ");
if (file != stdin) { if (file != stdin) {
#if _FILE_OFFSET_BITS == 64 #if _FILE_OFFSET_BITS == 64
@ -163,13 +163,15 @@ extern int more_main(int argc, char **argv)
fflush(stdout); fflush(stdout);
#endif #endif
len=0; len=0;
lines = 0;
page_height = terminal_height; page_height = terminal_height;
please_display_more_prompt = 0;
} }
/* /*
* There are two input streams to worry about here: * 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 * input : a character received from the keyboard
* *
* If we hit a newline in the _file_ stream, we want to test and * If we hit a newline in the _file_ stream, we want to test and
@ -188,7 +190,7 @@ extern int more_main(int argc, char **argv)
} }
/* Adjust the terminal height for any overlap, so that /* Adjust the terminal height for any overlap, so that
* no lines get lost off the top. */ * no lines get lost off the top. */
if (len) { if (len >= terminal_width) {
div_t result = div( len, terminal_width); div_t result = div( len, terminal_width);
if (result.quot) { if (result.quot) {
if (result.rem) if (result.rem)
@ -197,7 +199,7 @@ extern int more_main(int argc, char **argv)
page_height-=(result.quot-1); page_height-=(result.quot-1);
} }
} }
if (++lines == page_height) { if (++lines >= page_height) {
please_display_more_prompt = 1; please_display_more_prompt = 1;
} }
len=0; len=0;