X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=util-linux%2Fmore.c;h=05fe86970ade5ce5abafa96d52b8d900bafbbc54;hb=081df62b921cf17f1d4c4e0214abfa273c92cfde;hp=7d0ddb8ece069c2007c3de8fd53edd7f1025f788;hpb=96bcfd346b436aef16b29d9157b80fd4148b1421;p=oweals%2Fbusybox.git diff --git a/util-linux/more.c b/util-linux/more.c index 7d0ddb8ec..05fe86970 100644 --- a/util-linux/more.c +++ b/util-linux/more.c @@ -1,13 +1,16 @@ +/* vi: set sw=4 ts=4: */ /* * Mini more implementation for busybox * - * * Copyright (C) 1995, 1996 by Bruce Perens . + * Copyright (C) 1999-2002 by Erik Andersen * * 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 @@ -24,174 +27,192 @@ * */ - -/* Turning this off makes things a bit smaller (and less pretty) */ -#define BB_FEATURE_USE_TERMIOS -/* Turning this off makes things a bit smaller (and less pretty) */ -#define BB_FEATURE_AUTOWIDTH - - - -#include "internal.h" #include #include #include +#include +#include #include +#include "busybox.h" -static const char more_usage[] = "more [file ...]\n"; - -/* ED: sparc termios is broken: revert back to old termio handling. */ -#ifdef BB_FEATURE_USE_TERMIOS - -#if #cpu(sparc) -# define USE_OLD_TERMIO -# include -# define termios termio -# define stty(fd,argp) ioctl(fd,TCSETAF,argp) -#else -# include -# define stty(fd,argp) tcsetattr(fd,TCSANOW,argp) -#endif - - FILE *cin; - struct termios initial_settings, new_settings; +static FILE *cin; - void gotsig(int sig) { - stty(fileno(cin), &initial_settings); - fprintf(stdout, "\n"); - exit( TRUE); - } -#endif +#ifdef CONFIG_FEATURE_USE_TERMIOS +#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(fileno(cin), &initial_settings); +} -#define TERMINAL_WIDTH 79 /* not 80 in case terminal has linefold bug */ -#define TERMINAL_HEIGHT 24 +static void gotsig(int sig) +{ + putchar('\n'); + exit(EXIT_FAILURE); +} +#endif /* CONFIG_FEATURE_USE_TERMIOS */ -#if defined BB_FEATURE_AUTOWIDTH -static int terminal_width = 0, terminal_height = 0; -#else -#define terminal_width TERMINAL_WIDTH -#define terminal_height TERMINAL_HEIGHT -#endif - +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 c, lines=0, input=0; - int next_page=0; - struct stat st; - FILE *file; -#ifdef BB_FEATURE_AUTOWIDTH - struct winsize win = {0,0}; + int c, lines, input = 0; + int please_display_more_prompt = -1; + struct stat st; + FILE *file; + int len, page_height; + +#if defined CONFIG_FEATURE_AUTOWIDTH && defined CONFIG_FEATURE_USE_TERMIOS + struct winsize win = { 0, 0, 0, 0 }; #endif - argc--; - argv++; + argc--; + argv++; - if ( argc > 0 && (strcmp(*argv,"--help")==0 || strcmp(*argv,"-h")==0) ) { - usage (more_usage); - } - do { - if (argc==0) { - file = stdin; - } - else - file = fopen(*argv, "r"); - if (file == NULL) { - perror(*argv); - exit(FALSE); - } - fstat(fileno(file), &st); - -#ifdef BB_FEATURE_USE_TERMIOS - cin = fopen("/dev/tty", "r"); - if (!cin) - cin = fopen("/dev/console", "r"); -#ifdef USE_OLD_TERMIO - ioctl(fileno(cin),TCGETA,&initial_settings); -#else - tcgetattr(fileno(cin),&initial_settings); + /* 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 CONFIG_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 - new_settings = initial_settings; - new_settings.c_lflag &= ~ICANON; - new_settings.c_lflag &= ~ECHO; - stty(fileno(cin), &new_settings); - -#ifdef BB_FEATURE_AUTOWIDTH - ioctl(STDOUT_FILENO, TIOCGWINSZ, &win); - if (win.ws_row > 4) - terminal_height = win.ws_row - 2; - if (win.ws_col > 0) - terminal_width = win.ws_col - 1; + setTermSettings(fileno(cin), &new_settings); + atexit(set_tty_to_initial_mode); + (void) signal(SIGINT, gotsig); + (void) signal(SIGQUIT, gotsig); + (void) signal(SIGTERM, gotsig); #endif + } - (void) signal(SIGINT, gotsig); - (void) signal(SIGQUIT, gotsig); - (void) signal(SIGTERM, gotsig); - + do { + if (argc == 0) { + file = stdin; + } else + file = wfopen(*argv, "r"); + if(file==0) + goto loop; + + 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 - while ((c = getc(file)) != EOF) { - if ( next_page ) { - int len=0; - next_page = 0; - lines=0; - len = fprintf(stdout, "--More-- "); - if (file != stdin) { - len += fprintf(stdout, "(%d%% of %ld bytes)", - (int) (100*( (double) ftell(file) / (double) st.st_size )), - st.st_size); - } - len += fprintf(stdout, "%s", -#ifdef BB_FEATURE_USE_TERMIOS - "" + len=0; + lines = 0; + page_height = terminal_height; + while ((c = getc(file)) != EOF) { + + if (please_display_more_prompt>0) { + 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 - "\n" + len += printf("(%d%% of %ld bytes)", + (int) (100 * ((double) ftell(file) / + (double) st.st_size)), (long)st.st_size); #endif - ); + } - fflush(stdout); - input = getc( cin); - -#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 + fflush(stdout); - } - 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*/ - next_page = 1; - break; + /* + * 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; + lines = 0; + page_height = terminal_height; + please_display_more_prompt = 0; + + 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') + 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) + 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); + len++; } - if ( ++lines == terminal_height ) - next_page = 1; - } - putc(c, stdout); - } - fclose(file); - fflush(stdout); - - argv++; - } while (--argc > 0); -end: -#ifdef BB_FEATURE_USE_TERMIOS - gotsig(0); -#endif - exit(TRUE); + fclose(file); + fflush(stdout); +loop: + argv++; + } while (--argc > 0); + end: + return 0; } -