X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;ds=sidebyside;f=more.c;h=538708caac1b9c9fa8c3a22e46ed8e8d351b271c;hb=537d1652164635c72ca6ef2679be33a0a7a49265;hp=f8938743680d82e29952c23d097e981da7c80d9b;hpb=3cf52d19581b2077480e7d2e63010baa1f5399c1;p=oweals%2Fbusybox.git diff --git a/more.c b/more.c index f89387436..538708caa 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 @@ -19,125 +25,180 @@ * */ - -/* Turning this off makes things a bit smaller (and less pretty) */ -#define BB_MORE_TERM - - - -#include "internal.h" +#include "busybox.h" #include +#include #include +#include +#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) +# 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; + +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 */ -const char more_usage[] = "[file ...]"; - - -#ifdef BB_MORE_TERM - #include - #include - #include - - FILE *cin; - struct termios initial_settings, new_settings; +static int terminal_width = 79; /* not 80 in case terminal has linefold bug */ +static int terminal_height = 24; - void gotsig(int sig) { - tcsetattr(fileno(cin), TCSANOW, &initial_settings); - exit( TRUE); - } -#endif extern int more_main(int argc, char **argv) { - int c, lines=0, input; - int next_page=0, rows = 24; -#ifdef BB_MORE_TERM - int cols; - struct winsize win; + 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, 0, 0 }; #endif - struct stat st; - FILE *file = stdin; - - if ( strcmp(*argv,"--help")==0 || strcmp(*argv,"-h")==0 ) { - fprintf(stderr, "Usage: %s %s", *argv, more_usage); - exit(FALSE); - } - argc--; - argv++; - - while (argc-- > 0) { - file = fopen(*argv, "r"); - if (file == NULL) { - perror("Can't open file"); - exit(FALSE); - } - fstat(fileno(file), &st); - fprintf(stderr, "hi\n"); - -#ifdef BB_MORE_TERM - cin = fopen("/dev/tty", "r"); - tcgetattr(fileno(cin),&initial_settings); - new_settings = initial_settings; - new_settings.c_lflag &= ~ICANON; - new_settings.c_lflag &= ~ECHO; - tcsetattr(fileno(cin), TCSANOW, &new_settings); - - (void) signal(SIGINT, gotsig); - - ioctl(STDOUT_FILENO, TIOCGWINSZ, &win); - if (win.ws_row > 4) rows = win.ws_row - 2; - if (win.ws_col > 0) cols = win.ws_col - 1; + argc--; + argv++; + do { + if (argc == 0) { + file = stdin; + } else + file = xfopen(*argv, "r"); + + 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 = printf("--More-- "); + if (file != stdin) { +#if _FILE_OFFSET_BITS == 64 + len += printf("(%d%% of %lld bytes)", +#else + len += printf("(%d%% of %ld bytes)", #endif - while ((c = getc(file)) != EOF) { - if ( next_page ) { - int len=0; - next_page = 0; - lines=0; - len = fprintf(stdout, "--More-- (%d%% of %ld bytes)%s", - (int) (100*( (double) ftell(file) / (double) st.st_size )), - st.st_size, -#ifdef BB_MORE_TERM - "" + (int) (100 * + ((double) ftell(file) / + (double) st.st_size)), + st.st_size); + } + len += printf("%s", +#ifdef BB_FEATURE_USE_TERMIOS + "" #else - "\n" + "\n" #endif - ); + ); - fflush(stdout); - input = getc( stdin); - -#ifdef BB_MORE_TERM - /* Erase the "More" message */ - while(len-- > 0) - putc('\b', stdout); - while(len++ < cols) - putc(' ', stdout); - while(len-- > 0) - putc('\b', stdout); - 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 + input = getc(cin); +#else + input = getc(stdin); #endif - } - if (input=='q') - goto end; - if (input==' ' && c == '\n' ) - next_page = 1; - if ( c == '\n' && ++lines == (rows + 1) ) - next_page = 1; - putc(c, stdout); - } - fclose(file); - fflush(stdout); +#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 - argc--; - argv++; - } -end: -#ifdef BB_MORE_TERM - gotsig(0); -#endif - exit(TRUE); -} + } + + /* + * 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); +}