ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

script: rename fixtty() to enable_rawmode_tty() 

Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
Karel Zak 2017-06-26 15:30:12 +02:00
parent 8198052c9e
commit 7fb65db124
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
term-utils/script.c
View File

@ -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);