#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
#if #cpu(sparc)
-# define USE_OLD_TERMIO
# include <termio.h>
# define termios termio
-# define stty(fd,argp) ioctl(fd,TCSETAF,argp)
+# define setTermSettings(fd,argp) ioctl(fd,TCSETAF,argp)
+# define getTermSettings(fd,argp) ioctl(fd,TCGETA,argp)
#else
# include <termios.h>
-# define stty(fd,argp) tcsetattr(fd,TCSANOW,argp)
+# 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)
{
- stty(fileno(cin), &initial_settings);
+ setTermSettings(fileno(cin), &initial_settings);
fprintf(stdout, "\n");
exit(TRUE);
}
#if defined BB_FEATURE_AUTOWIDTH
-static int terminal_width = 0, terminal_height = 0;
+#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
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
+#if defined BB_FEATURE_AUTOWIDTH && defined BB_FEATURE_USE_TERMIOS
struct winsize win = { 0, 0 };
#endif
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 {
cin = fopen("/dev/tty", "r");
if (!cin)
cin = fopen("/dev/console", "r");
-#ifdef USE_OLD_TERMIO
- ioctl(fileno(cin), TCGETA, &initial_settings);
-#else
- tcgetattr(fileno(cin), &initial_settings);
-#endif
+ 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;
- stty(fileno(cin), &new_settings);
+ setTermSettings(fileno(cin), &new_settings);
#ifdef BB_FEATURE_AUTOWIDTH
ioctl(fileno(stdout), TIOCGWINSZ, &win);
#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) {
);
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 */
#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':
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);
#ifdef BB_FEATURE_USE_TERMIOS
gotsig(0);
#endif
- exit(TRUE);
+ return(TRUE);
}