diff options
| author |   Konstantin Belousov <kib@FreeBSD.org> | 2009-12-17 18:56:52 +0000 |
|---|---|---|
| committer | Konstantin Belousov <kib@FreeBSD.org> | 2009-12-17 18:56:52 +0000 |
| commit | 9ac072c5534fe9a159cc808b8c4ea641353c3306 (patch) | |
| tree | 94b2b45d45209e9341cfd9f8a9910745fe3d60ed | |
| parent | 1a8db5b2127d43a49d986fb97b62bd51db655b10 (diff) | |
| download | pw-darwin-9ac072c5534fe9a159cc808b8c4ea641353c3306.tar.gz pw-darwin-9ac072c5534fe9a159cc808b8c4ea641353c3306.tar.zst pw-darwin-9ac072c5534fe9a159cc808b8c4ea641353c3306.zip | |
MFC r199826:
sigset() is the name of function specified by SUSv4.
Replace it to avoid conflict.
| -rw-r--r-- | libutil/pw_util.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libutil/pw_util.c b/libutil/pw_util.c index 69232fb..75459e3 100644 --- a/libutil/pw_util.c +++ b/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); |