X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=more.c;h=841e283211d1c6f1971c9016acc460ddd3bef974;hb=e5cec4e3ac31ec32fd8a39287155374ea2283518;hp=6ac553e6baec2acf03510afe3c591fa0455fe9ca;hpb=9d3aba7b37b275350a9fe0887871da9ba73dcbd7;p=oweals%2Fbusybox.git diff --git a/more.c b/more.c index 6ac553e6b..841e28321 100644 --- a/more.c +++ b/more.c @@ -1,7 +1,13 @@ +/* vi: set sw=4 ts=4: */ /* * Mini more implementation for busybox * - * Copyright (C) 1998 by Erik Andersen + * + * Copyright (C) 1995, 1996 by Bruce Perens . + * + * Latest version blended together by Erik Andersen , + * based on the original more implementation by Bruce, and code from the + * Debian boot-floppies team. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -21,70 +27,188 @@ #include "internal.h" #include +#include #include +#include +#define BB_DECLARE_EXTERN +#define bb_need_help +#include "messages.c" + +static const char more_usage[] = "more [FILE ...]\n" +#ifndef BB_FEATURE_TRIVIAL_HELP + "\nMore is a filter for viewing FILE one screenful at a time.\n" +#endif + ; + +/* ED: sparc termios is broken: revert back to old termio handling. */ +#ifdef BB_FEATURE_USE_TERMIOS +# 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 + +FILE *cin; + +struct termios initial_settings, new_settings; + +void gotsig(int sig) +{ + setTermSettings(fileno(cin), &initial_settings); + fprintf(stdout, "\n"); + exit(TRUE); +} +#endif /* BB_FEATURE_USE_TERMIOS */ -const char more_usage[] = "[file ...]"; -//#define ERASE_STUFF +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; - int next_page=0, rows = 24; -#ifdef ERASE_STUFF - int cols=79; -#endif - struct stat st; - FILE *file = stdin; - - if ( strcmp(*argv,"--help")==0 || strcmp(*argv,"-h")==0 ) { - fprintf(stderr, "Usage: %s %s", *argv, more_usage); - return(FALSE); - } - argc--; - argv++; - - while (argc-- > 0) { - file = fopen(*argv, "r"); - if (file == NULL) { - perror("Can't open file"); - return(FALSE); - } - fstat(fileno(file), &st); - fprintf(stderr, "hi\n"); - - while ((c = getc(file)) != EOF) { - if ( next_page ) { - int len=0; - next_page = 0; - lines=0; - len = fprintf(stdout, "--More-- (%d%% of %ld bytes)", - (int) (100*( (double) ftell(file) / (double) st.st_size )), - st.st_size); - fflush(stdout); - getc( stdin); -#ifdef ERASE_STUFF - /* Try to erase the "More" message */ - while(len-- > 0) - putc('\b', stdout); - while(len++ < cols) - putc(' ', stdout); - while(len-- > 0) - putc('\b', stdout); - fflush(stdout); + int c, lines = 0, input = 0; + int please_display_more_prompt = 0; + struct stat st; + FILE *file; + +#if defined BB_FEATURE_AUTOWIDTH && defined BB_FEATURE_USE_TERMIOS + struct winsize win = { 0, 0 }; #endif - } - if ( c == '\n' && ++lines == (rows + 1) ) - next_page = 1; - putc(c, stdout); - } - fclose(file); - fflush(stdout); argc--; argv++; - } - return(TRUE); -} + if (argc > 0 + && (strcmp(*argv, dash_dash_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); + +#ifdef BB_FEATURE_USE_TERMIOS + 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 = 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", +#ifdef BB_FEATURE_USE_TERMIOS + "" +#else + "\n" +#endif + ); + + 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 */ + while (--len >= 0) + putc('\b', stdout); + while (++len <= terminal_width) + putc(' ', stdout); + while (--len >= 0) + putc('\b', stdout); + fflush(stdout); +#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': + 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); + } + fclose(file); + fflush(stdout); + + argv++; + } while (--argc > 0); + end: +#ifdef BB_FEATURE_USE_TERMIOS + gotsig(0); +#endif + return(TRUE); +}