sigset_t change (part 5 of 5)

-----------------------------

Most of the userland changes are in libc. For both the alpha
and the i386 setjmp has been changed to accomodate for the
new sigset_t. Internally, libc is mostly rewritten to use the
new syscalls. The exception is in compat-43/sigcompat.c

The POSIX thread library has also been rewritten to use the
new sigset_t. Except, that it currently only handles NSIG
signals instead of the maximum _SIG_MAXSIG. This should not
be a problem because current applications don't use any
signals higher than NSIG.

There are version bumps for the following libraries:
  libdialog
  libreadline
  libc
  libc_r
  libedit
  libftpio
  libss

These libraries either a) have one of the modified structures
visible in the interface, or b) use sigset_t internally and
may cause breakage if new binaries are used against libraries
that don't have the sigset_t change. This not an immediate
issue, but will be as soon as applications start using the
new range to its fullest.

NOTE: libncurses already had an version bump and has not been
      given one now.

NOTE: doscmd is a real casualty and has been disconnected for
      the moment. Reconnection will eventually happen after
      doscmd has been fixed. I'm aware that being the last one
      to touch it, I'm automaticly promoted to being maintainer.
      According to good taste this means that I will receive a
      badge which either will be glued or mechanically stapled,
      drilled or otherwise violently forced onto me :-)

NOTE: pcvt/vttest cannot be compiled with -traditional. The
      change cause sys/types to be included along the way which
      contains the const and volatile modifiers. I don't consider
      this a solution, but more a workaround.

1 files changed, 20 insertions, 12 deletions

diff --git a/lib/libc/compat-43/sigcompat.c b/lib/libc/compat-43/sigcompat.c
index 56550d223bf7..fa25e50eb334 100644
--- a/lib/libc/compat-43/sigcompat.c
+++ b/lib/libc/compat-43/sigcompat.c
@@ -29,6 +29,8 @@
  * 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.
+ *
+ * $FreeBSD$
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
@@ -47,7 +49,8 @@ sigvec(signo, sv, osv)
 
 	if (sv)
 		sv->sv_flags ^= SV_INTERRUPT;	/* !SA_INTERRUPT */
-	ret = sigaction(signo, (struct sigaction *)sv, (struct sigaction *)osv);
+	ret = osigaction(signo, (struct osigaction *)sv,
+	    (struct osigaction *)osv);
 	if (ret == 0 && osv)
 		osv->sv_flags ^= SV_INTERRUPT;	/* !SA_INTERRUPT */
 	return (ret);
@@ -57,29 +60,34 @@ int
 sigsetmask(mask)
 	int mask;
 {
-	int omask, n;
+	sigset_t set, oset;
 
-	n = sigprocmask(SIG_SETMASK, (sigset_t *) &mask, (sigset_t *) &omask);
-	if (n)
-		return (n);
-	return (omask);
+	sigemptyset(&set);
+	set.__bits[0] = mask;
+	(void)sigprocmask(SIG_SETMASK, &set, &oset);
+	return (oset.__bits[0]);
 }
 
 int
 sigblock(mask)
 	int mask;
 {
-	int omask, n;
+	sigset_t set, oset;
+
+	sigemptyset(&set);
+	set.__bits[0] = mask;
 
-	n = sigprocmask(SIG_BLOCK, (sigset_t *) &mask, (sigset_t *) &omask);
-	if (n)
-		return (n);
-	return (omask);
+	(void)sigprocmask(SIG_BLOCK, &set, &oset);
+	return (oset.__bits[0]);
 }
 
 int
 sigpause(mask)
 	int mask;
 {
-	return (sigsuspend((sigset_t *)&mask));
+	sigset_t set;
+
+	sigemptyset(&set);
+	set.__bits[0] = mask;
+	return (sigsuspend(&set));
 }