X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;ds=sidebyside;f=util-linux%2Fmore.c;h=05fe86970ade5ce5abafa96d52b8d900bafbbc54;hb=29f9b2fbdbfdd1509aa0a91df70764c72e2b3e54;hp=9f07633c3269b753c3bfeb71bdc45c50a86a5bbf;hpb=2439a5982876ef4c8ec7291e156e73f244775ba8;p=oweals%2Fbusybox.git diff --git a/util-linux/more.c b/util-linux/more.c index 9f07633c3..05fe86970 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-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 @@ -29,33 +31,30 @@ #include #include #include +#include #include #include "busybox.h" -/* 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 +#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 gotsig(int sig) +static void set_tty_to_initial_mode(void) { setTermSettings(fileno(cin), &initial_settings); +} + +static void gotsig(int sig) +{ 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 */ @@ -65,60 +64,72 @@ static int terminal_height = 24; extern int more_main(int argc, char **argv) { int c, lines, input = 0; - int please_display_more_prompt; + int please_display_more_prompt = -1; struct stat st; FILE *file; int len, page_height; -#if defined BB_FEATURE_AUTOWIDTH && defined BB_FEATURE_USE_TERMIOS +#if defined CONFIG_FEATURE_AUTOWIDTH && defined CONFIG_FEATURE_USE_TERMIOS struct winsize win = { 0, 0, 0, 0 }; #endif 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(fileno(stdout))) { + cin = fopen(CURRENT_TTY, "r"); if (!cin) - cin = xfopen("/dev/console", "r"); + 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_cc[VMIN] = 1; - new_settings.c_cc[VTIME] = 0; 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 + } + + 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; -# ifdef BB_FEATURE_AUTOWIDTH +#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 - - (void) signal(SIGINT, gotsig); - (void) signal(SIGQUIT, gotsig); - (void) signal(SIGTERM, gotsig); - #endif len=0; lines = 0; page_height = terminal_height; - please_display_more_prompt = 0; while ((c = getc(file)) != EOF) { - if (please_display_more_prompt) { + if (please_display_more_prompt>0) { 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) / @@ -129,13 +140,6 @@ extern int more_main(int argc, char **argv) (double) st.st_size)), (long)st.st_size); #endif } - len += printf("%s", -#ifdef BB_FEATURE_USE_TERMIOS - "" -#else - "\n" -#endif - ); fflush(stdout); @@ -143,20 +147,16 @@ 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(' ', stdout); putc('\r', stdout); fflush(stdout); -#endif len=0; lines = 0; page_height = terminal_height; @@ -180,6 +180,7 @@ 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; /* Adjust the terminal height for any overlap, so that * no lines get lost off the top. */ @@ -195,6 +196,7 @@ extern int more_main(int argc, char **argv) } } if (++lines >= page_height) { + if(please_display_more_prompt==0) please_display_more_prompt = 1; } len=0; @@ -208,12 +210,9 @@ extern int more_main(int argc, char **argv) } fclose(file); fflush(stdout); - +loop: argv++; } while (--argc > 0); end: -#ifdef BB_FEATURE_USE_TERMIOS - setTermSettings(fileno(cin), &initial_settings); -#endif return 0; }