sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-25 23:21:54 +03:00
Code

r25679: reapply: Allow ^C to interrupt smbpasswd if using our getpass. from Jeremy

Browse Source 
metze
(cherry picked from commit d4ae42b1b2)
(This used to be commit a11d21790f)
This commit is contained in:
Stefan Metzmacher 2007-10-17 14:00:23 +02:00
parent 090015a6fb
commit 2627603506
1 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
source4/lib/replace/getpass.c
View File

@ -138,6 +138,21 @@ static void catch_signal(int signum,void (*handler)(int ))
#endif
}
static sig_atomic_t gotintr;
static int in_fd = -1;
/***************************************************************
Signal function to tell us were ^C'ed.
****************************************************************/
static void gotintr_sig(void)
{
gotintr = 1;
if (in_fd != -1)
close(in_fd); /* Safe way to force a return. */
in_fd = -1;
}
char *getsmbpass(const char *prompt)
{
FILE *in, *out;
@ -147,7 +162,7 @@ char *getsmbpass(const char *prompt)
size_t nread;
/* Catch problematic signals */
catch_signal(SIGINT, SIGNAL_CAST SIG_IGN);
catch_signal(SIGINT, SIGNAL_CAST gotintr_sig);
/* Try to write to and read from the terminal if we can.
If we can't open the terminal, use stderr and stdin. */
@ -182,14 +197,21 @@ char *getsmbpass(const char *prompt)
/* Read the password. */
buf[0] = 0;
fgets(buf, bufsize, in);
if (!gotintr) {
in_fd = fileno(in);
fgets(buf, bufsize, in);
}
nread = strlen(buf);
if (buf[nread - 1] == '\n')
buf[nread - 1] = '\0';
/* Restore echoing. */
if (echo_off)
tcsetattr (fileno (in), TCSANOW, &t);
if (echo_off) {
if (gotintr && in_fd == -1)
in = fopen ("/dev/tty", "w+");
if (in != NULL)
tcsetattr (fileno (in), TCSANOW, &t);
}
if (in != stdin) /* We opened the terminal; now close it. */
fclose(in);
@ -198,6 +220,12 @@ char *getsmbpass(const char *prompt)
catch_signal(SIGINT, SIGNAL_CAST SIG_DFL);
printf("\n");
if (gotintr) {
printf("Interupted by signal.\n");
fflush(stdout);
exit(1);
}
return buf;
}