aboutsummaryrefslogtreecommitdiff
path: root/miscutils
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2017-09-15 17:14:01 +0200
committerDenys Vlasenko <vda.linux@googlemail.com>2017-09-15 17:14:01 +0200
commitaaaaaa5ad6a93101d38800467fe3750b35fed6ea (patch)
tree8cd7b7561f3e923a382e5f97b4bd0fbe5fd68c39 /miscutils
parente58b44755dbac7c55bf602f7f76dfb37b47323f5 (diff)
downloadbusybox-aaaaaa5ad6a93101d38800467fe3750b35fed6ea.tar.gz
less,microcom,lineedit: use common routine to set raw termios
function old new delta get_termios_and_make_raw - 139 +139 xget1 39 8 -31 read_line_input 3912 3867 -45 less_main 2525 2471 -54 set_termios_to_raw 116 36 -80 ------------------------------------------------------------------------------ (add/remove: 1/0 grow/shrink: 0/4 up/down: 139/-210) Total: -71 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'miscutils')
-rw-r--r--miscutils/less.c12
-rw-r--r--miscutils/microcom.c14
2 files changed, 8 insertions, 18 deletions
diff --git a/miscutils/less.c b/miscutils/less.c
index d524b6c87..c6c158a51 100644
--- a/miscutils/less.c
+++ b/miscutils/less.c
@@ -1824,15 +1824,9 @@ int less_main(int argc, char **argv)
G.kbd_fd_orig_flags = ndelay_on(tty_fd);
kbd_fd = tty_fd; /* save in a global */
- tcgetattr(kbd_fd, &term_orig);
- term_less = term_orig;
- term_less.c_lflag &= ~(ICANON | ECHO);
- term_less.c_iflag &= ~(IXON | ICRNL);
- /*term_less.c_oflag &= ~ONLCR;*/
- term_less.c_cc[VMIN] = 1;
- term_less.c_cc[VTIME] = 0;
-
- IF_FEATURE_LESS_ASK_TERMINAL(G.winsize_err =) get_terminal_width_height(kbd_fd, &width, &max_displayed_line);
+ get_termios_and_make_raw(tty_fd, &term_less, &term_orig, TERMIOS_RAW_CRNL);
+
+ IF_FEATURE_LESS_ASK_TERMINAL(G.winsize_err =) get_terminal_width_height(tty_fd, &width, &max_displayed_line);
/* 20: two tabstops + 4 */
if (width < 20 || max_displayed_line < 3)
return bb_cat(argv);
diff --git a/miscutils/microcom.c b/miscutils/microcom.c
index b87f3273f..fa090057e 100644
--- a/miscutils/microcom.c
+++ b/miscutils/microcom.c
@@ -33,15 +33,11 @@
// set raw tty mode
static void xget1(int fd, struct termios *t, struct termios *oldt)
{
-//TODO: use set_termios_to_raw()
- tcgetattr(fd, oldt);
- *t = *oldt;
- cfmakeraw(t);
-// t->c_lflag &= ~(ISIG|ICANON|ECHO|IEXTEN);
-// t->c_iflag &= ~(BRKINT|IXON|ICRNL);
-// t->c_oflag &= ~(ONLCR);
-// t->c_cc[VMIN] = 1;
-// t->c_cc[VTIME] = 0;
+ get_termios_and_make_raw(fd, t, oldt, 0
+ | TERMIOS_CLEAR_ISIG /* ^C is ASCII char 3, not "interrupt me!" */
+ | TERMIOS_RAW_INPUT /* pass all chars verbatim, no special handling or translating CR->NL */
+ | TERMIOS_RAW_CRNL /* dont convert NL<->CR on output too */
+ );
}
static int xset1(int fd, struct termios *tio, const char *device)