X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=util-linux%2Fmore.c;h=05fe86970ade5ce5abafa96d52b8d900bafbbc54;hb=29f9b2fbdbfdd1509aa0a91df70764c72e2b3e54;hp=bc3850510205b8d454eeb31e28668e5fde843b8b;hpb=c49960189a04b73e033016bd0f43fbb950f800e1;p=oweals%2Fbusybox.git diff --git a/util-linux/more.c b/util-linux/more.c index bc3850510..05fe86970 100644 --- a/util-linux/more.c +++ b/util-linux/more.c @@ -1,11 +1,15 @@ +/* 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 * - * Copyright (C) 1999 by Lineo, inc. - * Blended by Erik Andersen , - * based on the original more implementation and code from the Debian - * boot-floppies team. + * 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 @@ -23,140 +27,192 @@ * */ - -/* Turning this off makes things a bit smaller (and less pretty) */ -#define BB_MORE_TERM - - - -#include "internal.h" #include #include #include +#include +#include +#include +#include "busybox.h" +static FILE *cin; -static const char more_usage[] = "[file ...]"; +#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; -/* ED: sparc termios is broken: revert back to old termio handling. */ -#ifdef BB_MORE_TERM +static void set_tty_to_initial_mode(void) +{ + setTermSettings(fileno(cin), &initial_settings); +} +static void gotsig(int sig) +{ + putchar('\n'); + exit(EXIT_FAILURE); +} +#endif /* CONFIG_FEATURE_USE_TERMIOS */ -#if defined (__sparc__) -# define USE_OLD_TERMIO -# include -# 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 int terminal_width = 79; /* not 80 in case terminal has linefold bug */ +static int terminal_height = 24; - void gotsig(int sig) { - stty(fileno(cin), &initial_settings); - exit( TRUE); - } -#endif extern int more_main(int argc, char **argv) { - int c, lines=0, input=0; - int next_page=0; - struct stat st; - FILE *file; - - if ( strcmp(*argv,"--help")==0 || strcmp(*argv,"-h")==0 ) { - usage (more_usage); - } - argc--; - argv++; - - while (argc >= 0) { - if (argc==0) { - file = stdin; - } - else - file = fopen(*argv, "r"); - - if (file == NULL) { - perror(*argv); - exit(FALSE); - } - fstat(fileno(file), &st); - -#ifdef BB_MORE_TERM - 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); + 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 - new_settings = initial_settings; - new_settings.c_lflag &= ~ICANON; - new_settings.c_lflag &= ~ECHO; - stty(fileno(cin), &new_settings); - - (void) signal(SIGINT, gotsig); + 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 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 - 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_MORE_TERM - "" -#else - "\n" + setTermSettings(fileno(cin), &new_settings); + atexit(set_tty_to_initial_mode); + (void) signal(SIGINT, gotsig); + (void) signal(SIGQUIT, gotsig); + (void) signal(SIGTERM, gotsig); #endif - ); + } - fflush(stdout); - input = getc( cin); - -#ifdef BB_MORE_TERM - /* Erase the "More" message */ - while(len-- > 0) - putc('\b', stdout); - while(len++ < 79) - putc(' ', stdout); - while(len-- > 0) - putc('\b', stdout); - fflush(stdout); + 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 + 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 + len += printf("(%d%% of %ld bytes)", + (int) (100 * ((double) ftell(file) / + (double) st.st_size)), (long)st.st_size); +#endif + } - } - if (input=='q') - goto end; - if (input==' ' && c == '\n' ) - next_page = 1; - if ( c == '\n' && ++lines == 24 ) - next_page = 1; - putc(c, stdout); - } - fclose(file); - fflush(stdout); + fflush(stdout); - argc--; - argv++; - } -end: -#ifdef BB_MORE_TERM - gotsig(0); -#endif - exit(TRUE); + /* + * 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++; + } + fclose(file); + fflush(stdout); +loop: + argv++; + } while (--argc > 0); + end: + return 0; } -