X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=util-linux%2Fmore.c;h=2ad1e797c25fc34c0ac3b4e9d796f366e22d9dd6;hb=53433b3ca1fb5593167b6fd66f879d45f8f31ecc;hp=77e0c2f7ec9ad7ae654d9f6e029cc668d4e6054e;hpb=be30a6b8b008aeacacf0a83fe24cadf4f99f2d93;p=oweals%2Fbusybox.git diff --git a/util-linux/more.c b/util-linux/more.c index 77e0c2f7e..2ad1e797c 100644 --- a/util-linux/more.c +++ b/util-linux/more.c @@ -2,13 +2,15 @@ /* * 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 @@ -29,115 +31,108 @@ #include #include #include +#include #include #include "busybox.h" -#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 - -static FILE *cin; + + +#ifdef CONFIG_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; +static void set_tty_to_initial_mode(void) +{ + setTermSettings(cin_fileno, &initial_settings); +} + static void gotsig(int sig) { - setTermSettings(fileno(cin), &initial_settings); putchar('\n'); exit(EXIT_FAILURE); } -#endif /* BB_FEATURE_USE_TERMIOS */ +#endif /* CONFIG_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 c, lines = 0, input = 0; + int c, lines, input = 0; int please_display_more_prompt = 0; struct stat st; FILE *file; - int len; - -#if defined BB_FEATURE_AUTOWIDTH && defined BB_FEATURE_USE_TERMIOS - struct winsize win = { 0, 0, 0, 0 }; -#endif + FILE *cin; + int len, page_height; + int terminal_width; + int terminal_height; 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"); + /* not use inputing from terminal if usage: more > outfile */ + if(isatty(STDOUT_FILENO)) { + cin = fopen(CURRENT_TTY, "r"); if (!cin) - cin = fopen("/dev/console", "r"); - getTermSettings(fileno(cin), &initial_settings); + cin = bb_xfopen(CONSOLE_DEV, "r"); + please_display_more_prompt = 2; +#ifdef CONFIG_FEATURE_USE_TERMIOS + cin_fileno = fileno(cin); + getTermSettings(cin_fileno, &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 - + new_settings.c_cc[VMIN] = 1; + new_settings.c_cc[VTIME] = 0; + setTermSettings(cin_fileno, &new_settings); + atexit(set_tty_to_initial_mode); (void) signal(SIGINT, gotsig); (void) signal(SIGQUIT, gotsig); (void) signal(SIGTERM, gotsig); - #endif - len = 0; + } else { + cin = stdin; + } + + do { + if (argc == 0) { + file = stdin; + } else + file = bb_wfopen(*argv, "r"); + if(file==0) + goto loop; + + st.st_size = 0; + fstat(fileno(file), &st); + + please_display_more_prompt &= ~1; + + get_terminal_width_height(fileno(cin), &terminal_width, &terminal_height); + if (terminal_height > 4) + terminal_height -= 2; + if (terminal_width > 0) + terminal_width -= 1; + + len=0; + lines = 0; + page_height = terminal_height; while ((c = getc(file)) != EOF) { - if (please_display_more_prompt) { - lines = 0; - please_display_more_prompt = 0; + if ((please_display_more_prompt & 3) == 3) { len = printf("--More-- "); - if (file != stdin) { + 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 - (int) (100 * - ((double) ftell(file) / - (double) st.st_size)), - st.st_size); } - len += printf("%s", -#ifdef BB_FEATURE_USE_TERMIOS - "" -#else - "\n" -#endif - ); fflush(stdout); @@ -145,29 +140,28 @@ extern int more_main(int argc, char **argv) * 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); +#ifndef CONFIG_FEATURE_USE_TERMIOS + printf("\033[A"); /* up cursor */ #endif - -#ifdef BB_FEATURE_USE_TERMIOS /* Erase the "More" message */ + putc('\r', stdout); while (--len >= 0) - putc('\b', stdout); - while (++len <= terminal_width) putc(' ', stdout); - while (--len >= 0) - putc('\b', stdout); - fflush(stdout); -#endif + putc('\r', stdout); len=0; + lines = 0; + page_height = terminal_height; + 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" + * 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 @@ -175,24 +169,25 @@ extern int more_main(int argc, char **argv) * 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; - } + /* 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) { - div_t result = div( len, terminal_width); - if (result.quot) - terminal_height-=(result.quot-1); + 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 == terminal_height) { - please_display_more_prompt = 1; + if (++lines >= page_height) { + please_display_more_prompt |= 1; } len=0; } @@ -205,12 +200,9 @@ extern int more_main(int argc, char **argv) } fclose(file); fflush(stdout); - +loop: argv++; } while (--argc > 0); end: -#ifdef BB_FEATURE_USE_TERMIOS - gotsig(0); -#endif - return(TRUE); + return 0; }