From 4eb8b936cb0aeb27c3e12f9a93fc43aa1e9668f5 Mon Sep 17 00:00:00 2001 From: Denis Vlasenko Date: Sat, 10 Mar 2007 16:32:14 +0000 Subject: more: do not mess with "/dev/console" (!); fill whole 1st screen (was "screen sans one line"); fall back to cat if redirected or no ctty less: fall back to cat if no ctty (was exiting) resize: cosmetics --- miscutils/less.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'miscutils') diff --git a/miscutils/less.c b/miscutils/less.c index 79732cc41..a7041552d 100644 --- a/miscutils/less.c +++ b/miscutils/less.c @@ -1251,6 +1251,9 @@ int less_main(int argc, char **argv) * is not a tty and turns into cat. This makes sense. */ if (!isatty(STDOUT_FILENO)) return bb_cat(argv); + kbd_fd = open(CURRENT_TTY, O_RDONLY); + if (kbd_fd < 0) + return bb_cat(argv); if (!num_files) { if (isatty(STDIN_FILENO)) { @@ -1261,8 +1264,6 @@ int less_main(int argc, char **argv) } else filename = xstrdup(files[0]); - kbd_fd = xopen(CURRENT_TTY, O_RDONLY); - get_terminal_width_height(kbd_fd, &width, &max_displayed_line); /* 20: two tabstops + 4 */ if (width < 20 || max_displayed_line < 3) -- cgit v1.2.3