d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge the documentation for sigsetmask() and sigblock() into a

Browse Source 
single manual page, appropriately linked, since this removes the
decision of which page the (previously non-existent) sigmask.2
MLINK should point at.

Submitted by:	will
This commit is contained in:
ben 2001-01-17 19:20:58 +00:00
parent 2b24819cd8
commit 10361fc9ee
3 changed files with 31 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/libc/compat-43/Makefile.inc
View File

@ -8,9 +8,12 @@ SRCS+= creat.c gethostid.c getwd.c killpg.c sethostid.c setpgrp.c \
setrgid.c setruid.c sigcompat.c
.if ${LIB} == "c"
MAN2+= creat.2 killpg.2 sigblock.2 sigpause.2 sigsetmask.2 sigvec.2
MAN2+= creat.2 killpg.2 sigpause.2 sigsetmask.2 sigvec.2
MAN3+= gethostid.3 setruid.3
MLINKS+=gethostid.3 sethostid.3
MLINKS+=setruid.3 setrgid.3
MLINKS+=sigsetmask.2 sigblock.2
MLINKS+=sigsetmask.2 sigmask.2
.endif

87
lib/libc/compat-43/sigblock.2
View File

@ -1,87 +0,0 @@
.\" Copyright (c) 1983, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
.\"
.\" Redistribution and use in source and binary forms, with or without
.\" modification, are permitted provided that the following conditions
.\" are met:
.\" 1. Redistributions of source code must retain the above copyright
.\" notice, this list of conditions and the following disclaimer.
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
.\" 3. All advertising materials mentioning features or use of this software
.\" must display the following acknowledgement:
.\" This product includes software developed by the University of
.\" California, Berkeley and its contributors.
.\" 4. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
.\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
.\" @(#)sigblock.2 8.1 (Berkeley) 6/2/93
.\" $FreeBSD$
.\"
.Dd June 2, 1993
.Dt SIGBLOCK 2
.Os BSD 4.2
.Sh NAME
.Nm sigblock
.Nd block signals
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
.Fd #include <signal.h>
.Ft int
.Fn sigblock "int mask"
.Ft int
.Fn sigmask signum
.Sh DESCRIPTION
.Bf -symbolic
This interface is made obsolete by:
.Ef
.Xr sigprocmask 2 .
.Pp
.Fn Sigblock
adds the signals specified in
.Fa mask
to the set of signals currently
being blocked from delivery.
Signals are blocked if the
corresponding bit in
.Fa mask
is a 1; the macro
.Fn sigmask
is provided to construct the mask for a given
.Fa signum .
.Pp
It is not possible to block
.Dv SIGKILL
or
.Dv SIGSTOP ;
this restriction is silently
imposed by the system.
.Sh RETURN VALUES
The previous set of masked signals is returned.
.Sh SEE ALSO
.Xr kill 2 ,
.Xr sigaction 2 ,
.Xr sigprocmask 2 ,
.Xr sigsetmask 2 ,
.Xr sigsetops 3
.Sh HISTORY
The
.Fn sigblock
function call appeared in
.Bx 4.2
and has been deprecated.

38
lib/libc/compat-43/sigsetmask.2
View File

@ -36,15 +36,19 @@
.Dt SIGSETMASK 2
.Os BSD 4.2
.Sh NAME
.Nm sigsetmask
.Nd set current signal mask
.Nm sigsetmask ,
.Nm sigblock
.Nd manipulate current signal mask
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
.Fd #include <signal.h>
.Ft int
.Fn sigsetmask "int mask"
.Fn sigmask signum
.Ft int
.Fn sigblock "int mask"
.Ft int
.Fn sigmask "int signum"
.Sh DESCRIPTION
.Bf -symbolic
This interface is made obsolete by:
@ -52,11 +56,19 @@ This interface is made obsolete by:
.Xr sigprocmask 2 .
.Pp
.Fn Sigsetmask
sets the current signal mask. Signals
are blocked from delivery if the
corresponding bit in
sets the current signal mask to the specified
.Fa mask .
Signals are blocked from delivery if the corresponding bit in
.Fa mask
is a 1; the macro
is a 1.
.Fn Sigblock
adds the signals in the specified
.Fa mask
to the current signal mask,
rather than overwriting it as
.Fn sigsetmask
does.
The macro
.Fn sigmask
is provided to construct the mask for a given
.Fa signum .
@ -68,11 +80,13 @@ or
.Dv SIGSTOP
to be blocked.
.Sh RETURN VALUES
The previous set of masked signals is returned.
.Fn Sigblock
and
.Fn sigsetmask
return the previous set of masked signals.
.Sh SEE ALSO
.Xr kill 2 ,
.Xr sigaction 2 ,
.Xr sigblock 2 ,
.Xr sigprocmask 2 ,
.Xr sigsuspend 2 ,
.Xr sigvec 2 ,
@ -80,6 +94,8 @@ The previous set of masked signals is returned.
.Sh HISTORY
The
.Fn sigsetmask
function call appeared in
and
.Fn sigblock
function calls first appeared in
.Bx 4.2
and has been deprecated.
and have been deprecated.