/*
- * Copyright (c) 1996, 1998-2005, 2007-2009
+ * Copyright (c) 1996, 1998-2005, 2007-2010
* Todd C. Miller <Todd.Miller@courtesan.com>
*
* Permission to use, copy, modify, and distribute this software for any
# include <memory.h>
# endif
# include <string.h>
-#else
-# ifdef HAVE_STRINGS_H
-# include <strings.h>
-# endif
#endif /* HAVE_STRING_H */
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif /* HAVE_STRINGS_H */
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif /* HAVE_UNISTD_H */
#include "sudo.h"
-static volatile sig_atomic_t signo;
+static volatile sig_atomic_t signo[NSIG];
-static void handler __P((int));
+static RETSIGTYPE handler __P((int));
static char *getln __P((int, char *, size_t, int));
static char *sudo_askpass __P((const char *));
-extern int term_restore __P((int));
-extern int term_noecho __P((int));
-extern int term_raw __P((int));
-
/*
* Like getpass(3) but with timeout and echo flags.
*/
int flags;
{
sigaction_t sa, savealrm, saveint, savehup, savequit, saveterm;
- sigaction_t savetstp, savettin, savettou;
+ sigaction_t savetstp, savettin, savettou, savepipe;
char *pass;
static char buf[SUDO_PASS_MAX + 1];
- int input, output, save_errno, neednl;;
+ int i, input, output, save_errno, neednl = 0, need_restart;
(void) fflush(stdout);
/* If using a helper program to get the password, run it instead. */
if (ISSET(flags, TGP_ASKPASS) && user_askpass)
- return(sudo_askpass(prompt));
+ return sudo_askpass(prompt);
restart:
- signo = 0;
+ for (i = 0; i < NSIG; i++)
+ signo[i] = 0;
pass = NULL;
save_errno = 0;
+ need_restart = 0;
/* Open /dev/tty for reading/writing if possible else use stdin/stderr. */
if (ISSET(flags, TGP_STDIN) ||
(input = output = open(_PATH_TTY, O_RDWR|O_NOCTTY)) == -1) {
output = STDERR_FILENO;
}
+ /*
+ * If we are using a tty but are not the foreground pgrp this will
+ * generate SIGTTOU, so do it *before* installing the signal handlers.
+ */
+ if (!ISSET(flags, TGP_ECHO)) {
+ if (def_pwfeedback)
+ neednl = term_cbreak(input);
+ else
+ neednl = term_noecho(input);
+ }
+
/*
* Catch signals that would otherwise cause the user to end
* up with echo turned off in the shell.
(void) sigaction(SIGTTIN, &sa, &savettin);
(void) sigaction(SIGTTOU, &sa, &savettou);
- if (def_pwfeedback)
- neednl = term_raw(input);
- else
- neednl = term_noecho(input);
+ /* Ignore SIGPIPE in case stdin is a pipe and TGP_STDIN is set */
+ sa.sa_handler = SIG_IGN;
+ (void) sigaction(SIGPIPE, &sa, &savepipe);
- /* No output if we are already backgrounded. */
- if (signo != SIGTTOU && signo != SIGTTIN) {
- if (prompt)
- (void) write(output, prompt, strlen(prompt));
+ if (prompt) {
+ if (write(output, prompt, strlen(prompt)) == -1)
+ goto restore;
+ }
- if (timeout > 0)
- alarm(timeout);
- pass = getln(input, buf, sizeof(buf), def_pwfeedback);
- alarm(0);
- save_errno = errno;
+ if (timeout > 0)
+ alarm(timeout);
+ pass = getln(input, buf, sizeof(buf), def_pwfeedback);
+ alarm(0);
+ save_errno = errno;
- if (neednl)
- (void) write(output, "\n", 1);
+ if (neednl || pass == NULL) {
+ if (write(output, "\n", 1) == -1)
+ goto restore;
}
+restore:
/* Restore old tty settings and signals. */
- term_restore(input);
+ if (!ISSET(flags, TGP_ECHO))
+ term_restore(input, 1);
(void) sigaction(SIGALRM, &savealrm, NULL);
(void) sigaction(SIGINT, &saveint, NULL);
(void) sigaction(SIGHUP, &savehup, NULL);
(void) sigaction(SIGTSTP, &savetstp, NULL);
(void) sigaction(SIGTTIN, &savettin, NULL);
(void) sigaction(SIGTTOU, &savettou, NULL);
+ (void) sigaction(SIGTTOU, &savepipe, NULL);
if (input != STDIN_FILENO)
(void) close(input);
* If we were interrupted by a signal, resend it to ourselves
* now that we have restored the signal handlers.
*/
- if (signo) {
- kill(getpid(), signo);
- switch (signo) {
- case SIGTSTP:
- case SIGTTIN:
- case SIGTTOU:
- goto restart;
+ for (i = 0; i < NSIG; i++) {
+ if (signo[i]) {
+ kill(getpid(), i);
+ switch (i) {
+ case SIGTSTP:
+ case SIGTTIN:
+ case SIGTTOU:
+ need_restart = 1;
+ break;
+ }
}
}
+ if (need_restart)
+ goto restart;
if (save_errno)
errno = save_errno;
- return(pass);
+ return pass;
}
/*
if (pid == 0) {
/* child, point stdout to output side of the pipe and exec askpass */
+ if (dup2(pfd[1], STDOUT_FILENO) == -1) {
+ warning("dup2");
+ _exit(255);
+ }
(void) dup2(pfd[1], STDOUT_FILENO);
set_perms(PERM_FULL_USER);
closefrom(STDERR_FILENO + 1);
/* Ignore SIGPIPE in case child exits prematurely */
zero_bytes(&sa, sizeof(sa));
sigemptyset(&sa.sa_mask);
- sa.sa_flags = 0;
+ sa.sa_flags = SA_INTERRUPT;
sa.sa_handler = SIG_IGN;
(void) sigaction(SIGPIPE, &sa, &saved_sa_pipe);
(void) close(pfd[0]);
(void) sigaction(SIGPIPE, &saved_sa_pipe, NULL);
- return(pass);
+ return pass;
}
extern int term_erase, term_kill;
if (left == 0) {
errno = EINVAL;
- return(NULL); /* sanity */
+ return NULL; /* sanity */
}
while (--left) {
if (feedback) {
if (c == term_kill) {
while (cp > buf) {
- (void) write(fd, "\b \b", 3);
+ if (write(fd, "\b \b", 3) == -1)
+ break;
--cp;
}
left = bufsiz;
continue;
} else if (c == term_erase) {
if (cp > buf) {
- (void) write(fd, "\b \b", 3);
+ if (write(fd, "\b \b", 3) == -1)
+ break;
--cp;
left++;
}
continue;
}
- (void) write(fd, "*", 1);
+ if (write(fd, "*", 1) == -1)
+ /* shut up glibc */;
}
*cp++ = c;
}
if (feedback) {
/* erase stars */
while (cp > buf) {
- (void) write(fd, "\b \b", 3);
+ if (write(fd, "\b \b", 3) == -1)
+ break;
--cp;
}
}
- return(nr == 1 ? buf : NULL);
+ return nr == 1 ? buf : NULL;
}
-static void
+static RETSIGTYPE
handler(s)
int s;
{
if (s != SIGALRM)
- signo = s;
+ signo[s] = 1;
}
int
if ((fd = open(_PATH_TTY, O_RDWR|O_NOCTTY)) != -1)
close(fd);
- return(fd != -1);
+ return fd != -1;
}
projects / debian / sudo / blobdiff