emo/shadow
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

Remove preprocessor conditionals that are always true

Browse Source 
In a previous commit, we made USE_TERMIOS unconditionally defined.
Let's just remove it, and remove the condition everywhere.

Reported-by: Iker Pedrosa <ipedrosa@redhat.com>
Cc: Christian Göttsche <cgzones@googlemail.com>
Cc: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Alejandro Colomar <alx@kernel.org>
This commit is contained in:
Alejandro Colomar
2022-12-13 22:12:51 +01:00
committed by Serge Hallyn
parent f2ae6a42a4
commit 54847a76da
2 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/defines.h
View File

@@ -158,7 +158,6 @@ static inline void memzero(void *ptr, size_t size)
#define STTY(fd, termio) tcsetattr(fd, TCSANOW, termio) #define STTY(fd, termio) tcsetattr(fd, TCSANOW, termio)
#define GTTY(fd, termio) tcgetattr(fd, termio) #define GTTY(fd, termio) tcgetattr(fd, termio)
#define TERMIO struct termios #define TERMIO struct termios
#define USE_TERMIOS
/* /*
* Password aging constants * Password aging constants

2
src/sulogin.c
View File

@@ -67,13 +67,11 @@ static void catch_signals (unused int sig)
TERMIO termio; TERMIO termio;
int err = 0; int err = 0;
#ifdef USE_TERMIOS
tcgetattr (0, &termio); tcgetattr (0, &termio);
termio.c_iflag |= (ICRNL | IXON); termio.c_iflag |= (ICRNL | IXON);
termio.c_oflag |= (CREAD); termio.c_oflag |= (CREAD);
termio.c_lflag |= (ECHO | ECHOE | ECHOK | ICANON | ISIG); termio.c_lflag |= (ECHO | ECHOE | ECHOK | ICANON | ISIG);
tcsetattr (0, TCSANOW, &termio); tcsetattr (0, TCSANOW, &termio);
#endif
Prog = Basename (argv[0]); Prog = Basename (argv[0]);
log_set_progname(Prog); log_set_progname(Prog);