emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

less: support "less 1<>TTY"

Browse Source 
function                                             old     new   delta
less_main                                           2466    2507     +41
xmalloc_ttyname                                       46      42      -4

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2013-08-04 17:41:19 +02:00
parent 9369634167
commit cc1c9ca6f8
1 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
miscutils/less.c
View File

@ -1608,6 +1608,9 @@ static void sigwinch_handler(int sig UNUSED_PARAM)
int less_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int less_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int less_main(int argc, char **argv) int less_main(int argc, char **argv)
{ {
char *tty_name;
int tty_fd;
INIT_G(); INIT_G();
/* TODO: -x: do not interpret backspace, -xx: tab also */ /* TODO: -x: do not interpret backspace, -xx: tab also */
@ -1637,10 +1640,28 @@ int less_main(int argc, char **argv)
if (option_mask32 & FLAG_TILDE) if (option_mask32 & FLAG_TILDE)
empty_line_marker = ""; empty_line_marker = "";
kbd_fd = open(CURRENT_TTY, O_RDONLY); /* Some versions of less can survive w/o controlling tty,
if (kbd_fd < 0) * try to do the same. This also allows to specify an alternative
* tty via "less 1<>TTY".
* We don't try to use STDOUT_FILENO directly,
* since we want to set this fd to non-blocking mode,
* and not bother with restoring it on exit.
*/
tty_name = xmalloc_ttyname(STDOUT_FILENO);
if (tty_name) {
tty_fd = open(tty_name, O_RDONLY);
free(tty_name);
if (tty_fd < 0)
goto try_ctty;
} else {
/* Try controlling tty */
try_ctty:
tty_fd = open(CURRENT_TTY, O_RDONLY);
if (tty_fd < 0)
return bb_cat(argv); return bb_cat(argv);
ndelay_on(kbd_fd); }
ndelay_on(tty_fd);
kbd_fd = tty_fd; /* save in a global */
tcgetattr(kbd_fd, &term_orig); tcgetattr(kbd_fd, &term_orig);
term_less = term_orig; term_less = term_orig;