mir/sudo
2
0
Fork 0
mirror of https://github.com/sudo-project/sudo.git synced 2025-08-29 05:17:54 +00:00
Code Issues Releases Wiki Activity

Use cfmakeraw() in sudo_term_raw() instead of doing it manually.

Browse Source
This commit is contained in:
Todd C. Miller 2019-12-07 12:25:51 -07:00
parent 9d737441f4
commit d7b4f88658
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/util/term.c
View File

@ -1,7 +1,7 @@
/* /*
* SPDX-License-Identifier: ISC * SPDX-License-Identifier: ISC
* *
* Copyright (c) 2011-2015, 2017 Todd C. Miller <Todd.Miller@sudo.ws> * Copyright (c) 2011-2015, 2017-2019 Todd C. Miller <Todd.Miller@sudo.ws>
* *
* Permission to use, copy, modify, and distribute this software for any * Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above * purpose with or without fee is hereby granted, provided that the above
@ -182,7 +182,7 @@ sudo_term_noecho_v1(int fd)
} }
/* /*
* Set terminal to raw mode. * Set terminal to raw mode with optional terminal signals.
* Returns true on success or false on failure. * Returns true on success or false on failure.
*/ */
bool bool
@ -194,12 +194,8 @@ sudo_term_raw_v1(int fd, int isig)
if (!changed && tcgetattr(fd, &oterm) != 0) if (!changed && tcgetattr(fd, &oterm) != 0)
debug_return_bool(false); debug_return_bool(false);
(void) memcpy(&term, &oterm, sizeof(term)); (void) memcpy(&term, &oterm, sizeof(term));
/* Set terminal to raw mode */ /* Set terminal to raw mode but optionally enable terminal signals. */
term.c_cc[VMIN] = 1; cfmakeraw(&term);
term.c_cc[VTIME] = 0;
CLR(term.c_iflag, ICRNL | IGNCR | INLCR | IUCLC | IXON);
CLR(term.c_oflag, OPOST);
CLR(term.c_lflag, ECHO | ICANON | ISIG | IEXTEN);
if (isig) if (isig)
SET(term.c_lflag, ISIG); SET(term.c_lflag, ISIG);
if (tcsetattr_nobg(fd, TCSASOFT|TCSADRAIN, &term) == 0) { if (tcsetattr_nobg(fd, TCSASOFT|TCSADRAIN, &term) == 0) {