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

Do signal handlig he Posix way

Browse Source 
Obtained from: NetBSD (after complains from Bruce)
This commit is contained in:
Guido van Rooij 1998-02-10 20:05:15 +00:00
parent d5cbea7e97
commit 3ff9c00752
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=33225
1 changed files with 11 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
lib/libc/gen/getpass.c
View File

@ -44,38 +44,8 @@ static char sccsid[] = "@(#)getpass.c 8.1 (Berkeley) 6/4/93";
#include <unistd.h>
static struct termios oterm, term;
static sig_t ointhandler, oquithandler, otstphandler, oconthandler;
static FILE *fp;
static void
sighandler(int signo)
{
/* restore tty state */
(void)tcsetattr(fileno(fp), TCSAFLUSH|TCSASOFT, &oterm);
/* restore old sig handlers */
(void)signal(SIGINT, ointhandler);
(void)signal(SIGQUIT, oquithandler);
(void)signal(SIGTSTP, otstphandler);
/* resend us this signal */
(void)kill(getpid(), signo);
}
/* ARGSUSED */
static void
sigconthandler(int signo)
{
/* re-install our signal handlers */
ointhandler = signal(SIGINT, sighandler);
oquithandler = signal(SIGQUIT, sighandler);
otstphandler = signal(SIGTSTP, sighandler);
/* turn off echo again */
(void)tcsetattr(fileno(fp), TCSAFLUSH|TCSASOFT, &term);
}
char *
getpass(prompt)
const char *prompt;
@ -84,6 +54,7 @@ getpass(prompt)
register char *p;
FILE *outfp;
static char buf[_PASSWORD_LEN + 1];
sigset_t oset, nset;
/*
* read and write to /dev/tty if possible; else read from
@ -94,11 +65,15 @@ getpass(prompt)
fp = stdin;
}
ointhandler = signal(SIGINT, sighandler);
oquithandler = signal(SIGQUIT, sighandler);
otstphandler = signal(SIGTSTP, sighandler);
oconthandler = signal(SIGCONT, sigconthandler);
/*
* 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);
(void)tcgetattr(fileno(fp), &oterm);
term = oterm;
term.c_lflag &= ~ECHO;
@ -112,11 +87,7 @@ getpass(prompt)
(void)write(fileno(outfp), "\n", 1);
(void)tcsetattr(fileno(fp), TCSAFLUSH|TCSASOFT, &oterm);
/* restore old sig handlers */
(void)signal(SIGINT, ointhandler);
(void)signal(SIGQUIT, oquithandler);
(void)signal(SIGTSTP, otstphandler);
(void)signal(SIGCONT, oconthandler);
(void)sigprocmask(SIG_SETMASK, &oset, NULL);
if (fp != stdin)
(void)fclose(fp);