tcpsvd: fix line buffering, add firewall query code

[oweals/busybox.git] / util-linux / more.c

diff --git a/util-linux/more.c b/util-linux/more.c
index 85209ce61b362c17c7a568abe3b0c22c8e05076d..2a38ef326762760c19f0fca86f4f53bdc3c821c8 100644 (file)
--- a/util-linux/more.c
+++ b/util-linux/more.c
@@ -17,11 +17,11 @@
 #include "busybox.h"
 
 
-#ifdef CONFIG_FEATURE_USE_TERMIOS
+#if ENABLE_FEATURE_USE_TERMIOS
 static int cin_fileno;
 #include <termios.h>
-#define setTermSettings(fd,argp) tcsetattr(fd,TCSANOW,argp)
-#define getTermSettings(fd,argp) tcgetattr(fd, argp);
+#define setTermSettings(fd, argp) tcsetattr(fd, TCSANOW, argp)
+#define getTermSettings(fd, argp) tcgetattr(fd, argp);
 
 static struct termios initial_settings, new_settings;
 
@@ -35,9 +35,10 @@ static void gotsig(int sig)
        putchar('\n');
        exit(EXIT_FAILURE);
 }
-#endif /* CONFIG_FEATURE_USE_TERMIOS */
+#endif /* FEATURE_USE_TERMIOS */
 
 
+int more_main(int argc, char **argv);
 int more_main(int argc, char **argv)
 {
        int c, lines, input = 0;
@@ -49,72 +50,59 @@ int more_main(int argc, char **argv)
        int terminal_width;
        int terminal_height;
 
-       argc--;
        argv++;
-
-
-       /* not use inputing from terminal if usage: more > outfile */
-       if(isatty(STDOUT_FILENO)) {
-               cin = fopen(CURRENT_TTY, "r");
-               if (!cin)
-                       cin = 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_lflag &= ~ICANON;
-               new_settings.c_lflag &= ~ECHO;
-               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);
+       /* 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(CURRENT_TTY, "r");
+       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;
+       new_settings.c_cc[VMIN] = 1;
+       new_settings.c_cc[VTIME] = 0;
+       setTermSettings(cin_fileno, &new_settings);
+       atexit(set_tty_to_initial_mode);
+       signal(SIGINT, gotsig);
+       signal(SIGQUIT, gotsig);
+       signal(SIGTERM, gotsig);
 #endif
-       } else {
-               cin = stdin;
-       }
+       please_display_more_prompt = 2;
 
        do {
-               if (argc == 0) {
-                       file = stdin;
-               } else
+               file = stdin;
+               if (*argv) {
                        file = fopen_or_warn(*argv, "r");
-               if(file==0)
-                       goto loop;
-
+                       if (!file)
+                               continue;
+               }
                st.st_size = 0;
                fstat(fileno(file), &st);
 
                please_display_more_prompt &= ~1;
-
+               /* never returns w, h <= 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;
+               terminal_width -= 1;
+               terminal_height -= 1;
 
-               len=0;
+               len = 0;
                lines = 0;
                page_height = terminal_height;
                while ((c = getc(file)) != EOF) {
 
                        if ((please_display_more_prompt & 3) == 3) {
                                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 (/*file != stdin &&*/ st.st_size > 0) {
+                                       len += printf("(%d%% of %"OFF_FMT"d bytes)",
+                                               (int) (ftello(file)*100 / st.st_size),
+                                               st.st_size);
                                }
-
                                fflush(stdout);
 
                                /*
@@ -122,17 +110,16 @@ int more_main(int argc, char **argv)
                                 * to get input from the user.
                                 */
                                input = getc(cin);
-#ifndef CONFIG_FEATURE_USE_TERMIOS
+#if !ENABLE_FEATURE_USE_TERMIOS
                                printf("\033[A"); /* up cursor */
 #endif
                                /* Erase the "More" message */
-                               putc('\r', stdout);
-                               while (--len >= 0)
-                                       putc(' ', stdout);
-                               putc('\r', stdout);
-                               len=0;
+                               printf("\r%*s\r", len, "");
+                               len = 0;
                                lines = 0;
-                               page_height = terminal_height;
+                               /* Bottom line on page will become top line
+                                * after one page forward. Thus -1: */
+                               page_height = terminal_height - 1;
                                please_display_more_prompt &= ~1;
 
                                if (input == 'q')
@@ -160,30 +147,27 @@ int more_main(int argc, char **argv)
                                        int quot, rem;
                                        quot = len / terminal_width;
                                        rem  = len - (quot * terminal_width);
-                                       if (quot) {
-                                               if (rem)
-                                                       page_height-=quot;
-                                               else
-                                                       page_height-=(quot-1);
-                                       }
+                                       page_height -= (quot - 1);
+                                       if (rem)
+                                               page_height--;
                                }
                                if (++lines >= page_height) {
                                        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);
+                       /* My small mind cannot fathom tabs, backspaces,
+                        * and UTF-8 */
                        len++;
                }
                fclose(file);
                fflush(stdout);
-loop:
-               argv++;
-       } while (--argc > 0);
-  end:
+       } while (*argv && *++argv);
+ end:
        return 0;
 }