svn commit: r200643 - stable/8/lib/libutil
Konstantin Belousov
kib at FreeBSD.org
Thu Dec 17 18:56:52 UTC 2009
Author: kib
Date: Thu Dec 17 18:56:52 2009
New Revision: 200643
URL: http://svn.freebsd.org/changeset/base/200643
Log:
MFC r199826:
sigset() is the name of function specified by SUSv4.
Replace it to avoid conflict.
Modified:
stable/8/lib/libutil/pw_util.c
Directory Properties:
stable/8/lib/libutil/ (props changed)
Modified: stable/8/lib/libutil/pw_util.c
==============================================================================
--- stable/8/lib/libutil/pw_util.c Thu Dec 17 18:43:34 2009 (r200642)
+++ stable/8/lib/libutil/pw_util.c Thu Dec 17 18:56:52 2009 (r200643)
@@ -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);
More information about the svn-src-stable
mailing list