X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=more.c;h=298e1cfb19813657a43afaa6bb0a82f0d2ce9e83;hb=5165fbed639916e0fde15a827241b21981be7934;hp=f8421490588ad1c4a43727c1d6ba5d9ef7de6231;hpb=a6c752201e9031b51a6d89349f1cec1f690f56ef;p=oweals%2Fbusybox.git diff --git a/more.c b/more.c index f84214905..298e1cfb1 100644 --- a/more.c +++ b/more.c @@ -25,92 +25,87 @@ * */ -#include "internal.h" #include #include #include +#include #include +#include "busybox.h" +#define BB_DECLARE_EXTERN +#define bb_need_help +#include "messages.c" -static const char more_usage[] = "more [file ...]\n"; - +/* ED: sparc termios is broken: revert back to old termio handling. */ #ifdef BB_FEATURE_USE_TERMIOS - -#include - -FILE *cin; -/* sparc and other have broken termios support: use old termio handling. */ -struct termio initial_settings, new_settings; - -void gotsig(int sig) +# if #cpu(sparc) +# include +# define termios termio +# define setTermSettings(fd,argp) ioctl(fd,TCSETAF,argp) +# define getTermSettings(fd,argp) ioctl(fd,TCGETA,argp) +# else +# include +# define setTermSettings(fd,argp) tcsetattr(fd,TCSANOW,argp) +# define getTermSettings(fd,argp) tcgetattr(fd, argp); +# endif + +static FILE *cin; + +static struct termios initial_settings, new_settings; + +static void gotsig(int sig) { - ioctl(fileno(cin), TCSETAF, &initial_settings); - fprintf(stdout, "\n"); - exit(TRUE); + setTermSettings(fileno(cin), &initial_settings); + putchar('\n'); + exit(EXIT_FAILURE); } -#endif +#endif /* BB_FEATURE_USE_TERMIOS */ - -#define TERMINAL_WIDTH 79 /* not 80 in case terminal has linefold bug */ -#define TERMINAL_HEIGHT 24 - - -#if defined BB_FEATURE_AUTOWIDTH -static int terminal_width = 0, terminal_height = 0; -#else -#define terminal_width TERMINAL_WIDTH -#define terminal_height TERMINAL_HEIGHT -#endif - +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 c, lines = 0, input = 0; - int next_page = 0; + int please_display_more_prompt = 0; struct stat st; FILE *file; -#ifdef BB_FEATURE_AUTOWIDTH - struct winsize win = { 0, 0 }; +#if defined BB_FEATURE_AUTOWIDTH && defined BB_FEATURE_USE_TERMIOS + struct winsize win = { 0, 0, 0, 0 }; #endif argc--; argv++; - if (argc > 0 - && (strcmp(*argv, "--help") == 0 || strcmp(*argv, "-h") == 0)) { - usage(more_usage); - } do { if (argc == 0) { file = stdin; } else - file = fopen(*argv, "r"); + file = xfopen(*argv, "r"); - if (file == NULL) { - perror(*argv); - exit(FALSE); - } fstat(fileno(file), &st); #ifdef BB_FEATURE_USE_TERMIOS cin = fopen("/dev/tty", "r"); if (!cin) cin = fopen("/dev/console", "r"); - ioctl(fileno(cin), TCGETA, &initial_settings); + getTermSettings(fileno(cin), &initial_settings); new_settings = initial_settings; + new_settings.c_cc[VMIN] = 1; + new_settings.c_cc[VTIME] = 0; new_settings.c_lflag &= ~ICANON; new_settings.c_lflag &= ~ECHO; - ioctl(fileno(cin), TCSETAF, &new_settings); + setTermSettings(fileno(cin), &new_settings); -#ifdef BB_FEATURE_AUTOWIDTH +# ifdef BB_FEATURE_AUTOWIDTH 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 +# endif (void) signal(SIGINT, gotsig); (void) signal(SIGQUIT, gotsig); @@ -118,20 +113,24 @@ extern int more_main(int argc, char **argv) #endif while ((c = getc(file)) != EOF) { - if (next_page) { + if (please_display_more_prompt) { int len = 0; - next_page = 0; + please_display_more_prompt = 0; lines = 0; - len = fprintf(stdout, "--More-- "); + len = printf("--More-- "); if (file != stdin) { - len += fprintf(stdout, "(%d%% of %ld bytes)", +#if _FILE_OFFSET_BITS == 64 + len += printf("(%d%% of %lld bytes)", +#else + len += printf("(%d%% of %ld bytes)", +#endif (int) (100 * ((double) ftell(file) / (double) st.st_size)), st.st_size); } - len += fprintf(stdout, "%s", + len += printf("%s", #ifdef BB_FEATURE_USE_TERMIOS "" #else @@ -140,7 +139,16 @@ extern int more_main(int argc, char **argv) ); fflush(stdout); + + /* + * We've just displayed the "--More--" prompt, so now we need + * to get input from the user. + */ +#ifdef BB_FEATURE_USE_TERMIOS input = getc(cin); +#else + input = getc(stdin); +#endif #ifdef BB_FEATURE_USE_TERMIOS /* Erase the "More" message */ @@ -154,6 +162,17 @@ extern int more_main(int argc, char **argv) #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') { switch (input) { case 'q': @@ -161,12 +180,16 @@ extern int more_main(int argc, char **argv) case '\n': /* increment by just one line if we are at * the end of this line*/ - next_page = 1; + please_display_more_prompt = 1; break; } if (++lines == terminal_height) - next_page = 1; + please_display_more_prompt = 1; } + /* + * If we just read a newline from the file being 'mored' and any + * key other than a return is hit, scroll by one page + */ putc(c, stdout); } fclose(file); @@ -178,5 +201,5 @@ extern int more_main(int argc, char **argv) #ifdef BB_FEATURE_USE_TERMIOS gotsig(0); #endif - exit(TRUE); + return(TRUE); }