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

Added some comments and changed a variable name to be more meaningful. No

Browse Source 
fixes yet for the space bug, but should be coming soon.
This commit is contained in:
Mark Whitley 2000-06-16 00:26:51 +00:00
parent 2e965239ee
commit b991395405
2 changed files with 44 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
more.c
View File

@ -87,7 +87,7 @@ static int terminal_height = TERMINAL_HEIGHT;
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 = 0, input = 0;
int next_page = 0; int please_display_more_prompt = 0;
struct stat st; struct stat st;
FILE *file; FILE *file;
@ -140,10 +140,10 @@ extern int more_main(int argc, char **argv)
#endif #endif
while ((c = getc(file)) != EOF) { while ((c = getc(file)) != EOF) {
if (next_page) { if (please_display_more_prompt) {
int len = 0; int len = 0;
next_page = 0; please_display_more_prompt = 0;
lines = 0; lines = 0;
len = fprintf(stdout, "--More-- "); len = fprintf(stdout, "--More-- ");
if (file != stdin) { if (file != stdin) {
@ -162,6 +162,11 @@ extern int more_main(int argc, char **argv)
); );
fflush(stdout); fflush(stdout);
/*
* We've just displayed the "--More--" prompt, so now we need
* to get input from the user.
*/
#ifdef BB_FEATURE_USE_TERMIOS #ifdef BB_FEATURE_USE_TERMIOS
input = getc(cin); input = getc(cin);
#else #else
@ -180,6 +185,17 @@ extern int more_main(int argc, char **argv)
#endif #endif
} }
/*
* There are two input streams to worry about here:
*
* 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
* see if any characters have been hit in the _input_ stream. This
* allows the user to quit while in the middle of a file.
*/
if (c == '\n') { if (c == '\n') {
switch (input) { switch (input) {
case 'q': case 'q':
@ -187,12 +203,13 @@ extern int more_main(int argc, char **argv)
case '\n': case '\n':
/* increment by just one line if we are at /* increment by just one line if we are at
* the end of this line*/ * the end of this line*/
next_page = 1; please_display_more_prompt = 1;
break; break;
} }
if (++lines == terminal_height) if (++lines == terminal_height)
next_page = 1; please_display_more_prompt = 1;
} }
/* If any key other than a return is hit, scroll by one page */
putc(c, stdout); putc(c, stdout);
} }
fclose(file); fclose(file);

27
util-linux/more.c
View File

@ -87,7 +87,7 @@ static int terminal_height = TERMINAL_HEIGHT;
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 = 0, input = 0;
int next_page = 0; int please_display_more_prompt = 0;
struct stat st; struct stat st;
FILE *file; FILE *file;
@ -140,10 +140,10 @@ extern int more_main(int argc, char **argv)
#endif #endif
while ((c = getc(file)) != EOF) { while ((c = getc(file)) != EOF) {
if (next_page) { if (please_display_more_prompt) {
int len = 0; int len = 0;
next_page = 0; please_display_more_prompt = 0;
lines = 0; lines = 0;
len = fprintf(stdout, "--More-- "); len = fprintf(stdout, "--More-- ");
if (file != stdin) { if (file != stdin) {
@ -162,6 +162,11 @@ extern int more_main(int argc, char **argv)
); );
fflush(stdout); fflush(stdout);
/*
* We've just displayed the "--More--" prompt, so now we need
* to get input from the user.
*/
#ifdef BB_FEATURE_USE_TERMIOS #ifdef BB_FEATURE_USE_TERMIOS
input = getc(cin); input = getc(cin);
#else #else
@ -180,6 +185,17 @@ extern int more_main(int argc, char **argv)
#endif #endif
} }
/*
* There are two input streams to worry about here:
*
* 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
* see if any characters have been hit in the _input_ stream. This
* allows the user to quit while in the middle of a file.
*/
if (c == '\n') { if (c == '\n') {
switch (input) { switch (input) {
case 'q': case 'q':
@ -187,12 +203,13 @@ extern int more_main(int argc, char **argv)
case '\n': case '\n':
/* increment by just one line if we are at /* increment by just one line if we are at
* the end of this line*/ * the end of this line*/
next_page = 1; please_display_more_prompt = 1;
break; break;
} }
if (++lines == terminal_height) if (++lines == terminal_height)
next_page = 1; please_display_more_prompt = 1;
} }
/* If any key other than a return is hit, scroll by one page */
putc(c, stdout); putc(c, stdout);
} }
fclose(file); fclose(file);