d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

In the same manner as getpass(3), block SIGINTR and SIGSTP while we are

Browse Source 
actually reading the line.
This commit is contained in:
Mark Murray 2001-06-04 20:59:49 +00:00
parent 52b026c0e5
commit 341762c6f1
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
contrib/libpam/libpam_misc/misc_conv.c
View File

@ -135,6 +135,7 @@ static char *read_string(int echo, const char *prompt)
char line[INPUTSIZE]; char line[INPUTSIZE];
struct sigaction old_sig; struct sigaction old_sig;
int delay, nc, have_term=0; int delay, nc, have_term=0;
sigset_t oset, nset;
D(("called with echo='%s', prompt='%s'.", echo ? "ON":"OFF" , prompt)); D(("called with echo='%s', prompt='%s'.", echo ? "ON":"OFF" , prompt));
@ -150,6 +151,14 @@ static char *read_string(int echo, const char *prompt)
term_tmp.c_lflag &= ~(ECHO); term_tmp.c_lflag &= ~(ECHO);
} }
have_term = 1; have_term = 1;
/*
* note - blocking signals isn't necessarily the
* right thing, but we leave it for now.
*/
sigemptyset(&nset);
sigaddset(&nset, SIGINT);
sigaddset(&nset, SIGTSTP);
(void)_sigprocmask(SIG_BLOCK, &nset, &oset);
} else if (!echo) { } else if (!echo) {
D(("<warning: cannot turn echo off>")); D(("<warning: cannot turn echo off>"));
@ -204,8 +213,10 @@ static char *read_string(int echo, const char *prompt)
} }
/* getting here implies that the timer expired */ /* getting here implies that the timer expired */
if (have_term) if (have_term) {
(void)_sigprocmask(SIG_SETMASK, &oset, NULL);
(void) tcsetattr(STDIN_FILENO, TCSADRAIN, &term_before); (void) tcsetattr(STDIN_FILENO, TCSADRAIN, &term_before);
}
memset(line, 0, INPUTSIZE); /* clean up */ memset(line, 0, INPUTSIZE); /* clean up */
return NULL; return NULL;