diff options
| author | Karel Zak | 2017-06-26 15:30:12 +0200 |
|---|---|---|
| committer | Karel Zak | 2017-06-26 15:30:12 +0200 |
| commit | 7fb65db12443da09d9a0f3be0c48021236333e28 (patch) | |
| tree | 99abce9bfe7de46dfb8190a9f4fc304c64d3d8ca /term-utils/script.c | |
| parent | script: ensure typescript and timing errors do not break terminal (diff) | |
| download | kernel-qcow2-util-linux-7fb65db12443da09d9a0f3be0c48021236333e28.tar.gz kernel-qcow2-util-linux-7fb65db12443da09d9a0f3be0c48021236333e28.tar.xz kernel-qcow2-util-linux-7fb65db12443da09d9a0f3be0c48021236333e28.zip | |
script: rename fixtty() to enable_rawmode_tty()
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'term-utils/script.c')
| -rw-r--r-- | term-utils/script.c | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/term-utils/script.c b/term-utils/script.c index 19e9976d9..01be3d7c5 100644 --- a/term-utils/script.c +++ b/term-utils/script.c @@ -201,6 +201,19 @@ static void restore_tty(struct script_control *ctl, int mode) tcsetattr(STDIN_FILENO, mode, &rtt); } +static void enable_rawmode_tty(struct script_control *ctl) +{ + struct termios rtt; + + if (!ctl->isterm) + return; + + rtt = ctl->attrs; + cfmakeraw(&rtt); + rtt.c_lflag &= ~ECHO; + tcsetattr(STDIN_FILENO, TCSANOW, &rtt); +} + static void __attribute__((__noreturn__)) done(struct script_control *ctl) { DBG(MISC, ul_debug("done!")); @@ -605,18 +618,6 @@ static void __attribute__((__noreturn__)) do_shell(struct script_control *ctl) fail(ctl); } -static void fixtty(struct script_control *ctl) -{ - struct termios rtt; - - if (!ctl->isterm) - return; - - rtt = ctl->attrs; - cfmakeraw(&rtt); - rtt.c_lflag &= ~ECHO; - tcsetattr(STDIN_FILENO, TCSANOW, &rtt); -} static void getmaster(struct script_control *ctl) { @@ -773,7 +774,7 @@ int main(int argc, char **argv) getmaster(&ctl); if (!ctl.quiet) printf(_("Script started, file is %s\n"), ctl.fname); - fixtty(&ctl); + enable_rawmode_tty(&ctl); #ifdef HAVE_LIBUTEMPTER utempter_add_record(ctl.master, NULL); |