*
* Termios corrects by Vladimir Oleynik <dzo@simtreas.ru>
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
+ * Licensed under GPLv2 or later, see file License in this tarball for details.
*/
-#include <stdio.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/ioctl.h>
#include "busybox.h"
-static FILE *cin;
#ifdef CONFIG_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);
static void set_tty_to_initial_mode(void)
{
- setTermSettings(fileno(cin), &initial_settings);
+ setTermSettings(cin_fileno, &initial_settings);
}
static void gotsig(int sig)
#endif /* CONFIG_FEATURE_USE_TERMIOS */
-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 more_main(int argc, char **argv)
{
int c, lines, input = 0;
- int please_display_more_prompt = -1;
+ int please_display_more_prompt = 0;
struct stat st;
FILE *file;
- FILE *in_file = stdin;
+ FILE *cin;
int len, page_height;
+ int terminal_width;
+ int terminal_height;
argc--;
argv++;
/* not use inputing from terminal if usage: more > outfile */
- if(isatty(fileno(stdout))) {
+ if(isatty(STDOUT_FILENO)) {
cin = fopen(CURRENT_TTY, "r");
if (!cin)
- cin = bb_xfopen(CONSOLE_DEV, "r");
- in_file = cin;
- please_display_more_prompt = 0;
+ cin = xfopen(CONSOLE_DEV, "r");
+ please_display_more_prompt = 2;
#ifdef CONFIG_FEATURE_USE_TERMIOS
- getTermSettings(fileno(cin), &initial_settings);
+ 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(fileno(cin), &new_settings);
+ setTermSettings(cin_fileno, &new_settings);
atexit(set_tty_to_initial_mode);
(void) signal(SIGINT, gotsig);
(void) signal(SIGQUIT, gotsig);
(void) signal(SIGTERM, gotsig);
#endif
+ } else {
+ cin = stdin;
}
do {
if (argc == 0) {
file = stdin;
} else
- file = bb_wfopen(*argv, "r");
+ file = fopen_or_warn(*argv, "r");
if(file==0)
goto loop;
st.st_size = 0;
fstat(fileno(file), &st);
- if(please_display_more_prompt>0)
- please_display_more_prompt = 0;
+ please_display_more_prompt &= ~1;
- get_terminal_width_height(fileno(in_file), &terminal_width, &terminal_height);
+ get_terminal_width_height(fileno(cin), &terminal_width, &terminal_height);
if (terminal_height > 4)
terminal_height -= 2;
if (terminal_width > 0)
page_height = terminal_height;
while ((c = getc(file)) != EOF) {
- if (please_display_more_prompt>0) {
+ if ((please_display_more_prompt & 3) == 3) {
len = printf("--More-- ");
if (file != stdin && st.st_size > 0) {
#if _FILE_OFFSET_BITS == 64
while (--len >= 0)
putc(' ', stdout);
putc('\r', stdout);
- fflush(stdout);
len=0;
lines = 0;
page_height = terminal_height;
- please_display_more_prompt = 0;
+ please_display_more_prompt &= ~1;
if (input == 'q')
goto end;
/* increment by just one line if we are at
* the end of this line */
if (input == '\n')
- if(please_display_more_prompt==0)
- please_display_more_prompt = 1;
+ please_display_more_prompt |= 1;
/* Adjust the terminal height for any overlap, so that
* no lines get lost off the top. */
if (len >= terminal_width) {
}
}
if (++lines >= page_height) {
- if(please_display_more_prompt==0)
- please_display_more_prompt = 1;
+ please_display_more_prompt |= 1;
}
len=0;
}