Wrap a table (bg set to black, width=80%) around the screenshot

[oweals/busybox.git] / more.c

diff --git a/more.c b/more.c
index 549a417307e6d307f8cbb93f6522d19de25e95e8..c4c74fe4adb176b5c0564dc683b2be62776b2979 100644 (file)
--- a/more.c
+++ b/more.c
@@ -25,63 +25,44 @@
  *
  */
 
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <fcntl.h>
 #include <signal.h>
+#include <stdlib.h>
 #include <sys/ioctl.h>
 #define BB_DECLARE_EXTERN
 #define bb_need_help
 #include "messages.c"
 
-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
-
-#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)
+#      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
+
+static FILE *cin;
+
+static struct termios initial_settings, new_settings;
+
+static void gotsig(int sig)
 {
        setTermSettings(fileno(cin), &initial_settings);
-       fprintf(stdout, "\n");
-       exit(TRUE);
+       putchar('\n');
+       exit(EXIT_FAILURE);
 }
-#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
-#ifdef BB_FEATURE_USE_TERMIOS
-static int terminal_width = TERMINAL_WIDTH;
-#endif
-static int terminal_height = TERMINAL_HEIGHT;
-#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)
@@ -92,26 +73,18 @@ extern int more_main(int argc, char **argv)
        FILE *file;
 
 #if defined BB_FEATURE_AUTOWIDTH && defined BB_FEATURE_USE_TERMIOS
-       struct winsize win = { 0, 0 };
+       struct winsize win = { 0, 0, 0, 0 };
 #endif
 
        argc--;
        argv++;
 
-       if (argc > 0
-               && (strcmp(*argv, dash_dash_help) == 0 || strcmp(*argv, "-h") == 0)) {
-               usage(more_usage);
-       }
        do {
                if (argc == 0) {
                        file = stdin;
                } else
-                       file = fopen(*argv, "r");
+                       file = xfopen(*argv, "r");
 
-               if (file == NULL) {
-                       perror(*argv);
-                       exit(FALSE);
-               }
                fstat(fileno(file), &st);
 
 #ifdef BB_FEATURE_USE_TERMIOS
@@ -126,13 +99,13 @@ extern int more_main(int argc, char **argv)
                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);
@@ -145,15 +118,19 @@ extern int more_main(int argc, char **argv)
 
                                please_display_more_prompt = 0;
                                lines = 0;
-                               len = fprintf(stdout, "--More-- ");
+                               len = printf("--More-- ");
                                if (file != stdin) {
-                                       len += fprintf(stdout, "(%d%% of %ld bytes)",
+#if _FILE_OFFSET_BITS == 64
+                                       len += printf("(%d%% of %lld bytes)",
+#else
+                                       len += printf("(%d%% of %ld bytes)",
+#endif
                                                                   (int) (100 *
                                                                                  ((double) ftell(file) /
                                                                                   (double) st.st_size)),
                                                                   st.st_size);
                                }
-                               len += fprintf(stdout, "%s",
+                               len += printf("%s",
 #ifdef BB_FEATURE_USE_TERMIOS
                                                           ""
 #else
@@ -209,7 +186,10 @@ extern int more_main(int argc, char **argv)
                                if (++lines == terminal_height)
                                        please_display_more_prompt = 1;
                        }
-                       /* If any key other than a return is hit, scroll by one page */
+                       /*
+                        * 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);
@@ -221,5 +201,5 @@ extern int more_main(int argc, char **argv)
 #ifdef BB_FEATURE_USE_TERMIOS
        gotsig(0);
 #endif
-       exit(TRUE);
+       return(TRUE);
 }