isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename signal handler to avoid name clash with one in exec.c

Browse Source
This commit is contained in:
Todd C. Miller
2013-01-16 15:28:36 -05:00
parent 90c6ace770
commit 2be741d8ae
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/tgetpass.c
View File

@@ -56,7 +56,7 @@
static volatile sig_atomic_t signo[NSIG]; static volatile sig_atomic_t signo[NSIG];
static void handler(int); static void tgetpass_handler(int);
static char *getln(int, char *, size_t, int); static char *getln(int, char *, size_t, int);
static char *sudo_askpass(const char *, const char *); static char *sudo_askpass(const char *, const char *);
@@ -130,7 +130,7 @@ restart:
zero_bytes(&sa, sizeof(sa)); zero_bytes(&sa, sizeof(sa));
sigemptyset(&sa.sa_mask); sigemptyset(&sa.sa_mask);
sa.sa_flags = SA_INTERRUPT; /* don't restart system calls */ sa.sa_flags = SA_INTERRUPT; /* don't restart system calls */
sa.sa_handler = handler; sa.sa_handler = tgetpass_handler;
(void) sigaction(SIGALRM, &sa, &savealrm); (void) sigaction(SIGALRM, &sa, &savealrm);
(void) sigaction(SIGINT, &sa, &saveint); (void) sigaction(SIGINT, &sa, &saveint);
(void) sigaction(SIGHUP, &sa, &savehup); (void) sigaction(SIGHUP, &sa, &savehup);
@@ -315,7 +315,7 @@ getln(int fd, char *buf, size_t bufsiz, int feedback)
} }
static void static void
handler(int s) tgetpass_handler(int s)
{ {
if (s != SIGALRM) if (s != SIGALRM)
signo[s] = 1; signo[s] = 1;