From: Todd C. Miller <Todd.Miller@courtesan.com>
Date: Wed, 16 Jan 2013 20:28:36 +0000 (-0500)
Subject: Rename signal handler to avoid name clash with one in exec.c
X-Git-Tag: SUDO_1_8_7~1^2~281
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2be741d8aea1e1968c4d96aa3a5dc093865236fb;p=sudo

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

diff --git a/src/tgetpass.c b/src/tgetpass.c
index 489c66b78..0d51c23ed 100644
--- a/src/tgetpass.c
+++ b/src/tgetpass.c
@@ -56,7 +56,7 @@
 
 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 *sudo_askpass(const char *, const char *);
 
@@ -130,7 +130,7 @@ restart:
     zero_bytes(&sa, sizeof(sa));
     sigemptyset(&sa.sa_mask);
     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(SIGINT, &sa, &saveint);
     (void) sigaction(SIGHUP, &sa, &savehup);
@@ -315,7 +315,7 @@ getln(int fd, char *buf, size_t bufsiz, int feedback)
 }
 
 static void
-handler(int s)
+tgetpass_handler(int s)
 {
     if (s != SIGALRM)
 	signo[s] = 1;