X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=util-linux%2Fmore.c;h=2a38ef326762760c19f0fca86f4f53bdc3c821c8;hb=51742f4bb0c57a4d5063ece9437a2f34a42e52c8;hp=53437ed58c50deed4e14e44c5a3b4a6066d13c34;hpb=b0e9a709ba1ae1724d413a77f5b67b1a3e6c6cb7;p=oweals%2Fbusybox.git diff --git a/util-linux/more.c b/util-linux/more.c index 53437ed58..2a38ef326 100644 --- a/util-linux/more.c +++ b/util-linux/more.c @@ -1,142 +1,173 @@ +/* vi: set sw=4 ts=4: */ /* * Mini more implementation for busybox * - * Copyright (C) 1998 by Erik Andersen + * Copyright (C) 1995, 1996 by Bruce Perens . + * Copyright (C) 1999-2004 by Erik Andersen * - * 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 - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * 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 distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Termios corrects by Vladimir Oleynik * + * Licensed under GPLv2 or later, see file License in this tarball for details. */ - -/* Turning this off makes things a bit smaller (and less pretty) */ -#define BB_MORE_TERM - +#include "busybox.h" -#include "internal.h" -#include -#include +#if ENABLE_FEATURE_USE_TERMIOS +static int cin_fileno; +#include +#define setTermSettings(fd, argp) tcsetattr(fd, TCSANOW, argp) +#define getTermSettings(fd, argp) tcgetattr(fd, argp); +static struct termios initial_settings, new_settings; -const char more_usage[] = "[file ...]"; - - -#ifdef BB_MORE_TERM - #include - #include - #include +static void set_tty_to_initial_mode(void) +{ + setTermSettings(cin_fileno, &initial_settings); +} - FILE *cin; - struct termios initial_settings, new_settings; +static void gotsig(int sig) +{ + putchar('\n'); + exit(EXIT_FAILURE); +} +#endif /* FEATURE_USE_TERMIOS */ - void gotsig(int sig) { - tcsetattr(fileno(cin), TCSANOW, &initial_settings); - exit( TRUE); - } -#endif -extern int more_main(int argc, char **argv) +int more_main(int argc, char **argv); +int more_main(int argc, char **argv) { - int c, lines=0, input=0; - int next_page=0, rows = 24; -#ifdef BB_MORE_TERM - int cols=79; - struct winsize win; -#endif - struct stat st; - FILE *file = stdin; - - if ( strcmp(*argv,"--help")==0 || strcmp(*argv,"-h")==0 ) { - usage (more_usage); - } - 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); + int c, lines, input = 0; + int please_display_more_prompt = 0; + struct stat st; + FILE *file; + FILE *cin; + int len, page_height; + int terminal_width; + int terminal_height; + + argv++; + /* Another popular pager, most, detects when stdout + * is not a tty and turns into cat. This makes sense. */ + if (!isatty(STDOUT_FILENO)) + return bb_cat(argv); + cin = fopen(CURRENT_TTY, "r"); + if (!cin) + return bb_cat(argv); + +#if ENABLE_FEATURE_USE_TERMIOS + cin_fileno = fileno(cin); + getTermSettings(cin_fileno, &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; - - + new_settings.c_cc[VMIN] = 1; + new_settings.c_cc[VTIME] = 0; + setTermSettings(cin_fileno, &new_settings); + atexit(set_tty_to_initial_mode); + signal(SIGINT, gotsig); + signal(SIGQUIT, gotsig); + signal(SIGTERM, gotsig); #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 - "" -#else - "\n" + please_display_more_prompt = 2; + + do { + file = stdin; + if (*argv) { + file = fopen_or_warn(*argv, "r"); + if (!file) + continue; + } + st.st_size = 0; + fstat(fileno(file), &st); + + please_display_more_prompt &= ~1; + /* never returns w, h <= 1 */ + get_terminal_width_height(fileno(cin), &terminal_width, &terminal_height); + terminal_width -= 1; + terminal_height -= 1; + + len = 0; + lines = 0; + page_height = terminal_height; + while ((c = getc(file)) != EOF) { + + if ((please_display_more_prompt & 3) == 3) { + len = printf("--More-- "); + if (/*file != stdin &&*/ st.st_size > 0) { + len += printf("(%d%% of %"OFF_FMT"d bytes)", + (int) (ftello(file)*100 / st.st_size), + st.st_size); + } + fflush(stdout); + + /* + * We've just displayed the "--More--" prompt, so now we need + * to get input from the user. + */ + input = getc(cin); +#if !ENABLE_FEATURE_USE_TERMIOS + printf("\033[A"); /* up cursor */ #endif - ); - + /* Erase the "More" message */ + printf("\r%*s\r", len, ""); + len = 0; + lines = 0; + /* Bottom line on page will become top line + * after one page forward. Thus -1: */ + page_height = terminal_height - 1; + please_display_more_prompt &= ~1; + + if (input == 'q') + goto end; + } + + /* + * 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') { + /* increment by just one line if we are at + * the end of this line */ + if (input == '\n') + please_display_more_prompt |= 1; + /* Adjust the terminal height for any overlap, so that + * no lines get lost off the top. */ + if (len >= terminal_width) { + int quot, rem; + quot = len / terminal_width; + rem = len - (quot * terminal_width); + page_height -= (quot - 1); + if (rem) + page_height--; + } + if (++lines >= page_height) { + please_display_more_prompt |= 1; + } + len = 0; + } + /* + * 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); + /* My small mind cannot fathom tabs, backspaces, + * and UTF-8 */ + len++; + } + fclose(file); 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); -#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); - - argc--; - argv++; - } -end: -#ifdef BB_MORE_TERM - gotsig(0); -#endif - exit(TRUE); + } while (*argv && *++argv); + end: + return 0; } -