emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

init: if tcgetattr() fails, don't even try to tcsetattr()

Browse Source 
function                                             old     new   delta
set_sane_term                                        111     114      +3

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2019-12-02 16:39:54 +01:00
parent 259747caa7
commit 113c776f4d
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
init/init.c
View File

@ -145,13 +145,6 @@
# include <sys/ucontext.h> # include <sys/ucontext.h>
#endif #endif
/* Used only for sanitizing purposes in set_sane_term() below. On systems where
* the baud rate is stored in a separate field, we can safely disable them. */
#ifndef CBAUD
# define CBAUD 0
# define CBAUDEX 0
#endif
/* Was a CONFIG_xxx option. A lot of people were building /* Was a CONFIG_xxx option. A lot of people were building
* not fully functional init by switching it on! */ * not fully functional init by switching it on! */
#define DEBUG_INIT 0 #define DEBUG_INIT 0
@ -347,7 +340,8 @@ static void set_sane_term(void)
{ {
struct termios tty; struct termios tty;
tcgetattr(STDIN_FILENO, &tty); if (tcgetattr(STDIN_FILENO, &tty) != 0)
return;
/* set control chars */ /* set control chars */
tty.c_cc[VINTR] = 3; /* C-c */ tty.c_cc[VINTR] = 3; /* C-c */
@ -365,10 +359,15 @@ static void set_sane_term(void)
#endif #endif
/* Make it be sane */ /* Make it be sane */
/* On systems where the baud rate is stored in a separate field, we can safely disable these. */
#ifndef CBAUD
# define CBAUD 0
# define CBAUDEX 0
#endif
/* Added CRTSCTS to fix Debian bug 528560 */
#ifndef CRTSCTS #ifndef CRTSCTS
# define CRTSCTS 0 # define CRTSCTS 0
#endif #endif
/* added CRTSCTS to fix Debian bug 528560 */
tty.c_cflag &= CBAUD | CBAUDEX | CSIZE | CSTOPB | PARENB | PARODD | CRTSCTS; tty.c_cflag &= CBAUD | CBAUDEX | CSIZE | CSTOPB | PARENB | PARODD | CRTSCTS;
tty.c_cflag |= CREAD | HUPCL | CLOCAL; tty.c_cflag |= CREAD | HUPCL | CLOCAL;