X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=more.c;h=298e1cfb19813657a43afaa6bb0a82f0d2ce9e83;hb=5165fbed639916e0fde15a827241b21981be7934;hp=821427dda35b206a89c7f5b6f9ef7fbb3e56fc7b;hpb=6a76e652aab7d614c2b47b50318e0690c06779c4;p=oweals%2Fbusybox.git diff --git a/more.c b/more.c index 821427dda..298e1cfb1 100644 --- a/more.c +++ b/more.c @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini more implementation for busybox * @@ -24,166 +25,181 @@ * */ -#include "internal.h" #include #include #include +#include #include - -static const char more_usage[] = "more [file ...]\n"; +#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 - -#if #cpu(sparc) -# define USE_OLD_TERMIO -# include -# define termios termio -# define stty(fd,argp) ioctl(fd,TCSETAF,argp) -#else -# include -# define stty(fd,argp) tcsetattr(fd,TCSANOW,argp) -#endif - - FILE *cin; - struct termios initial_settings, new_settings; - - void gotsig(int sig) { - stty(fileno(cin), &initial_settings); - fprintf(stdout, "\n"); - exit( TRUE); - } -#endif +# 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) +{ + setTermSettings(fileno(cin), &initial_settings); + putchar('\n'); + exit(EXIT_FAILURE); +} +#endif /* BB_FEATURE_USE_TERMIOS */ +static int terminal_width = 79; /* not 80 in case terminal has linefold bug */ +static int terminal_height = 24; -#define TERMINAL_WIDTH 79 /* not 80 in case terminal has linefold bug */ -#define TERMINAL_HEIGHT 24 +extern int more_main(int argc, char **argv) +{ + int c, lines = 0, input = 0; + int please_display_more_prompt = 0; + struct stat st; + FILE *file; -#if defined BB_FEATURE_AUTOWIDTH -static int terminal_width = 0, terminal_height = 0; -#else -#define terminal_width TERMINAL_WIDTH -#define terminal_height TERMINAL_HEIGHT +#if defined BB_FEATURE_AUTOWIDTH && defined BB_FEATURE_USE_TERMIOS + struct winsize win = { 0, 0, 0, 0 }; #endif + argc--; + argv++; + do { + if (argc == 0) { + file = stdin; + } else + file = xfopen(*argv, "r"); -extern int more_main(int argc, char **argv) -{ - int c, lines=0, input=0; - int next_page=0; - struct stat st; - FILE *file; -#ifdef BB_FEATURE_AUTOWIDTH - struct winsize win = {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"); - - if (file == NULL) { - perror(*argv); - exit(FALSE); - } - fstat(fileno(file), &st); + fstat(fileno(file), &st); #ifdef BB_FEATURE_USE_TERMIOS - cin = fopen("/dev/tty", "r"); - if (!cin) - cin = fopen("/dev/console", "r"); -#ifdef USE_OLD_TERMIO - ioctl(fileno(cin),TCGETA,&initial_settings); + cin = fopen("/dev/tty", "r"); + if (!cin) + cin = fopen("/dev/console", "r"); + 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; + setTermSettings(fileno(cin), &new_settings); + +# 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 + + (void) signal(SIGINT, gotsig); + (void) signal(SIGQUIT, gotsig); + (void) signal(SIGTERM, gotsig); + +#endif + while ((c = getc(file)) != EOF) { + if (please_display_more_prompt) { + int len = 0; + + please_display_more_prompt = 0; + lines = 0; + len = printf("--More-- "); + if (file != stdin) { +#if _FILE_OFFSET_BITS == 64 + len += printf("(%d%% of %lld bytes)", #else - tcgetattr(fileno(cin),&initial_settings); + len += printf("(%d%% of %ld bytes)", #endif - new_settings = initial_settings; - new_settings.c_lflag &= ~ICANON; - new_settings.c_lflag &= ~ECHO; - stty(fileno(cin), &new_settings); - -#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; + (int) (100 * + ((double) ftell(file) / + (double) st.st_size)), + st.st_size); + } + len += printf("%s", +#ifdef BB_FEATURE_USE_TERMIOS + "" +#else + "\n" #endif + ); - (void) signal(SIGINT, gotsig); - (void) signal(SIGQUIT, gotsig); - (void) signal(SIGTERM, gotsig); + fflush(stdout); -#endif - while ((c = getc(file)) != EOF) { - if ( next_page ) { - int len=0; - next_page = 0; - lines=0; - len = fprintf(stdout, "--More-- "); - if (file != stdin) { - len += fprintf(stdout, "(%d%% of %ld bytes)", - (int) (100*( (double) ftell(file) / (double) st.st_size )), - st.st_size); - } - len += fprintf(stdout, "%s", + /* + * 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 - "\n" + input = getc(stdin); #endif - ); - - fflush(stdout); - input = getc( cin); #ifdef BB_FEATURE_USE_TERMIOS - /* Erase the "More" message */ - while(--len >= 0) - putc('\b', stdout); - while(++len <= terminal_width) - putc(' ', stdout); - while(--len >= 0) - putc('\b', stdout); - fflush(stdout); + /* Erase the "More" message */ + while (--len >= 0) + putc('\b', stdout); + while (++len <= terminal_width) + putc(' ', stdout); + while (--len >= 0) + putc('\b', stdout); + fflush(stdout); #endif - } - 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*/ - next_page = 1; - break; + } + + /* + * 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': + goto end; + case '\n': + /* increment by just one line if we are at + * the end of this line*/ + please_display_more_prompt = 1; + break; + } + if (++lines == terminal_height) + 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); } - if ( ++lines == terminal_height ) - next_page = 1; - } - putc(c, stdout); - } - fclose(file); - fflush(stdout); + fclose(file); + fflush(stdout); - argv++; - } while (--argc > 0); -end: + argv++; + } while (--argc > 0); + end: #ifdef BB_FEATURE_USE_TERMIOS - gotsig(0); -#endif - exit(TRUE); + gotsig(0); +#endif + return(TRUE); } -