From 8fee51d63a5ca4a119850c9831a7219fe496df6c Mon Sep 17 00:00:00 2001 From: Eric Andersen Date: Fri, 27 Oct 2000 21:38:32 +0000 Subject: Fix up signal handling --- libc/signal/Makefile | 6 ++++-- libc/signal/sigaddset.c | 35 +++++++++++++++++++++++++++++++++++ libc/signal/sigdelset.c | 33 +++++++++++++++++++++++++++++++++ libc/signal/sigemptyset.c | 35 +++++++++++++++++++++++++++++++++++ libc/signal/sigismem.c | 33 +++++++++++++++++++++++++++++++++ 5 files changed, 140 insertions(+), 2 deletions(-) create mode 100644 libc/signal/sigaddset.c create mode 100644 libc/signal/sigdelset.c create mode 100644 libc/signal/sigemptyset.c create mode 100644 libc/signal/sigismem.c (limited to 'libc') diff --git a/libc/signal/Makefile b/libc/signal/Makefile index 9fb8e1d46..5de28d7f0 100644 --- a/libc/signal/Makefile +++ b/libc/signal/Makefile @@ -24,9 +24,11 @@ TOPDIR=../ include $(TOPDIR)Rules.mak LIBC=$(TOPDIR)libc.a -CSRC=bsd_sig.c raise.c sigblock.c siggtmsk.c sigjmp.c signal.c sigpause.c sigstmsk.c - +CSRC=bsd_sig.c raise.c sigblock.c siggtmsk.c sigjmp.c signal.c \ + sigpause.c sigstmsk.c sigaddset.c sigdelset.c \ + sigismem.c sigemptyset.c COBJS=$(patsubst %.c,%.o, $(CSRC)) + OBJS=$(COBJS) all: $(OBJS) $(LIBC) diff --git a/libc/signal/sigaddset.c b/libc/signal/sigaddset.c new file mode 100644 index 000000000..e6848a76d --- /dev/null +++ b/libc/signal/sigaddset.c @@ -0,0 +1,35 @@ +/* Copyright (C) 1991, 1996 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#include +#include +#define _EXTERN_INLINE +#define __USE_EXTERN_INLINES 1 +#include "signal.h" + + +/* Add SIGNO to SET. */ +int sigaddset ( sigset_t *set, int signo) +{ + if (set == NULL || signo <= 0 || signo >= NSIG) { + errno = EINVAL; + return -1; + } + + return __sigaddset (set, signo); +} diff --git a/libc/signal/sigdelset.c b/libc/signal/sigdelset.c new file mode 100644 index 000000000..6206e7d39 --- /dev/null +++ b/libc/signal/sigdelset.c @@ -0,0 +1,33 @@ +/* Copyright (C) 1991, 1996 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#include "errno.h" +#define _EXTERN_INLINE +#define __USE_EXTERN_INLINES 1 +#include "signal.h" + +/* Add SIGNO to SET. */ +int sigdelset ( sigset_t *set, int signo) +{ + if (set == NULL || signo <= 0 || signo >= NSIG) { + errno = EINVAL; + return -1; + } + + return __sigdelset (set, signo); +} diff --git a/libc/signal/sigemptyset.c b/libc/signal/sigemptyset.c new file mode 100644 index 000000000..c38cb0e5a --- /dev/null +++ b/libc/signal/sigemptyset.c @@ -0,0 +1,35 @@ +/* Copyright (C) 1991, 1996, 1997 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#include +#include +#include + +/* Clear all signals from SET. */ +int +sigemptyset ( sigset_t *set) +{ + if (set == NULL) { + errno = EINVAL; + return -1; + } + + memset (set, 0, sizeof (sigset_t)); + + return 0; +} diff --git a/libc/signal/sigismem.c b/libc/signal/sigismem.c new file mode 100644 index 000000000..3e9b67c6c --- /dev/null +++ b/libc/signal/sigismem.c @@ -0,0 +1,33 @@ +/* Copyright (C) 1991, 1996 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#include "errno.h" +#define _EXTERN_INLINE +#define __USE_EXTERN_INLINES 1 +#include "signal.h" + +/* Return 1 if SIGNO is in SET, 0 if not. */ +int sigismember ( const sigset_t *set, int signo) +{ + if (set == NULL || signo <= 0 || signo >= NSIG) { + errno=EINVAL; + return -1; + } + + return __sigismember (set, signo); +} -- cgit v1.2.3