X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;ds=sidebyside;f=util-linux%2Fmore.c;h=55694e434936cb097fd958efe6632a3163d4aca7;hb=dd8adde3866ac22bd510348b733bb29e1662ac6d;hp=ff0557d220a2b89122fc808c9c8690ac0d989fa4;hpb=cad5364599eb5062d59e0c397ed638ddd61a8d5d;p=oweals%2Fbusybox.git diff --git a/util-linux/more.c b/util-linux/more.c index ff0557d22..55694e434 100644 --- a/util-linux/more.c +++ b/util-linux/more.c @@ -3,216 +3,195 @@ * Mini more implementation for busybox * * Copyright (C) 1995, 1996 by Bruce Perens . - * Copyright (C) 1999-2002 by Erik Andersen + * 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 - * + * Licensed under GPLv2 or later, see file License in this tarball for details. */ -#include -#include -#include -#include -#include -#include -#include "busybox.h" +#include "libbb.h" -static FILE *cin; +/* Support for FEATURE_USE_TERMIOS */ -#ifdef CONFIG_FEATURE_USE_TERMIOS -#include -#define setTermSettings(fd,argp) tcsetattr(fd,TCSANOW,argp) -#define getTermSettings(fd,argp) tcgetattr(fd, argp); +struct globals { + int cin_fileno; + struct termios initial_settings; + struct termios new_settings; +} FIX_ALIASING; +#define G (*(struct globals*)bb_common_bufsiz1) +#define INIT_G() ((void)0) +#define initial_settings (G.initial_settings) +#define new_settings (G.new_settings ) +#define cin_fileno (G.cin_fileno ) -static struct termios initial_settings, new_settings; +#define setTermSettings(fd, argp) do { \ + if (ENABLE_FEATURE_USE_TERMIOS) tcsetattr(fd, TCSANOW, argp); \ + } while(0) +#define getTermSettings(fd, argp) tcgetattr(fd, argp) -static void set_tty_to_initial_mode(void) +static void gotsig(int sig UNUSED_PARAM) { - setTermSettings(fileno(cin), &initial_settings); -} - -static void gotsig(int sig) -{ - putchar('\n'); + bb_putchar('\n'); + setTermSettings(cin_fileno, &initial_settings); exit(EXIT_FAILURE); } -#endif /* CONFIG_FEATURE_USE_TERMIOS */ - -static int terminal_width = 79; /* not 80 in case terminal has linefold bug */ -static int terminal_height = 24; +#define CONVERTED_TAB_SIZE 8 - -extern int more_main(int argc, char **argv) +int more_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; +int more_main(int argc UNUSED_PARAM, char **argv) { - int c, lines, input = 0; - int please_display_more_prompt = -1; + int c = c; /* for gcc */ + int lines; + int input = 0; + int spaces = 0; + int please_display_more_prompt; struct stat st; FILE *file; - int len, page_height; + FILE *cin; + int len; + unsigned terminal_width; + unsigned terminal_height; -#if defined CONFIG_FEATURE_AUTOWIDTH && defined CONFIG_FEATURE_USE_TERMIOS - struct winsize win = { 0, 0, 0, 0 }; -#endif + INIT_G(); - argc--; argv++; - - - /* not use inputing from terminal if usage: more > outfile */ - if(isatty(fileno(stdout))) { - cin = fopen(CURRENT_TTY, "r"); - if (!cin) - cin = bb_xfopen(CONSOLE_DEV, "r"); - please_display_more_prompt = 0; -#ifdef CONFIG_FEATURE_USE_TERMIOS - getTermSettings(fileno(cin), &initial_settings); + /* 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_for_read(CURRENT_TTY); + 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; -#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); -#endif + setTermSettings(cin_fileno, &new_settings); + bb_signals(0 + + (1 << SIGINT) + + (1 << SIGQUIT) + + (1 << SIGTERM) + , gotsig); } do { - if (argc == 0) { - file = stdin; - } else - file = bb_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; - -#if defined CONFIG_FEATURE_AUTOWIDTH && defined CONFIG_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; - lines = 0; - page_height = terminal_height; - while ((c = getc(file)) != EOF) { + please_display_more_prompt = 0; + /* never returns w, h <= 1 */ + get_terminal_width_height(fileno(cin), &terminal_width, &terminal_height); + terminal_height -= 1; - if (please_display_more_prompt>0) { + len = 0; + lines = 0; + while (spaces || (c = getc(file)) != EOF) { + int wrap; + if (spaces) + spaces--; + loop_top: + if (input != 'r' && please_display_more_prompt) { len = printf("--More-- "); - if (file != stdin && st.st_size > 0) { -#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 (st.st_size > 0) { + len += printf("(%u%% of %"OFF_FMT"u bytes)", + (int) (ftello(file)*100 / st.st_size), + st.st_size); } - - fflush(stdout); + fflush_all(); /* * We've just displayed the "--More--" prompt, so now we need * to get input from the user. */ - input = getc(cin); -#ifndef CONFIG_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; + for (;;) { + input = getc(cin); + input = tolower(input); + if (!ENABLE_FEATURE_USE_TERMIOS) + printf("\033[A"); /* cursor up */ + /* Erase the last message */ + printf("\r%*s\r", len, ""); + + /* Due to various multibyte escape + * sequences, it's not ok to accept + * any input as a command to scroll + * the screen. We only allow known + * commands, else we show help msg. */ + if (input == ' ' || input == '\n' || input == 'q' || input == 'r') + break; + len = printf("(Enter:next line Space:next page Q:quit R:show the rest)"); + } + len = 0; lines = 0; - page_height = terminal_height; please_display_more_prompt = 0; if (input == 'q') goto end; + + /* The user may have resized the terminal. + * Re-read the dimensions. */ + if (ENABLE_FEATURE_USE_TERMIOS) { + get_terminal_width_height(cin_fileno, &terminal_width, &terminal_height); + terminal_height -= 1; + } + } + + /* Crudely convert tabs into spaces, which are + * a bajillion times easier to deal with. */ + if (c == '\t') { + spaces = CONVERTED_TAB_SIZE - 1; + c = ' '; } - /* + /* * 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 + * 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') - if(please_display_more_prompt==0) - 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); - } - } - if (++lines >= page_height) { - if(please_display_more_prompt==0) + wrap = (++len > terminal_width); + if (c == '\n' || wrap) { + /* Then outputting this character + * will move us to a new line. */ + if (++lines >= terminal_height || input == '\n') 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); - len++; + if (c != '\n' && wrap) { + /* Then outputting this will also put a character on + * the beginning of that new line. Thus we first want to + * display the prompt (if any), so we skip the putchar() + * and go back to the top of the loop, without reading + * a new character. */ + goto loop_top; + } + /* My small mind cannot fathom backspaces and UTF-8 */ + putchar(c); } fclose(file); - fflush(stdout); -loop: - argv++; - } while (--argc > 0); - end: + fflush_all(); + } while (*argv && *++argv); + end: + setTermSettings(cin_fileno, &initial_settings); return 0; }