diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2017-01-11 16:17:59 +0100 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2017-01-11 16:17:59 +0100 |
| commit | 01ccdd1d3c5221789f1ac62ced12b7984d910705 (patch) | |
| tree | a6eb44f24c1324ddf18bfcec57fd4c3735aa1245 /libbb | |
| parent | 8944c67b1f61ca6a51a485772d5d1e6a8ff3d83d (diff) | |
| download | busybox-w32-01ccdd1d3c5221789f1ac62ced12b7984d910705.tar.gz busybox-w32-01ccdd1d3c5221789f1ac62ced12b7984d910705.tar.bz2 busybox-w32-01ccdd1d3c5221789f1ac62ced12b7984d910705.zip | |
libbb: consolidate the code to set termios unbuffered mode
function old new delta
set_termios_to_raw - 116 +116
count_lines 72 74 +2
powertop_main 1458 1430 -28
top_main 943 914 -29
more_main 759 714 -45
fsck_minix_main 2969 2921 -48
conspy_main 1197 1135 -62
rawmode 99 36 -63
------------------------------------------------------------------------------
(add/remove: 1/0 grow/shrink: 1/6 up/down: 118/-275) Total: -157 bytes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'libbb')
| -rw-r--r-- | libbb/lineedit.c | 2 | ||||
| -rw-r--r-- | libbb/xfuncs.c | 37 |
2 files changed, 38 insertions, 1 deletions
diff --git a/libbb/lineedit.c b/libbb/lineedit.c index 31e392147..2a5d4e704 100644 --- a/libbb/lineedit.c +++ b/libbb/lineedit.c | |||
| @@ -2325,7 +2325,7 @@ int FAST_FUNC read_line_input(line_input_t *st, const char *prompt, char *comman | |||
| 2325 | /* ~ECHO, ~ECHONL: turn off echoing, including newline echoing */ | 2325 | /* ~ECHO, ~ECHONL: turn off echoing, including newline echoing */ |
| 2326 | /* ~ISIG: turn off INTR (ctrl-C), QUIT, SUSP */ | 2326 | /* ~ISIG: turn off INTR (ctrl-C), QUIT, SUSP */ |
| 2327 | new_settings.c_lflag &= ~(ICANON | ECHO | ECHONL | ISIG); | 2327 | new_settings.c_lflag &= ~(ICANON | ECHO | ECHONL | ISIG); |
| 2328 | /* reads would block only if < 1 char is available */ | 2328 | /* reads will block only if < 1 char is available */ |
| 2329 | new_settings.c_cc[VMIN] = 1; | 2329 | new_settings.c_cc[VMIN] = 1; |
| 2330 | /* no timeout (reads block forever) */ | 2330 | /* no timeout (reads block forever) */ |
| 2331 | new_settings.c_cc[VTIME] = 0; | 2331 | new_settings.c_cc[VTIME] = 0; |
diff --git a/libbb/xfuncs.c b/libbb/xfuncs.c index 45650edba..98d3531d6 100644 --- a/libbb/xfuncs.c +++ b/libbb/xfuncs.c | |||
| @@ -311,6 +311,43 @@ int FAST_FUNC tcsetattr_stdin_TCSANOW(const struct termios *tp) | |||
| 311 | return tcsetattr(STDIN_FILENO, TCSANOW, tp); | 311 | return tcsetattr(STDIN_FILENO, TCSANOW, tp); |
| 312 | } | 312 | } |
| 313 | 313 | ||
| 314 | int FAST_FUNC set_termios_to_raw(int fd, struct termios *oldterm, int flags) | ||
| 315 | { | ||
| 316 | //TODO: lineedit, microcom and less might be adapted to use this too: | ||
| 317 | // grep for "tcsetattr" | ||
| 318 | |||
| 319 | struct termios newterm; | ||
| 320 | |||
| 321 | tcgetattr(fd, oldterm); | ||
| 322 | newterm = *oldterm; | ||
| 323 | |||
| 324 | /* Turn off buffered input (ICANON) | ||
| 325 | * Turn off echoing (ECHO) | ||
| 326 | * and separate echoing of newline (ECHONL, normally off anyway) | ||
| 327 | */ | ||
| 328 | newterm.c_lflag &= ~(ICANON | ECHO | ECHONL); | ||
| 329 | if (flags & TERMIOS_CLEAR_ISIG) { | ||
| 330 | /* dont recognize INT/QUIT/SUSP chars */ | ||
| 331 | newterm.c_lflag &= ~ISIG; | ||
| 332 | } | ||
| 333 | /* reads will block only if < 1 char is available */ | ||
| 334 | newterm.c_cc[VMIN] = 1; | ||
| 335 | /* no timeout (reads block forever) */ | ||
| 336 | newterm.c_cc[VTIME] = 0; | ||
| 337 | if (flags & TERMIOS_RAW_CRNL) { | ||
| 338 | /* dont convert CR to NL on input */ | ||
| 339 | newterm.c_iflag &= ~(IXON | ICRNL); | ||
| 340 | /* dont convert NL to CR on output */ | ||
| 341 | newterm.c_oflag &= ~(ONLCR); | ||
| 342 | } | ||
| 343 | if (flags & TERMIOS_RAW_INPUT) { | ||
| 344 | /* dont convert anything on input */ | ||
| 345 | newterm.c_iflag &= ~(BRKINT|INLCR|ICRNL|IXON|IXOFF|IUCLC|IXANY|IMAXBEL); | ||
| 346 | } | ||
| 347 | |||
| 348 | return tcsetattr(fd, TCSANOW, &newterm); | ||
| 349 | } | ||
| 350 | |||
| 314 | pid_t FAST_FUNC safe_waitpid(pid_t pid, int *wstat, int options) | 351 | pid_t FAST_FUNC safe_waitpid(pid_t pid, int *wstat, int options) |
| 315 | { | 352 | { |
| 316 | pid_t r; | 353 | pid_t r; |
