X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;ds=sidebyside;f=util-linux%2Fmore.c;h=2a38ef326762760c19f0fca86f4f53bdc3c821c8;hb=51742f4bb0c57a4d5063ece9437a2f34a42e52c8;hp=780cddf665e1b75dfb105047a5dd65b5f46c2ba3;hpb=439e3df65300100e4b63580141eaa238c30431d5;p=oweals%2Fbusybox.git diff --git a/util-linux/more.c b/util-linux/more.c index 780cddf66..2a38ef326 100644 --- a/util-linux/more.c +++ b/util-linux/more.c @@ -2,51 +2,32 @@ /* * Mini more implementation for busybox * - * * Copyright (C) 1995, 1996 by Bruce Perens . + * Copyright (C) 1999-2004 by Erik Andersen * - * Latest version blended together by Erik Andersen , - * based on the original more implementation by Bruce, and code from the + * Latest version blended together by Erik Andersen , + * based on the original more implementation by Bruce, and code from the * Debian boot-floppies team. * - * Termios corrects by Vladimir Oleynik - * - * 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. - * - * 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. */ -#include -#include -#include -#include -#include -#include #include "busybox.h" -static FILE *cin; -#ifdef BB_FEATURE_USE_TERMIOS +#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); +#define setTermSettings(fd, argp) tcsetattr(fd, TCSANOW, argp) +#define getTermSettings(fd, argp) tcgetattr(fd, argp); static struct termios initial_settings, new_settings; static void set_tty_to_initial_mode(void) { - setTermSettings(fileno(cin), &initial_settings); + setTermSettings(cin_fileno, &initial_settings); } static void gotsig(int sig) @@ -54,92 +35,74 @@ static void gotsig(int sig) putchar('\n'); exit(EXIT_FAILURE); } -#endif /* BB_FEATURE_USE_TERMIOS */ - +#endif /* FEATURE_USE_TERMIOS */ -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 more_main(int argc, char **argv); +int more_main(int argc, char **argv) { int c, lines, input = 0; - int please_display_more_prompt = -1; + int please_display_more_prompt = 0; struct stat st; FILE *file; + FILE *cin; int len, page_height; + int terminal_width; + int terminal_height; -#if defined BB_FEATURE_AUTOWIDTH && defined BB_FEATURE_USE_TERMIOS - struct winsize win = { 0, 0, 0, 0 }; -#endif - - argc--; argv++; - - - /* not use inputing from terminal if usage: more > outfile */ - if(isatty(fileno(stdout))) { - cin = fopen(CURRENT_TTY, "r"); - if (!cin) - cin = xfopen(CONSOLE_DEV, "r"); - please_display_more_prompt = 0; -#ifdef BB_FEATURE_USE_TERMIOS - getTermSettings(fileno(cin), &initial_settings); - new_settings = initial_settings; - new_settings.c_lflag &= ~ICANON; - new_settings.c_lflag &= ~ECHO; -#ifndef linux - /* Hmm, in linux c_cc[] not parsed if set ~ICANON */ - new_settings.c_cc[VMIN] = 1; - new_settings.c_cc[VTIME] = 0; -#endif - setTermSettings(fileno(cin), &new_settings); - atexit(set_tty_to_initial_mode); - (void) signal(SIGINT, gotsig); - (void) signal(SIGQUIT, gotsig); - (void) signal(SIGTERM, gotsig); + /* 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; + 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 - } + please_display_more_prompt = 2; do { - if (argc == 0) { - file = stdin; - } else - file = wfopen(*argv, "r"); - if(file==0) - goto loop; - + file = stdin; + if (*argv) { + file = fopen_or_warn(*argv, "r"); + if (!file) + continue; + } + st.st_size = 0; fstat(fileno(file), &st); - if(please_display_more_prompt>0) - please_display_more_prompt = 0; + 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; -#if defined BB_FEATURE_AUTOWIDTH && defined BB_FEATURE_USE_TERMIOS - 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 - len=0; + len = 0; lines = 0; page_height = terminal_height; while ((c = getc(file)) != EOF) { - if (please_display_more_prompt>0) { + if ((please_display_more_prompt & 3) == 3) { len = printf("--More-- "); - if (file != stdin) { -#if _FILE_OFFSET_BITS == 64 - len += printf("(%d%% of %lld bytes)", - (int) (100 * ((double) ftell(file) / - (double) st.st_size)), (long long)st.st_size); -#else - len += printf("(%d%% of %ld bytes)", - (int) (100 * ((double) ftell(file) / - (double) st.st_size)), (long)st.st_size); -#endif + 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); /* @@ -147,25 +110,23 @@ extern int more_main(int argc, char **argv) * to get input from the user. */ input = getc(cin); -#ifndef BB_FEATURE_USE_TERMIOS +#if !ENABLE_FEATURE_USE_TERMIOS printf("\033[A"); /* up cursor */ #endif /* Erase the "More" message */ - putc('\r', stdout); - while (--len >= 0) - putc(' ', stdout); - putc('\r', stdout); - fflush(stdout); - len=0; + printf("\r%*s\r", len, ""); + len = 0; lines = 0; - page_height = terminal_height; - please_display_more_prompt = 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" @@ -179,39 +140,34 @@ extern int more_main(int argc, char **argv) /* increment by just one line if we are at * the end of this line */ if (input == '\n') - if(please_display_more_prompt==0) - please_display_more_prompt = 1; + 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); - if (quot) { - if (rem) - page_height-=quot; - else - page_height-=(quot-1); - } + page_height -= (quot - 1); + if (rem) + page_height--; } if (++lines >= page_height) { - if(please_display_more_prompt==0) - please_display_more_prompt = 1; + please_display_more_prompt |= 1; } - len=0; + 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); -loop: - argv++; - } while (--argc > 0); - end: + } while (*argv && *++argv); + end: return 0; }