Update internal.h to conditionally include asm/string.h

[oweals/busybox.git] / more.c

diff --git a/more.c b/more.c
index 30d2757cd240eab68b1991e4894e0b92947075c2..13101657810d4e6da140a29232c0d73c98832675 100644 (file)
--- a/more.c
+++ b/more.c
@@ -30,8 +30,15 @@
 #include <fcntl.h>
 #include <signal.h>
 #include <sys/ioctl.h>
+#define BB_DECLARE_EXTERN
+#define bb_need_help
+#include "messages.c"
 
-static const char more_usage[] = "more [file ...]\n";
+static const char more_usage[] = "more [FILE ...]\n"
+#ifndef BB_FEATURE_TRIVIAL_HELP
+       "\nMore is a filter for viewing FILE one screenful at a time.\n"
+#endif
+       ;
 
 /* ED: sparc termios is broken: revert back to old termio handling. */
 #ifdef BB_FEATURE_USE_TERMIOS
@@ -67,9 +74,9 @@ void gotsig(int sig)
 
 #if defined BB_FEATURE_AUTOWIDTH
 #ifdef BB_FEATURE_USE_TERMIOS
-static int terminal_width = 0;
+static int terminal_width = TERMINAL_WIDTH;
 #endif
-static int terminal_height = 0;
+static int terminal_height = TERMINAL_HEIGHT;
 #else
 #define terminal_width TERMINAL_WIDTH
 #define terminal_height        TERMINAL_HEIGHT
@@ -80,7 +87,7 @@ static int terminal_height = 0;
 extern int more_main(int argc, char **argv)
 {
        int c, lines = 0, input = 0;
-       int next_page = 0;
+       int please_display_more_prompt = 0;
        struct stat st;
        FILE *file;
 
@@ -92,7 +99,7 @@ extern int more_main(int argc, char **argv)
        argv++;
 
        if (argc > 0
-               && (strcmp(*argv, "--help") == 0 || strcmp(*argv, "-h") == 0)) {
+               && (strcmp(*argv, dash_dash_help) == 0 || strcmp(*argv, "-h") == 0)) {
                usage(more_usage);
        }
        do {
@@ -133,10 +140,10 @@ extern int more_main(int argc, char **argv)
 
 #endif
                while ((c = getc(file)) != EOF) {
-                       if (next_page) {
+                       if (please_display_more_prompt) {
                                int len = 0;
 
-                               next_page = 0;
+                               please_display_more_prompt = 0;
                                lines = 0;
                                len = fprintf(stdout, "--More-- ");
                                if (file != stdin) {
@@ -155,6 +162,11 @@ extern int more_main(int argc, char **argv)
                                        );
 
                                fflush(stdout);
+
+                               /*
+                                * 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
@@ -173,6 +185,17 @@ extern int more_main(int argc, char **argv)
 #endif
 
                        }
+
+                       /* 
+                        * 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') {
                                switch (input) {
                                case 'q':
@@ -180,12 +203,13 @@ extern int more_main(int argc, char **argv)
                                case '\n':
                                        /* increment by just one line if we are at 
                                         * the end of this line*/
-                                       next_page = 1;
+                                       please_display_more_prompt = 1;
                                        break;
                                }
                                if (++lines == terminal_height)
-                                       next_page = 1;
+                                       please_display_more_prompt = 1;
                        }
+                       /* If any key other than a return is hit, scroll by one page */
                        putc(c, stdout);
                }
                fclose(file);
@@ -197,5 +221,5 @@ extern int more_main(int argc, char **argv)
 #ifdef BB_FEATURE_USE_TERMIOS
        gotsig(0);
 #endif
-       exit(TRUE);
+       return(TRUE);
 }