eessppeelllloo/cryptsetup
1
0
Fork 0
mirror of https://gitlab.com/cryptsetup/cryptsetup.git synced 2025-12-11 19:00:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Workaround for scan-build false positive.

Browse Source 
Also tidy code to be more readable.
This commit is contained in:
Milan Broz
2014-08-10 16:07:47 +02:00
parent e84b1ed7c0
commit 7b42254975
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/utils_crypt.c
View File

@@ -157,7 +157,7 @@ static int untimed_read(int fd, char *pass, size_t maxlen)
static int timed_read(int fd, char *pass, size_t maxlen, long timeout) static int timed_read(int fd, char *pass, size_t maxlen, long timeout)
{ {
struct timeval t; struct timeval t;
fd_set fds; fd_set fds = {}; /* Just to avoid scan-build false report for FD_SET */
int failed = -1; int failed = -1;
FD_ZERO(&fds); FD_ZERO(&fds);
@@ -176,16 +176,18 @@ static int interactive_pass(const char *prompt, char *pass, size_t maxlen,
{ {
struct termios orig, tmp; struct termios orig, tmp;
int failed = -1; int failed = -1;
int infd = STDIN_FILENO, outfd; int infd, outfd;
if (maxlen < 1) if (maxlen < 1)
goto out_err; goto out_err;
/* Read and write to /dev/tty if available */ /* Read and write to /dev/tty if available */
if ((infd = outfd = open("/dev/tty", O_RDWR)) == -1) { infd = open("/dev/tty", O_RDWR);
if (infd == -1) {
infd = STDIN_FILENO; infd = STDIN_FILENO;
outfd = STDERR_FILENO; outfd = STDERR_FILENO;
} } else
outfd = infd;
if (tcgetattr(infd, &orig)) if (tcgetattr(infd, &orig))
goto out_err; goto out_err;