Extract usage information into a separate file.

[oweals/busybox.git] / more.c

diff --git a/more.c b/more.c
index 20aa37095a416e4abf50c7b359b83b328196d674..2334576c05c228322f82797cad49651ef4a5554b 100644 (file)
--- a/more.c
+++ b/more.c
@@ -30,24 +30,25 @@
 #include <fcntl.h>
 #include <signal.h>
 #include <sys/ioctl.h>
-
-static const char more_usage[] = "more [file ...]\n";
+#define BB_DECLARE_EXTERN
+#define bb_need_help
+#include "messages.c"
 
 /* ED: sparc termios is broken: revert back to old termio handling. */
 #ifdef BB_FEATURE_USE_TERMIOS
-
-#if #cpu(sparc)
-#      include <termio.h>
-#      define termios termio
-#      define setTermSettings(fd,argp) ioctl(fd,TCSETAF,argp)
-#      define getTermSettings(fd,argp) ioctl(fd,TCGETA,argp)
-#else
-#      include <termios.h>
-#      define setTermSettings(fd,argp) tcsetattr(fd,TCSANOW,argp)
-#      define getTermSettings(fd,argp) tcgetattr(fd, argp);
-#endif
+#      if #cpu(sparc)
+#              include <termio.h>
+#              define termios termio
+#              define setTermSettings(fd,argp) ioctl(fd,TCSETAF,argp)
+#              define getTermSettings(fd,argp) ioctl(fd,TCGETA,argp)
+#      else
+#              include <termios.h>
+#              define setTermSettings(fd,argp) tcsetattr(fd,TCSANOW,argp)
+#              define getTermSettings(fd,argp) tcgetattr(fd, argp);
+#      endif
 
 FILE *cin;
+
 struct termios initial_settings, new_settings;
 
 void gotsig(int sig)
@@ -56,39 +57,29 @@ void gotsig(int sig)
        fprintf(stdout, "\n");
        exit(TRUE);
 }
-#endif
-
-
+#endif /* BB_FEATURE_USE_TERMIOS */
 
-#define TERMINAL_WIDTH 79              /* not 80 in case terminal has linefold bug */
-#define TERMINAL_HEIGHT        24
-
-
-#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;
+       int please_display_more_prompt = 0;
        struct stat st;
        FILE *file;
 
-#ifdef BB_FEATURE_AUTOWIDTH
-       struct winsize win = { 0, 0 };
+#if defined BB_FEATURE_AUTOWIDTH && defined BB_FEATURE_USE_TERMIOS
+       struct winsize win = { 0, 0, 0, 0 };
 #endif
 
        argc--;
        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 {
@@ -109,17 +100,19 @@ extern int more_main(int argc, char **argv)
                        cin = fopen("/dev/console", "r");
                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;
                setTermSettings(fileno(cin), &new_settings);
 
-#ifdef BB_FEATURE_AUTOWIDTH
+#      ifdef BB_FEATURE_AUTOWIDTH
                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
+#      endif
 
                (void) signal(SIGINT, gotsig);
                (void) signal(SIGQUIT, gotsig);
@@ -127,10 +120,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) {
@@ -149,7 +142,16 @@ 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
+                               input = getc(stdin);
+#endif
 
 #ifdef BB_FEATURE_USE_TERMIOS
                                /* Erase the "More" message */
@@ -163,6 +165,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':
@@ -170,12 +183,16 @@ 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 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);
                }
                fclose(file);
@@ -187,5 +204,5 @@ extern int more_main(int argc, char **argv)
 #ifdef BB_FEATURE_USE_TERMIOS
        gotsig(0);
 #endif
-       exit(TRUE);
+       return(TRUE);
 }