mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

passphrase_read: Reset terminal to original attributes if ECHO was turned off

Browse Source
This commit is contained in:
Shea Levy 2011-09-24 15:03:24 -04:00
parent 4c4bd49006
commit f5c618a3fe
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
libfreerdp-utils/passphrase.c
View File

@ -31,10 +31,10 @@ char* freerdp_passphrase_read(const char* prompt, char* buf, size_t bufsiz)
char read_char;
char* buf_iter;
char term_name[L_ctermid];
int term_id;
int term_id, reset_terminal = 0;
ssize_t nbytes;
size_t read_bytes = 0;
struct termios term_flags;
struct termios orig_flags, no_echo_flags;
if (bufsiz == 0)
{
@ -47,12 +47,13 @@ char* freerdp_passphrase_read(const char* prompt, char* buf, size_t bufsiz)
if (term_id == -1)
return NULL;
if (tcgetattr(term_id, &term_flags) == -1)
;
else
if (tcgetattr(term_id, &orig_flags) != -1)
{
term_flags.c_lflag &= ~ECHO;
tcsetattr(term_id, TCSAFLUSH, &term_flags);
reset_terminal = 1;
no_echo_flags = orig_flags;
no_echo_flags.c_lflag &= ~ECHO;
if (tcsetattr(term_id, TCSAFLUSH, &no_echo_flags) == -1)
reset_terminal = 0;
}
if (write(term_id, prompt, strlen(prompt) + sizeof '\0') == (ssize_t) -1)
@ -76,6 +77,17 @@ char* freerdp_passphrase_read(const char* prompt, char* buf, size_t bufsiz)
if (nbytes == (ssize_t) -1)
return NULL;
if (reset_terminal)
{
if (tcsetattr(term_id, TCSADRAIN, &orig_flags) == -1)
{
int saved_errno = errno;
tcsetattr(term_id, TCSANOW, &orig_flags);
errno = saved_errno;
return NULL;
}
}
if (close(term_id) == -1)
return NULL;