summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkib <kib@FreeBSD.org>2009-11-26 13:41:15 +0000
committerkib <kib@FreeBSD.org>2009-11-26 13:41:15 +0000
commita5ec5de71c3dddde8033e4f88627b7a80d430af1 (patch)
tree41e19e93714e71e1353d0e4a6d206236edbad851
parentcd77b9ef2b0ca77d3b32dbe99028ad5780665217 (diff)
downloadFreeBSD-src-a5ec5de71c3dddde8033e4f88627b7a80d430af1.zip
FreeBSD-src-a5ec5de71c3dddde8033e4f88627b7a80d430af1.tar.gz
sigset() is the name of function specified by SUSv4.
Replace it to avoid conflict. MFC after: 3 weeks
-rw-r--r--lib/libutil/pw_util.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/libutil/pw_util.c b/lib/libutil/pw_util.c
index 69232fb..75459e3 100644
--- a/lib/libutil/pw_util.c
+++ b/lib/libutil/pw_util.c
@@ -289,7 +289,7 @@ int
pw_edit(int notsetuid)
{
struct sigaction sa, sa_int, sa_quit;
- sigset_t oldsigset, sigset;
+ sigset_t oldsigset, nsigset;
struct stat st1, st2;
const char *editor;
int pstat;
@@ -303,9 +303,9 @@ pw_edit(int notsetuid)
sa.sa_flags = 0;
sigaction(SIGINT, &sa, &sa_int);
sigaction(SIGQUIT, &sa, &sa_quit);
- sigemptyset(&sigset);
- sigaddset(&sigset, SIGCHLD);
- sigprocmask(SIG_BLOCK, &sigset, &oldsigset);
+ sigemptyset(&nsigset);
+ sigaddset(&nsigset, SIGCHLD);
+ sigprocmask(SIG_BLOCK, &nsigset, &oldsigset);
switch ((editpid = fork())) {
case -1:
return (-1);
OpenPOWER on IntegriCloud