From a992f506ff7162da2afa5a6151cc6f15949ceef4 Mon Sep 17 00:00:00 2001 From: Zack Weinberg Date: Thu, 1 Dec 2016 19:24:13 -0500 Subject: Remove __need macros from signal.h. The types affected are __sig_atomic_t, sig_atomic_t, __sigset_t, sigset_t, sigval_t, sigevent_t, and siginfo_t. __sig_atomic_t is a scalar, so it's now directly available from bits/types.h. The others get bits/types/ headers. Side effects include: There have been small changes to which non-signal headers expose which subset of the signal-related types. A couple of architectures' nested siginfo_t fields had to be renamed to prevent undesired macro expansion. Internal code that wants to manipulate signal masks must now include (which is not installed) and should be aware that __sigaddset, __sigandset, __sigdelset, __sigemptyset, and __sigorset no longer return a value (unlike the public API). Relatedly, the public signal.h no longer declares any of those functions. The obsolete sigmask() macro no longer has a system-specific definition -- in the cases where it matters, it didn't work anyway. New Linux architectures should create bits/siginfo-arch.h and/or bits/siginfo-consts-arch.h to customize their siginfo_t, rather than duplicating everything in bits/siginfo.h (which no longer exists). Add new __SI_* macros if necessary. Ports to other operating systems are strongly encouraged to generalize this scheme further. * bits/sigevent-consts.h * bits/siginfo-consts.h * bits/types/__sigset_t.h * bits/types/sigevent_t.h * bits/types/siginfo_t.h * sysdeps/unix/sysv/linux/bits/sigevent-consts.h * sysdeps/unix/sysv/linux/bits/siginfo-consts.h * sysdeps/unix/sysv/linux/bits/types/__sigset_t.h * sysdeps/unix/sysv/linux/bits/types/sigevent_t.h * sysdeps/unix/sysv/linux/bits/types/siginfo_t.h: New system-dependent bits headers. * sysdeps/unix/sysv/linux/bits/siginfo-arch.h * sysdeps/unix/sysv/linux/bits/siginfo-consts-arch.h * sysdeps/unix/sysv/linux/ia64/bits/siginfo-arch.h * sysdeps/unix/sysv/linux/ia64/bits/siginfo-consts-arch.h * sysdeps/unix/sysv/linux/mips/bits/siginfo-arch.h * sysdeps/unix/sysv/linux/sparc/bits/siginfo-arch.h * sysdeps/unix/sysv/linux/tile/bits/siginfo-arch.h * sysdeps/unix/sysv/linux/tile/bits/siginfo-consts-arch.h * sysdeps/unix/sysv/linux/x86/bits/siginfo-arch.h: New Linux-only system-dependent bits headers. * signal/bits/types/sig_atomic_t.h * signal/bits/types/sigset_t.h * signal/bits/types/sigval_t.h: New non-system-dependent bits headers. * sysdeps/generic/sigsetops.h * sysdeps/unix/sysv/linux/sigsetops.h: New internal headers. * include/bits/types/sig_atomic_t.h * include/bits/types/sigset_t.h * include/bits/types/sigval_t.h: New wrappers. * signal/sigsetops.h * bits/siginfo.h * bits/sigset.h * sysdeps/unix/sysv/linux/bits/siginfo.h * sysdeps/unix/sysv/linux/bits/sigset.h * sysdeps/unix/sysv/linux/ia64/bits/siginfo.h * sysdeps/unix/sysv/linux/mips/bits/siginfo.h * sysdeps/unix/sysv/linux/s390/bits/siginfo.h * sysdeps/unix/sysv/linux/sparc/bits/siginfo.h * sysdeps/unix/sysv/linux/tile/bits/siginfo.h * sysdeps/unix/sysv/linux/x86/bits/siginfo.h: Deleted. * signal/Makefile, sysdeps/unix/sysv/linux/Makefile: Update lists of installed headers. * posix/bits/types.h: Define __sig_atomic_t here. * signal/signal.h: Use the new bits headers; no need to handle __need_sig_atomic_t nor __need_sigset_t. Don't use __sigmask to define sigmask. * include/signal.h: No need to handle __need_sig_atomic_t nor __need_sigset_t. Don't define __sigemptyset. * io/sys/poll.h, setjmp/setjmp.h * sysdeps/arm/sys/ucontext.h, sysdeps/generic/sys/ucontext.h * sysdeps/i386/sys/ucontext.h, sysdeps/m68k/sys/ucontext.h * sysdeps/mach/hurd/i386/bits/sigcontext.h * sysdeps/mips/sys/ucontext.h, sysdeps/powerpc/novmxsetjmp.h * sysdeps/pthread/bits/sigthread.h * sysdeps/unix/sysv/linux/hppa/sys/ucontext.h * sysdeps/unix/sysv/linux/m68k/sys/ucontext.h * sysdeps/unix/sysv/linux/mips/sys/ucontext.h * sysdeps/unix/sysv/linux/nios2/sys/ucontext.h * sysdeps/unix/sysv/linux/powerpc/sys/ucontext.h * sysdeps/unix/sysv/linux/s390/sys/ucontext.h * sysdeps/unix/sysv/linux/sh/sys/ucontext.h * sysdeps/unix/sysv/linux/sparc/sys/ucontext.h * sysdeps/unix/sysv/linux/tile/sys/ucontext.h * sysdeps/unix/sysv/linux/x86/sys/ucontext.h: Use bits/types/__sigset_t.h. * misc/sys/select.h, posix/spawn.h * sysdeps/unix/sysv/linux/powerpc/sys/ucontext.h * sysdeps/unix/sysv/linux/sys/epoll.h * sysdeps/unix/sysv/linux/sys/signalfd.h: Use bits/types/sigset_t.h. * resolv/netdb.h, rt/mqueue.h: Use bits/types/sigevent_t.h. * rt/aio.h: Use bits/types/sigevent_t.h and bits/sigevent-consts.h. * socket/sys/socket.h: Don't include bits/sigset.h. * login/utmp_file.c, shadow/lckpwdf.c, signal/sigandset.c * signal/sigisempty.c, stdlib/abort.c, sysdeps/posix/profil.c * sysdeps/posix/sigignore.c, sysdeps/posix/sigintr.c * sysdeps/posix/signal.c, sysdeps/posix/sigset.c * sysdeps/posix/sprofil.c, sysdeps/posix/sysv_signal.c * sysdeps/unix/sysv/linux/nptl-signals.h: Include sigsetops.h. * signal/sigaddset.c, signal/sigandset.c, signal/sigdelset.c * signal/sigorset.c, stdlib/abort.c, sysdeps/posix/sigignore.c * sysdeps/posix/signal.c, sysdeps/posix/sigset.c: __sigaddset, __sigandset, __sigdelset, __sigemptyset, __sigorset now return no value. * signal/sigaddset.c, signal/sigdelset.c, signal/sigismem.c Include , , and instead of "sigsetops.h". * signal/sigsetops.c: Explicitly define __sigismember, __sigaddset, and __sigdelset as compatibility symbols. * signal/Versions: Correct commentary on __sigpause, __sigaddset, __sigdelset, __sigismember. * inet/rcmd.c: Include sigsetops.h. Convert old code using __sigblock/__sigsetmask to use __sigprocmask and friends. --- ChangeLog | 127 ++++++++ bits/sigevent-consts.h | 37 +++ bits/siginfo-consts.h | 150 +++++++++ bits/siginfo.h | 216 ------------- bits/sigset.h | 84 ----- bits/types/__sigset_t.h | 7 + bits/types/sigevent_t.h | 17 + bits/types/siginfo_t.h | 21 ++ include/bits/types/sig_atomic_t.h | 1 + include/bits/types/sigset_t.h | 1 + include/bits/types/sigval_t.h | 1 + include/signal.h | 15 +- inet/rcmd.c | 16 +- io/sys/poll.h | 6 +- login/utmp_file.c | 1 + misc/sys/select.h | 9 +- posix/bits/types.h | 4 + posix/spawn.h | 3 +- posix/sys/wait.h | 3 +- resolv/netdb.h | 3 +- rt/aio.h | 4 +- rt/mqueue.h | 3 +- setjmp/setjmp.h | 3 +- shadow/lckpwdf.c | 1 + signal/Makefile | 12 +- signal/Versions | 8 +- signal/bits/types/sig_atomic_t.h | 10 + signal/bits/types/sigset_t.h | 9 + signal/bits/types/sigval_t.h | 13 + signal/sigaddset.c | 7 +- signal/sigandset.c | 8 +- signal/sigdelset.c | 7 +- signal/sigisempty.c | 7 +- signal/sigismem.c | 4 +- signal/signal.h | 41 +-- signal/sigorset.c | 8 +- signal/sigsetops.c | 58 +++- signal/sigsetops.h | 32 -- socket/sys/socket.h | 5 - stdlib/abort.c | 9 +- sysdeps/arm/sys/ucontext.h | 1 + sysdeps/generic/sigsetops.h | 77 +++++ sysdeps/generic/sys/ucontext.h | 1 + sysdeps/i386/sys/ucontext.h | 1 + sysdeps/m68k/sys/ucontext.h | 1 + sysdeps/mach/hurd/i386/bits/sigcontext.h | 1 + sysdeps/mips/sys/ucontext.h | 1 + sysdeps/posix/profil.c | 1 + sysdeps/posix/sigignore.c | 5 +- sysdeps/posix/sigintr.c | 1 + sysdeps/posix/signal.c | 7 +- sysdeps/posix/sigset.c | 63 ++-- sysdeps/posix/sprofil.c | 1 + sysdeps/posix/sysv_signal.c | 5 +- sysdeps/powerpc/novmxsetjmp.h | 2 +- sysdeps/pthread/bits/sigthread.h | 1 + sysdeps/unix/sysv/linux/Makefile | 3 +- sysdeps/unix/sysv/linux/aarch64/sys/ucontext.h | 1 + sysdeps/unix/sysv/linux/alpha/sys/ucontext.h | 1 + sysdeps/unix/sysv/linux/arm/sys/ucontext.h | 1 + sysdeps/unix/sysv/linux/bits/sigevent-consts.h | 41 +++ sysdeps/unix/sysv/linux/bits/siginfo-arch.h | 7 + sysdeps/unix/sysv/linux/bits/siginfo-consts-arch.h | 7 + sysdeps/unix/sysv/linux/bits/siginfo-consts.h | 185 +++++++++++ sysdeps/unix/sysv/linux/bits/siginfo.h | 341 ------------------- sysdeps/unix/sysv/linux/bits/sigset.h | 124 ------- sysdeps/unix/sysv/linux/bits/types/__sigset_t.h | 10 + sysdeps/unix/sysv/linux/bits/types/sigevent_t.h | 48 +++ sysdeps/unix/sysv/linux/bits/types/siginfo_t.h | 139 ++++++++ sysdeps/unix/sysv/linux/hppa/sys/ucontext.h | 1 + sysdeps/unix/sysv/linux/ia64/bits/siginfo-arch.h | 19 ++ .../sysv/linux/ia64/bits/siginfo-consts-arch.h | 45 +++ sysdeps/unix/sysv/linux/ia64/bits/siginfo.h | 360 --------------------- sysdeps/unix/sysv/linux/m68k/sys/ucontext.h | 1 + sysdeps/unix/sysv/linux/mips/bits/siginfo-arch.h | 15 + sysdeps/unix/sysv/linux/mips/bits/siginfo.h | 344 -------------------- sysdeps/unix/sysv/linux/mips/sys/ucontext.h | 1 + sysdeps/unix/sysv/linux/nios2/sys/ucontext.h | 1 + sysdeps/unix/sysv/linux/nptl-signals.h | 1 + sysdeps/unix/sysv/linux/powerpc/sys/ucontext.h | 3 +- sysdeps/unix/sysv/linux/s390/bits/siginfo.h | 341 ------------------- sysdeps/unix/sysv/linux/s390/sys/ucontext.h | 1 + sysdeps/unix/sysv/linux/sh/sys/ucontext.h | 1 + sysdeps/unix/sysv/linux/sigsetops.h | 108 +++++++ sysdeps/unix/sysv/linux/sparc/bits/siginfo-arch.h | 14 + .../sysv/linux/sparc/bits/siginfo-consts-arch.h | 12 + sysdeps/unix/sysv/linux/sparc/bits/siginfo.h | 352 -------------------- sysdeps/unix/sysv/linux/sparc/sys/ucontext.h | 1 + sysdeps/unix/sysv/linux/sys/epoll.h | 8 +- sysdeps/unix/sysv/linux/sys/signalfd.h | 3 +- sysdeps/unix/sysv/linux/tile/bits/siginfo-arch.h | 11 + .../sysv/linux/tile/bits/siginfo-consts-arch.h | 14 + sysdeps/unix/sysv/linux/tile/bits/siginfo.h | 347 -------------------- sysdeps/unix/sysv/linux/tile/sys/ucontext.h | 1 + sysdeps/unix/sysv/linux/x86/bits/siginfo-arch.h | 19 ++ sysdeps/unix/sysv/linux/x86/bits/siginfo.h | 360 --------------------- sysdeps/unix/sysv/linux/x86/sys/ucontext.h | 1 + 97 files changed, 1357 insertions(+), 3076 deletions(-) create mode 100644 bits/sigevent-consts.h create mode 100644 bits/siginfo-consts.h delete mode 100644 bits/siginfo.h delete mode 100644 bits/sigset.h create mode 100644 bits/types/__sigset_t.h create mode 100644 bits/types/sigevent_t.h create mode 100644 bits/types/siginfo_t.h create mode 100644 include/bits/types/sig_atomic_t.h create mode 100644 include/bits/types/sigset_t.h create mode 100644 include/bits/types/sigval_t.h create mode 100644 signal/bits/types/sig_atomic_t.h create mode 100644 signal/bits/types/sigset_t.h create mode 100644 signal/bits/types/sigval_t.h delete mode 100644 signal/sigsetops.h create mode 100644 sysdeps/generic/sigsetops.h create mode 100644 sysdeps/unix/sysv/linux/bits/sigevent-consts.h create mode 100644 sysdeps/unix/sysv/linux/bits/siginfo-arch.h create mode 100644 sysdeps/unix/sysv/linux/bits/siginfo-consts-arch.h create mode 100644 sysdeps/unix/sysv/linux/bits/siginfo-consts.h delete mode 100644 sysdeps/unix/sysv/linux/bits/siginfo.h delete mode 100644 sysdeps/unix/sysv/linux/bits/sigset.h create mode 100644 sysdeps/unix/sysv/linux/bits/types/__sigset_t.h create mode 100644 sysdeps/unix/sysv/linux/bits/types/sigevent_t.h create mode 100644 sysdeps/unix/sysv/linux/bits/types/siginfo_t.h create mode 100644 sysdeps/unix/sysv/linux/ia64/bits/siginfo-arch.h create mode 100644 sysdeps/unix/sysv/linux/ia64/bits/siginfo-consts-arch.h delete mode 100644 sysdeps/unix/sysv/linux/ia64/bits/siginfo.h create mode 100644 sysdeps/unix/sysv/linux/mips/bits/siginfo-arch.h delete mode 100644 sysdeps/unix/sysv/linux/mips/bits/siginfo.h delete mode 100644 sysdeps/unix/sysv/linux/s390/bits/siginfo.h create mode 100644 sysdeps/unix/sysv/linux/sigsetops.h create mode 100644 sysdeps/unix/sysv/linux/sparc/bits/siginfo-arch.h create mode 100644 sysdeps/unix/sysv/linux/sparc/bits/siginfo-consts-arch.h delete mode 100644 sysdeps/unix/sysv/linux/sparc/bits/siginfo.h create mode 100644 sysdeps/unix/sysv/linux/tile/bits/siginfo-arch.h create mode 100644 sysdeps/unix/sysv/linux/tile/bits/siginfo-consts-arch.h delete mode 100644 sysdeps/unix/sysv/linux/tile/bits/siginfo.h create mode 100644 sysdeps/unix/sysv/linux/x86/bits/siginfo-arch.h delete mode 100644 sysdeps/unix/sysv/linux/x86/bits/siginfo.h diff --git a/ChangeLog b/ChangeLog index 43beed2983..62341b8ed3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,132 @@ 2017-05-20 Zack Weinberg + * bits/sigevent-consts.h + * bits/siginfo-consts.h + * bits/types/__sigset_t.h + * bits/types/sigevent_t.h + * bits/types/siginfo_t.h + * sysdeps/unix/sysv/linux/bits/sigevent-consts.h + * sysdeps/unix/sysv/linux/bits/siginfo-consts.h + * sysdeps/unix/sysv/linux/bits/types/__sigset_t.h + * sysdeps/unix/sysv/linux/bits/types/sigevent_t.h + * sysdeps/unix/sysv/linux/bits/types/siginfo_t.h: + New system-dependent bits headers. + + * sysdeps/unix/sysv/linux/bits/siginfo-arch.h + * sysdeps/unix/sysv/linux/bits/siginfo-consts-arch.h + * sysdeps/unix/sysv/linux/ia64/bits/siginfo-arch.h + * sysdeps/unix/sysv/linux/ia64/bits/siginfo-consts-arch.h + * sysdeps/unix/sysv/linux/mips/bits/siginfo-arch.h + * sysdeps/unix/sysv/linux/sparc/bits/siginfo-arch.h + * sysdeps/unix/sysv/linux/tile/bits/siginfo-arch.h + * sysdeps/unix/sysv/linux/tile/bits/siginfo-consts-arch.h + * sysdeps/unix/sysv/linux/x86/bits/siginfo-arch.h: + New Linux-only system-dependent bits headers. + + * signal/bits/types/sig_atomic_t.h + * signal/bits/types/sigset_t.h + * signal/bits/types/sigval_t.h: + New non-system-dependent bits headers. + + * sysdeps/generic/sigsetops.h + * sysdeps/unix/sysv/linux/sigsetops.h: + New internal headers. + + * include/bits/types/sig_atomic_t.h + * include/bits/types/sigset_t.h + * include/bits/types/sigval_t.h: + New wrappers. + + * signal/sigsetops.h + * bits/siginfo.h + * bits/sigset.h + * sysdeps/unix/sysv/linux/bits/siginfo.h + * sysdeps/unix/sysv/linux/bits/sigset.h + * sysdeps/unix/sysv/linux/ia64/bits/siginfo.h + * sysdeps/unix/sysv/linux/mips/bits/siginfo.h + * sysdeps/unix/sysv/linux/s390/bits/siginfo.h + * sysdeps/unix/sysv/linux/sparc/bits/siginfo.h + * sysdeps/unix/sysv/linux/tile/bits/siginfo.h + * sysdeps/unix/sysv/linux/x86/bits/siginfo.h: + Deleted. + + * signal/Makefile, sysdeps/unix/sysv/linux/Makefile: + Update lists of installed headers. + + * posix/bits/types.h: Define __sig_atomic_t here. + * signal/signal.h: Use the new bits headers; no need to handle + __need_sig_atomic_t nor __need_sigset_t. Don't use __sigmask + to define sigmask. + * include/signal.h: No need to handle __need_sig_atomic_t + nor __need_sigset_t. Don't define __sigemptyset. + + * io/sys/poll.h, setjmp/setjmp.h + * sysdeps/arm/sys/ucontext.h, sysdeps/generic/sys/ucontext.h + * sysdeps/i386/sys/ucontext.h, sysdeps/m68k/sys/ucontext.h + * sysdeps/mach/hurd/i386/bits/sigcontext.h + * sysdeps/mips/sys/ucontext.h, sysdeps/powerpc/novmxsetjmp.h + * sysdeps/pthread/bits/sigthread.h + * sysdeps/unix/sysv/linux/hppa/sys/ucontext.h + * sysdeps/unix/sysv/linux/m68k/sys/ucontext.h + * sysdeps/unix/sysv/linux/mips/sys/ucontext.h + * sysdeps/unix/sysv/linux/nios2/sys/ucontext.h + * sysdeps/unix/sysv/linux/powerpc/sys/ucontext.h + * sysdeps/unix/sysv/linux/s390/sys/ucontext.h + * sysdeps/unix/sysv/linux/sh/sys/ucontext.h + * sysdeps/unix/sysv/linux/sparc/sys/ucontext.h + * sysdeps/unix/sysv/linux/tile/sys/ucontext.h + * sysdeps/unix/sysv/linux/x86/sys/ucontext.h: + Use bits/types/__sigset_t.h. + + * misc/sys/select.h, posix/spawn.h + * sysdeps/unix/sysv/linux/powerpc/sys/ucontext.h + * sysdeps/unix/sysv/linux/sys/epoll.h + * sysdeps/unix/sysv/linux/sys/signalfd.h: + Use bits/types/sigset_t.h. + + * resolv/netdb.h, rt/mqueue.h: Use bits/types/sigevent_t.h. + * rt/aio.h: Use bits/types/sigevent_t.h and bits/sigevent-consts.h. + * socket/sys/socket.h: Don't include bits/sigset.h. + + * login/utmp_file.c, shadow/lckpwdf.c, signal/sigandset.c + * signal/sigisempty.c, stdlib/abort.c, sysdeps/posix/profil.c + * sysdeps/posix/sigignore.c, sysdeps/posix/sigintr.c + * sysdeps/posix/signal.c, sysdeps/posix/sigset.c + * sysdeps/posix/sprofil.c, sysdeps/posix/sysv_signal.c + * sysdeps/unix/sysv/linux/nptl-signals.h: + Include sigsetops.h. + + * signal/sigaddset.c, signal/sigandset.c, signal/sigdelset.c + * signal/sigorset.c, stdlib/abort.c, sysdeps/posix/sigignore.c + * sysdeps/posix/signal.c, sysdeps/posix/sigset.c: + __sigaddset, __sigandset, __sigdelset, __sigemptyset, __sigorset + now return no value. + + * signal/sigaddset.c, signal/sigdelset.c, signal/sigismem.c + Include , , and instead of + "sigsetops.h". + + * signal/sigsetops.c: Explicitly define __sigismember, + __sigaddset, and __sigdelset as compatibility symbols. + + * signal/Versions: Correct commentary on __sigpause, + __sigaddset, __sigdelset, __sigismember. + + * inet/rcmd.c: Include sigsetops.h. Convert old code using + __sigblock/__sigsetmask to use __sigprocmask and friends. + + * resolv/resolv.h: Remove __need_res_state logic. + Move definition of res_state and related constants to ... + * resolv/bits/types/res_state.h: ...this new file. + * resolv/Makefile: Install bits/types/res_state.h. + * include/bits/types/res_state.h: New wrapper. + * include/list.h: Remove __need_list_t logic. + Move definition of list_t to ... + * include/list_t.h: ...this new file. + + * nptl/descr.h: Include list_t.h and bits/types/res_state.h + instead of list.h and resolv.h. + * resolv/resolv.h: Remove __need_res_state logic. Move definition of res_state and related constants to ... * resolv/bits/types/res_state.h: ...this new file. diff --git a/bits/sigevent-consts.h b/bits/sigevent-consts.h new file mode 100644 index 0000000000..f5940e00ea --- /dev/null +++ b/bits/sigevent-consts.h @@ -0,0 +1,37 @@ +/* sigevent constants. Stub version. + Copyright (C) 1997-2017 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 Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#ifndef _BITS_SIGEVENT_CONSTS_H +#define _BITS_SIGEVENT_CONSTS_H 1 + +#if !defined _SIGNAL_H && !defined _AIO_H +#error "Don't include directly; use instead." +#endif + +/* `sigev_notify' values. */ +enum +{ + SIGEV_SIGNAL = 0, /* Notify via signal. */ +# define SIGEV_SIGNAL SIGEV_SIGNAL + SIGEV_NONE, /* Other notification: meaningless. */ +# define SIGEV_NONE SIGEV_NONE + SIGEV_THREAD /* Deliver via thread creation. */ +# define SIGEV_THREAD SIGEV_THREAD +}; + +#endif diff --git a/bits/siginfo-consts.h b/bits/siginfo-consts.h new file mode 100644 index 0000000000..a58ac4bdb7 --- /dev/null +++ b/bits/siginfo-consts.h @@ -0,0 +1,150 @@ +/* siginfo_t constants. Stub version. + Copyright (C) 1997-2017 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 Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#ifndef _BITS_SIGINFO_CONSTS_H +#define _BITS_SIGINFO_CONSTS_H 1 + +/* Values for `si_code'. Positive values are reserved for kernel-generated + signals. */ +enum +{ + SI_ASYNCIO = -4, /* Sent by AIO completion. */ +# define SI_ASYNCIO SI_ASYNCIO + SI_MESGQ, /* Sent by real time mesq state change. */ +# define SI_MESGQ SI_MESGQ + SI_TIMER, /* Sent by timer expiration. */ +# define SI_TIMER SI_TIMER + SI_QUEUE, /* Sent by sigqueue. */ +# define SI_QUEUE SI_QUEUE + SI_USER /* Sent by kill, sigsend, raise. */ +# define SI_USER SI_USER +}; + + +# if defined __USE_XOPEN_EXTENDED || defined __USE_XOPEN2K8 +/* `si_code' values for SIGILL signal. */ +enum +{ + ILL_ILLOPC = 1, /* Illegal opcode. */ +# define ILL_ILLOPC ILL_ILLOPC + ILL_ILLOPN, /* Illegal operand. */ +# define ILL_ILLOPN ILL_ILLOPN + ILL_ILLADR, /* Illegal addressing mode. */ +# define ILL_ILLADR ILL_ILLADR + ILL_ILLTRP, /* Illegal trap. */ +# define ILL_ILLTRP ILL_ILLTRP + ILL_PRVOPC, /* Privileged opcode. */ +# define ILL_PRVOPC ILL_PRVOPC + ILL_PRVREG, /* Privileged register. */ +# define ILL_PRVREG ILL_PRVREG + ILL_COPROC, /* Coprocessor error. */ +# define ILL_COPROC ILL_COPROC + ILL_BADSTK /* Internal stack error. */ +# define ILL_BADSTK ILL_BADSTK +}; + +/* `si_code' values for SIGFPE signal. */ +enum +{ + FPE_INTDIV = 1, /* Integer divide by zero. */ +# define FPE_INTDIV FPE_INTDIV + FPE_INTOVF, /* Integer overflow. */ +# define FPE_INTOVF FPE_INTOVF + FPE_FLTDIV, /* Floating point divide by zero. */ +# define FPE_FLTDIV FPE_FLTDIV + FPE_FLTOVF, /* Floating point overflow. */ +# define FPE_FLTOVF FPE_FLTOVF + FPE_FLTUND, /* Floating point underflow. */ +# define FPE_FLTUND FPE_FLTUND + FPE_FLTRES, /* Floating point inexact result. */ +# define FPE_FLTRES FPE_FLTRES + FPE_FLTINV, /* Floating point invalid operation. */ +# define FPE_FLTINV FPE_FLTINV + FPE_FLTSUB /* Subscript out of range. */ +# define FPE_FLTSUB FPE_FLTSUB +}; + +/* `si_code' values for SIGSEGV signal. */ +enum +{ + SEGV_MAPERR = 1, /* Address not mapped to object. */ +# define SEGV_MAPERR SEGV_MAPERR + SEGV_ACCERR /* Invalid permissions for mapped object. */ +# define SEGV_ACCERR SEGV_ACCERR +}; + +/* `si_code' values for SIGBUS signal. */ +enum +{ + BUS_ADRALN = 1, /* Invalid address alignment. */ +# define BUS_ADRALN BUS_ADRALN + BUS_ADRERR, /* Non-existant physical address. */ +# define BUS_ADRERR BUS_ADRERR + BUS_OBJERR /* Object specific hardware error. */ +# define BUS_OBJERR BUS_OBJERR +}; +# endif + +# ifdef __USE_XOPEN_EXTENDED +/* `si_code' values for SIGTRAP signal. */ +enum +{ + TRAP_BRKPT = 1, /* Process breakpoint. */ +# define TRAP_BRKPT TRAP_BRKPT + TRAP_TRACE /* Process trace trap. */ +# define TRAP_TRACE TRAP_TRACE +}; +# endif + +# if defined __USE_XOPEN_EXTENDED || defined __USE_XOPEN2K8 +/* `si_code' values for SIGCHLD signal. */ +enum +{ + CLD_EXITED = 1, /* Child has exited. */ +# define CLD_EXITED CLD_EXITED + CLD_KILLED, /* Child was killed. */ +# define CLD_KILLED CLD_KILLED + CLD_DUMPED, /* Child terminated abnormally. */ +# define CLD_DUMPED CLD_DUMPED + CLD_TRAPPED, /* Traced child has trapped. */ +# define CLD_TRAPPED CLD_TRAPPED + CLD_STOPPED, /* Child has stopped. */ +# define CLD_STOPPED CLD_STOPPED + CLD_CONTINUED /* Stopped child has continued. */ +# define CLD_CONTINUED CLD_CONTINUED +}; + +/* `si_code' values for SIGPOLL signal. */ +enum +{ + POLL_IN = 1, /* Data input available. */ +# define POLL_IN POLL_IN + POLL_OUT, /* Output buffers available. */ +# define POLL_OUT POLL_OUT + POLL_MSG, /* Input message available. */ +# define POLL_MSG POLL_MSG + POLL_ERR, /* I/O error. */ +# define POLL_ERR POLL_ERR + POLL_PRI, /* High priority input available. */ +# define POLL_PRI POLL_PRI + POLL_HUP /* Device disconnected. */ +# define POLL_HUP POLL_HUP +}; +# endif + +#endif diff --git a/bits/siginfo.h b/bits/siginfo.h deleted file mode 100644 index 4919df5436..0000000000 --- a/bits/siginfo.h +++ /dev/null @@ -1,216 +0,0 @@ -/* siginfo_t, sigevent and constants. Stub version. - Copyright (C) 1997-2017 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 Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, see - . */ - -#if !defined _SIGNAL_H && !defined __need_siginfo_t \ - && !defined __need_sigevent_t -# error "Never include this file directly. Use instead" -#endif - -#if (!defined __have_sigval_t \ - && (defined _SIGNAL_H || defined __need_siginfo_t \ - || defined __need_sigevent_t)) -# define __have_sigval_t 1 - -/* Type for data associated with a signal. */ -typedef union sigval - { - int sival_int; - void *sival_ptr; - } sigval_t; -#endif - -#if (!defined __have_siginfo_t \ - && (defined _SIGNAL_H || defined __need_siginfo_t)) -# define __have_siginfo_t 1 - -typedef struct siginfo - { - int si_signo; /* Signal number. */ - int si_errno; /* If non-zero, an errno value associated with - this signal, as defined in . */ - int si_code; /* Signal code. */ - __pid_t si_pid; /* Sending process ID. */ - __uid_t si_uid; /* Real user ID of sending process. */ - void *si_addr; /* Address of faulting instruction. */ - int si_status; /* Exit value or signal. */ - long int si_band; /* Band event for SIGPOLL. */ - union sigval si_value; /* Signal value. */ - } siginfo_t; - - -/* Values for `si_code'. Positive values are reserved for kernel-generated - signals. */ -enum -{ - SI_ASYNCIO = -4, /* Sent by AIO completion. */ -# define SI_ASYNCIO SI_ASYNCIO - SI_MESGQ, /* Sent by real time mesq state change. */ -# define SI_MESGQ SI_MESGQ - SI_TIMER, /* Sent by timer expiration. */ -# define SI_TIMER SI_TIMER - SI_QUEUE, /* Sent by sigqueue. */ -# define SI_QUEUE SI_QUEUE - SI_USER /* Sent by kill, sigsend, raise. */ -# define SI_USER SI_USER -}; - - -# if defined __USE_XOPEN_EXTENDED || defined __USE_XOPEN2K8 -/* `si_code' values for SIGILL signal. */ -enum -{ - ILL_ILLOPC = 1, /* Illegal opcode. */ -# define ILL_ILLOPC ILL_ILLOPC - ILL_ILLOPN, /* Illegal operand. */ -# define ILL_ILLOPN ILL_ILLOPN - ILL_ILLADR, /* Illegal addressing mode. */ -# define ILL_ILLADR ILL_ILLADR - ILL_ILLTRP, /* Illegal trap. */ -# define ILL_ILLTRP ILL_ILLTRP - ILL_PRVOPC, /* Privileged opcode. */ -# define ILL_PRVOPC ILL_PRVOPC - ILL_PRVREG, /* Privileged register. */ -# define ILL_PRVREG ILL_PRVREG - ILL_COPROC, /* Coprocessor error. */ -# define ILL_COPROC ILL_COPROC - ILL_BADSTK /* Internal stack error. */ -# define ILL_BADSTK ILL_BADSTK -}; - -/* `si_code' values for SIGFPE signal. */ -enum -{ - FPE_INTDIV = 1, /* Integer divide by zero. */ -# define FPE_INTDIV FPE_INTDIV - FPE_INTOVF, /* Integer overflow. */ -# define FPE_INTOVF FPE_INTOVF - FPE_FLTDIV, /* Floating point divide by zero. */ -# define FPE_FLTDIV FPE_FLTDIV - FPE_FLTOVF, /* Floating point overflow. */ -# define FPE_FLTOVF FPE_FLTOVF - FPE_FLTUND, /* Floating point underflow. */ -# define FPE_FLTUND FPE_FLTUND - FPE_FLTRES, /* Floating point inexact result. */ -# define FPE_FLTRES FPE_FLTRES - FPE_FLTINV, /* Floating point invalid operation. */ -# define FPE_FLTINV FPE_FLTINV - FPE_FLTSUB /* Subscript out of range. */ -# define FPE_FLTSUB FPE_FLTSUB -}; - -/* `si_code' values for SIGSEGV signal. */ -enum -{ - SEGV_MAPERR = 1, /* Address not mapped to object. */ -# define SEGV_MAPERR SEGV_MAPERR - SEGV_ACCERR /* Invalid permissions for mapped object. */ -# define SEGV_ACCERR SEGV_ACCERR -}; - -/* `si_code' values for SIGBUS signal. */ -enum -{ - BUS_ADRALN = 1, /* Invalid address alignment. */ -# define BUS_ADRALN BUS_ADRALN - BUS_ADRERR, /* Non-existant physical address. */ -# define BUS_ADRERR BUS_ADRERR - BUS_OBJERR /* Object specific hardware error. */ -# define BUS_OBJERR BUS_OBJERR -}; -# endif - -# ifdef __USE_XOPEN_EXTENDED -/* `si_code' values for SIGTRAP signal. */ -enum -{ - TRAP_BRKPT = 1, /* Process breakpoint. */ -# define TRAP_BRKPT TRAP_BRKPT - TRAP_TRACE /* Process trace trap. */ -# define TRAP_TRACE TRAP_TRACE -}; -# endif - -# if defined __USE_XOPEN_EXTENDED || defined __USE_XOPEN2K8 -/* `si_code' values for SIGCHLD signal. */ -enum -{ - CLD_EXITED = 1, /* Child has exited. */ -# define CLD_EXITED CLD_EXITED - CLD_KILLED, /* Child was killed. */ -# define CLD_KILLED CLD_KILLED - CLD_DUMPED, /* Child terminated abnormally. */ -# define CLD_DUMPED CLD_DUMPED - CLD_TRAPPED, /* Traced child has trapped. */ -# define CLD_TRAPPED CLD_TRAPPED - CLD_STOPPED, /* Child has stopped. */ -# define CLD_STOPPED CLD_STOPPED - CLD_CONTINUED /* Stopped child has continued. */ -# define CLD_CONTINUED CLD_CONTINUED -}; - -/* `si_code' values for SIGPOLL signal. */ -enum -{ - POLL_IN = 1, /* Data input available. */ -# define POLL_IN POLL_IN - POLL_OUT, /* Output buffers available. */ -# define POLL_OUT POLL_OUT - POLL_MSG, /* Input message available. */ -# define POLL_MSG POLL_MSG - POLL_ERR, /* I/O error. */ -# define POLL_ERR POLL_ERR - POLL_PRI, /* High priority input available. */ -# define POLL_PRI POLL_PRI - POLL_HUP /* Device disconnected. */ -# define POLL_HUP POLL_HUP -}; -# endif - -# undef __need_siginfo_t -#endif /* !have siginfo_t && (have _SIGNAL_H || need siginfo_t). */ - - -#if (defined _SIGNAL_H || defined __need_sigevent_t) \ - && !defined __have_sigevent_t -# define __have_sigevent_t 1 - -/* Structure to transport application-defined values with signals. */ -# define SIGEV_MAX_SIZE 64 -# define SIGEV_PAD_SIZE ((SIGEV_MAX_SIZE / sizeof (int)) - 3) - -typedef struct sigevent - { - sigval_t sigev_value; - int sigev_signo; - int sigev_notify; - void (*sigev_notify_function) (sigval_t); /* Function to start. */ - void *sigev_notify_attributes; /* Really pthread_attr_t.*/ - } sigevent_t; - -/* `sigev_notify' values. */ -enum -{ - SIGEV_SIGNAL = 0, /* Notify via signal. */ -# define SIGEV_SIGNAL SIGEV_SIGNAL - SIGEV_NONE, /* Other notification: meaningless. */ -# define SIGEV_NONE SIGEV_NONE - SIGEV_THREAD /* Deliver via thread creation. */ -# define SIGEV_THREAD SIGEV_THREAD -}; - -#endif /* have _SIGNAL_H. */ diff --git a/bits/sigset.h b/bits/sigset.h deleted file mode 100644 index 4099cc703f..0000000000 --- a/bits/sigset.h +++ /dev/null @@ -1,84 +0,0 @@ -/* __sig_atomic_t, __sigset_t, and related definitions. Generic/BSD version. - Copyright (C) 1991-2017 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 Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, see - . */ - -#ifndef _SIGSET_H_types -#define _SIGSET_H_types 1 - -typedef int __sig_atomic_t; - -/* A `sigset_t' has a bit for each signal. */ -typedef unsigned long int __sigset_t; - -#endif - - -/* We only want to define these functions if was actually - included; otherwise we were included just to define the types. Since we - are namespace-clean, it wouldn't hurt to define extra macros. But - trouble can be caused by functions being defined (e.g., any global - register vars declared later will cause compilation errors). */ - -#if !defined _SIGSET_H_fns && defined _SIGNAL_H -#define _SIGSET_H_fns 1 - -#ifndef _EXTERN_INLINE -# define _EXTERN_INLINE __extern_inline -#endif - -/* Return a mask that includes SIG only. The cast to `sigset_t' avoids - overflow if `sigset_t' is wider than `int'. */ -#define __sigmask(sig) (((__sigset_t) 1) << ((sig) - 1)) - -#define __sigemptyset(set) \ - (__extension__ ({ *(set) = (__sigset_t) 0; 0; }) -#define __sigfillset(set) \ - (__extension__ ({ *(set) = ~(__sigset_t) 0; 0; })) - -#ifdef _GNU_SOURCE -# define __sigisemptyset(set) (*(set) == (__sigset_t) 0) -# define __sigandset(dest, left, right) \ - (__extension__ ({ *(dest) = *(left) & *(right); 0; })) -# define __sigorset(dest, left, right) \ - (__extension__ ({ *(dest) = *(left) | *(right); 0; })) -#endif - -/* These functions needn't check for a bogus signal number -- error - checking is done in the non __ versions. */ - -extern int __sigismember (const __sigset_t *, int); -extern int __sigaddset (__sigset_t *, int); -extern int __sigdelset (__sigset_t *, int); - -#ifdef __USE_EXTERN_INLINES -# define __SIGSETFN(NAME, BODY, CONST) \ - _EXTERN_INLINE int \ - NAME (CONST __sigset_t *__set, int __sig) \ - { \ - __sigset_t __mask = __sigmask (__sig); \ - return BODY; \ - } - -__SIGSETFN (__sigismember, (*__set & __mask) ? 1 : 0, const) -__SIGSETFN (__sigaddset, ((*__set |= __mask), 0), ) -__SIGSETFN (__sigdelset, ((*__set &= ~__mask), 0), ) - -# undef __SIGSETFN -#endif - - -#endif /* ! _SIGSET_H_fns. */ diff --git a/bits/types/__sigset_t.h b/bits/types/__sigset_t.h new file mode 100644 index 0000000000..c90d760a6e --- /dev/null +++ b/bits/types/__sigset_t.h @@ -0,0 +1,7 @@ +#ifndef ____sigset_t_defined +#define ____sigset_t_defined 1 + +/* A `sigset_t' has a bit for each signal. */ +typedef unsigned long int __sigset_t; + +#endif diff --git a/bits/types/sigevent_t.h b/bits/types/sigevent_t.h new file mode 100644 index 0000000000..7b8cb054d7 --- /dev/null +++ b/bits/types/sigevent_t.h @@ -0,0 +1,17 @@ +#ifndef __sigevent_t_defined +#define __sigevent_t_defined 1 + +#include +#include + +/* Structure to transport application-defined values with signals. */ +typedef struct sigevent + { + sigval_t sigev_value; + int sigev_signo; + int sigev_notify; + void (*sigev_notify_function) (sigval_t); /* Function to start. */ + void *sigev_notify_attributes; /* Really pthread_attr_t.*/ + } sigevent_t; + +#endif diff --git a/bits/types/siginfo_t.h b/bits/types/siginfo_t.h new file mode 100644 index 0000000000..ab6bf18bec --- /dev/null +++ b/bits/types/siginfo_t.h @@ -0,0 +1,21 @@ +#ifndef __siginfo_t_defined +#define __siginfo_t_defined 1 + +#include +#include + +typedef struct siginfo + { + int si_signo; /* Signal number. */ + int si_errno; /* If non-zero, an errno value associated with + this signal, as defined in . */ + int si_code; /* Signal code. */ + __pid_t si_pid; /* Sending process ID. */ + __uid_t si_uid; /* Real user ID of sending process. */ + void *si_addr; /* Address of faulting instruction. */ + int si_status; /* Exit value or signal. */ + long int si_band; /* Band event for SIGPOLL. */ + sigval_t si_value; /* Signal value. */ + } siginfo_t; + +#endif diff --git a/include/bits/types/sig_atomic_t.h b/include/bits/types/sig_atomic_t.h new file mode 100644 index 0000000000..783693f71c --- /dev/null +++ b/include/bits/types/sig_atomic_t.h @@ -0,0 +1 @@ +#include diff --git a/include/bits/types/sigset_t.h b/include/bits/types/sigset_t.h new file mode 100644 index 0000000000..20c3dc2095 --- /dev/null +++ b/include/bits/types/sigset_t.h @@ -0,0 +1 @@ +#include diff --git a/include/bits/types/sigval_t.h b/include/bits/types/sigval_t.h new file mode 100644 index 0000000000..296734e827 --- /dev/null +++ b/include/bits/types/sigval_t.h @@ -0,0 +1 @@ +#include diff --git a/include/signal.h b/include/signal.h index 276a99d80a..e39ddc60b9 100644 --- a/include/signal.h +++ b/include/signal.h @@ -1,7 +1,4 @@ #ifndef _SIGNAL_H -#if defined __need_sig_atomic_t || defined __need_sigset_t -# include -#else # include # ifndef _ISOMAC @@ -53,12 +50,6 @@ libc_hidden_proto (__libc_sigaction) extern int __default_sigpause (int mask); extern int __xpg_sigpause (int sig); -/* Simplified sigemptyset() implementation without the parameter checking. */ -#undef __sigemptyset -#define __sigemptyset(ss) \ - ({ __builtin_memset (ss, '\0', sizeof (sigset_t)); 0; }) - - /* Allocate real-time signal with highest/lowest available priority. */ extern int __libc_allocate_rtsig (int __high); @@ -66,6 +57,6 @@ extern int __libc_allocate_rtsig (int __high); extern __typeof (__sigaction) __sigaction attribute_hidden; extern __typeof (__libc_sigaction) __libc_sigaction attribute_hidden; # endif -# endif -#endif -#endif + +# endif /* _ISOMAC */ +#endif /* signal.h */ diff --git a/inet/rcmd.c b/inet/rcmd.c index c285b9ecd6..e970123a9a 100644 --- a/inet/rcmd.c +++ b/inet/rcmd.c @@ -78,6 +78,7 @@ #include #include #include +#include int __ivaliduser (FILE *, u_int32_t, const char *, const char *); @@ -112,7 +113,8 @@ rcmd_af (char **ahost, u_short rport, const char *locuser, const char *remuser, struct sockaddr_in6 sin6; } from; struct pollfd pfd[2]; - int32_t oldmask; + sigset_t mask, omask; + pid_t pid; int s, lport, timo, error; char c; @@ -160,7 +162,9 @@ rcmd_af (char **ahost, u_short rport, const char *locuser, const char *remuser, *ahost = NULL; ai = res; refused = 0; - oldmask = __sigblock(sigmask(SIGURG)); + __sigemptyset(&mask); + __sigaddset(&mask, SIGURG); + __sigprocmask (SIG_BLOCK, &mask, &omask); for (timo = 1, lport = IPPORT_RESERVED - 1;;) { char errbuf[200]; @@ -172,7 +176,7 @@ rcmd: socket: All ports in use\n")); else __fxprintf(NULL, "rcmd: socket: %m\n"); - __sigsetmask(oldmask); + __sigprocmask (SIG_SETMASK, &omask, 0); freeaddrinfo(res); return -1; } @@ -225,7 +229,7 @@ rcmd: socket: All ports in use\n")); freeaddrinfo(res); (void)__fxprintf(NULL, "%s: %s\n", *ahost, __strerror_r(errno, errbuf, sizeof (errbuf))); - __sigsetmask(oldmask); + __sigprocmask (SIG_SETMASK, &omask, 0); return -1; } lport--; @@ -337,7 +341,7 @@ socket: protocol failure in circuit setup\n")) >= 0) } goto bad2; } - __sigsetmask(oldmask); + __sigprocmask (SIG_SETMASK, &omask, 0); freeaddrinfo(res); return s; bad2: @@ -345,7 +349,7 @@ bad2: (void)__close(*fd2p); bad: (void)__close(s); - __sigsetmask(oldmask); + __sigprocmask (SIG_SETMASK, &omask, 0); freeaddrinfo(res); return -1; } diff --git a/io/sys/poll.h b/io/sys/poll.h index 7356fb9ea5..e34c2db5a9 100644 --- a/io/sys/poll.h +++ b/io/sys/poll.h @@ -24,10 +24,8 @@ /* Get the platform dependent bits of `poll'. */ #include #ifdef __USE_GNU -/* Get the __sigset_t definition. */ -# include -/* Get the timespec definition. */ -#include +# include +# include #endif diff --git a/login/utmp_file.c b/login/utmp_file.c index 6ebe1ef123..240e0e3c10 100644 --- a/login/utmp_file.c +++ b/login/utmp_file.c @@ -28,6 +28,7 @@ #include #include #include +#include #include "utmp-private.h" #include "utmp-equal.h" diff --git a/misc/sys/select.h b/misc/sys/select.h index e27fb44af8..06dd31b476 100644 --- a/misc/sys/select.h +++ b/misc/sys/select.h @@ -29,13 +29,8 @@ /* Get __FD_* definitions. */ #include -/* Get __sigset_t. */ -#include - -#ifndef __sigset_t_defined -# define __sigset_t_defined -typedef __sigset_t sigset_t; -#endif +/* Get sigset_t. */ +#include /* Get definition of timer specification structures. */ #include diff --git a/posix/bits/types.h b/posix/bits/types.h index 7638bd044d..e2f73a89e4 100644 --- a/posix/bits/types.h +++ b/posix/bits/types.h @@ -197,6 +197,10 @@ __STD_TYPE __SWORD_TYPE __intptr_t; /* Duplicate info from sys/socket.h. */ __STD_TYPE __U32_TYPE __socklen_t; +/* C99: An integer type that can be accessed as an atomic entity, + even in the presence of asynchronous interrupts. + It is not currently necessary for this to be machine-specific. */ +typedef int __sig_atomic_t; #undef __STD_TYPE diff --git a/posix/spawn.h b/posix/spawn.h index a1154a3cdf..2fa5f547c7 100644 --- a/posix/spawn.h +++ b/posix/spawn.h @@ -21,9 +21,8 @@ #include #include -#define __need_sigset_t -#include #include +#include /* Data structure to contain attributes for thread creation. */ diff --git a/posix/sys/wait.h b/posix/sys/wait.h index 897bfaed6f..d5b7e4d8d4 100644 --- a/posix/sys/wait.h +++ b/posix/sys/wait.h @@ -103,8 +103,7 @@ typedef __id_t id_t; # define __id_t_defined # endif -# define __need_siginfo_t -# include +# include /* Wait for a childing matching IDTYPE and ID to change the status and place appropriate information in *INFOP. diff --git a/resolv/netdb.h b/resolv/netdb.h index 936fab95ed..f76ccf123e 100644 --- a/resolv/netdb.h +++ b/resolv/netdb.h @@ -33,8 +33,7 @@ #endif #ifdef __USE_GNU -# define __need_sigevent_t -# include +# include # include #endif diff --git a/rt/aio.h b/rt/aio.h index 5647e521f5..d72ad5d97d 100644 --- a/rt/aio.h +++ b/rt/aio.h @@ -24,8 +24,8 @@ #include #include -#define __need_sigevent_t -#include +#include +#include #include __BEGIN_DECLS diff --git a/rt/mqueue.h b/rt/mqueue.h index d65871e3c2..c79aa53b94 100644 --- a/rt/mqueue.h +++ b/rt/mqueue.h @@ -21,8 +21,7 @@ #include #include #include -#define __need_sigevent_t -#include +#include #include /* Get the definition of mqd_t and struct mq_attr. */ #include diff --git a/setjmp/setjmp.h b/setjmp/setjmp.h index e10adaf1fc..86fb2edf6c 100644 --- a/setjmp/setjmp.h +++ b/setjmp/setjmp.h @@ -27,8 +27,7 @@ __BEGIN_DECLS #include /* Get `__jmp_buf'. */ -#include /* Get `__sigset_t'. */ - +#include /* Calling environment, plus possibly a saved signal mask. */ struct __jmp_buf_tag diff --git a/shadow/lckpwdf.c b/shadow/lckpwdf.c index 09427eb233..15602efb68 100644 --- a/shadow/lckpwdf.c +++ b/shadow/lckpwdf.c @@ -24,6 +24,7 @@ #include #include #include +#include #include diff --git a/signal/Makefile b/signal/Makefile index 077aaea6ad..de92558f2c 100644 --- a/signal/Makefile +++ b/signal/Makefile @@ -22,10 +22,14 @@ subdir := signal include ../Makeconfig -headers := signal.h sys/signal.h bits/signum.h bits/sigcontext.h \ - bits/sigaction.h bits/sigset.h bits/siginfo.h bits/sigstack.h \ - bits/sigthread.h bits/types/struct_sigstack.h bits/types/stack_t.h \ - bits/ss_flags.h +headers := signal.h sys/signal.h \ + bits/signum.h bits/sigcontext.h bits/sigaction.h \ + bits/sigevent-consts.h bits/siginfo-consts.h \ + bits/sigstack.h bits/sigthread.h bits/ss_flags.h \ + bits/types/__sigset_t.h bits/types/sig_atomic_t.h \ + bits/types/sigevent_t.h bits/types/siginfo_t.h \ + bits/types/sigset_t.h bits/types/stack_t.h \ + bits/types/struct_sigstack.h routines := signal raise killpg \ sigaction sigprocmask kill \ diff --git a/signal/Versions b/signal/Versions index 4d86930ec6..a915ef400f 100644 --- a/signal/Versions +++ b/signal/Versions @@ -1,13 +1,13 @@ libc { GLIBC_2.0 { # functions with special/multiple interfaces - __sigaddset; __sigdelset; __sigismember; __sysv_signal; + __sigpause; __sysv_signal; - # functions used in inline functions or macros - __sigpause; + # functions formerly used in inline functions or macros + __sigaddset; __sigdelset; __sigismember; # functions used in other libraries - __sigaction; + __sigaction; # b* bsd_signal; diff --git a/signal/bits/types/sig_atomic_t.h b/signal/bits/types/sig_atomic_t.h new file mode 100644 index 0000000000..47eaa28311 --- /dev/null +++ b/signal/bits/types/sig_atomic_t.h @@ -0,0 +1,10 @@ +#ifndef __sig_atomic_t_defined +#define __sig_atomic_t_defined 1 + +#include + +/* An integral type that can be modified atomically, without the + possibility of a signal arriving in the middle of the operation. */ +typedef __sig_atomic_t sig_atomic_t; + +#endif diff --git a/signal/bits/types/sigset_t.h b/signal/bits/types/sigset_t.h new file mode 100644 index 0000000000..8b27e9112d --- /dev/null +++ b/signal/bits/types/sigset_t.h @@ -0,0 +1,9 @@ +#ifndef __sigset_t_defined +#define __sigset_t_defined 1 + +#include + +/* A set of signals to be blocked, unblocked, or waited for. */ +typedef __sigset_t sigset_t; + +#endif diff --git a/signal/bits/types/sigval_t.h b/signal/bits/types/sigval_t.h new file mode 100644 index 0000000000..666598f0ca --- /dev/null +++ b/signal/bits/types/sigval_t.h @@ -0,0 +1,13 @@ +#ifndef __sigval_t_defined +#define __sigval_t_defined + +/* Type for data associated with a signal. */ +union sigval +{ + int sival_int; + void *sival_ptr; +}; + +typedef union sigval sigval_t; + +#endif diff --git a/signal/sigaddset.c b/signal/sigaddset.c index ca280d8e76..161be7b352 100644 --- a/signal/sigaddset.c +++ b/signal/sigaddset.c @@ -15,7 +15,9 @@ License along with the GNU C Library; if not, see . */ -#include "sigsetops.h" +#include +#include +#include /* Add SIGNO to SET. */ int @@ -27,6 +29,7 @@ sigaddset (sigset_t *set, int signo) return -1; } - return __sigaddset (set, signo); + __sigaddset (set, signo); + return 0; } libc_hidden_def (sigaddset) diff --git a/signal/sigandset.c b/signal/sigandset.c index f81a5939ee..ffea141c63 100644 --- a/signal/sigandset.c +++ b/signal/sigandset.c @@ -17,18 +17,18 @@ #include #include -#define __need_NULL -#include +#include /* Combine sets LEFT and RIGHT by logical AND and place result in DEST. */ int sigandset (sigset_t *dest, const sigset_t *left, const sigset_t *right) { - if (dest == NULL || left == NULL || right == NULL) + if (!dest || !left || !right) { __set_errno (EINVAL); return -1; } - return __sigandset (dest, left, right); + __sigandset (dest, left, right); + return 0; } diff --git a/signal/sigdelset.c b/signal/sigdelset.c index 4632103b22..2aaa536937 100644 --- a/signal/sigdelset.c +++ b/signal/sigdelset.c @@ -15,7 +15,9 @@ License along with the GNU C Library; if not, see . */ -#include "sigsetops.h" +#include +#include +#include /* Add SIGNO to SET. */ int @@ -27,6 +29,7 @@ sigdelset (sigset_t *set, int signo) return -1; } - return __sigdelset (set, signo); + __sigdelset (set, signo); + return 0; } libc_hidden_def (sigdelset) diff --git a/signal/sigisempty.c b/signal/sigisempty.c index eabe71ce6b..bea03f1216 100644 --- a/signal/sigisempty.c +++ b/signal/sigisempty.c @@ -17,18 +17,17 @@ #include #include -#define __need_NULL -#include +#include /* Test whether SET is empty. */ int sigisemptyset (const sigset_t *set) { - if (set == NULL) + if (!set) { __set_errno (EINVAL); return -1; } - return __sigisemptyset (set); + return __sigisemptyset (set); } diff --git a/signal/sigismem.c b/signal/sigismem.c index 8da14ac26d..6ef4a4d19d 100644 --- a/signal/sigismem.c +++ b/signal/sigismem.c @@ -15,7 +15,9 @@ License along with the GNU C Library; if not, see . */ -#include "sigsetops.h" +#include +#include +#include /* Return 1 if SIGNO is in SET, 0 if not. */ int diff --git a/signal/signal.h b/signal/signal.h index d01df3290a..a51e912d08 100644 --- a/signal/signal.h +++ b/signal/signal.h @@ -20,40 +20,21 @@ */ #ifndef _SIGNAL_H - -#if !defined __need_sig_atomic_t && !defined __need_sigset_t -# define _SIGNAL_H -#endif +#define _SIGNAL_H #include __BEGIN_DECLS -#include /* __sigset_t, __sig_atomic_t. */ +#include +#include -/* An integral type that can be modified atomically, without the - possibility of a signal arriving in the middle of the operation. */ -#if defined __need_sig_atomic_t || defined _SIGNAL_H -# ifndef __sig_atomic_t_defined -# define __sig_atomic_t_defined -typedef __sig_atomic_t sig_atomic_t; -# endif -# undef __need_sig_atomic_t -#endif +#include -#if defined __need_sigset_t || (defined _SIGNAL_H && defined __USE_POSIX) -# ifndef __sigset_t_defined -# define __sigset_t_defined -typedef __sigset_t sigset_t; -# endif -# undef __need_sigset_t +#if defined __USE_POSIX +#include #endif -#ifdef _SIGNAL_H - -#include -#include - #if defined __USE_XOPEN || defined __USE_XOPEN2K # ifndef __pid_t_defined typedef __pid_t pid_t; @@ -73,8 +54,10 @@ typedef __uid_t uid_t; #endif #if defined __USE_POSIX199309 || defined __USE_XOPEN_EXTENDED -/* Get the `siginfo_t' type plus the needed symbols. */ -# include +# include +# include +# include +# include #endif @@ -174,7 +157,7 @@ extern int __sigpause (int __sig_or_mask, int __is_sig); simply do not work in many situations. Use `sigprocmask' instead. */ /* Compute mask for signal SIG. */ -# define sigmask(sig) __sigmask(sig) +# define sigmask(sig) ((int)(1u << ((sig) - 1))) /* Block signals in MASK, returning the old mask. */ extern int sigblock (int __mask) __THROW __attribute_deprecated__; @@ -366,8 +349,6 @@ extern int __libc_current_sigrtmin (void) __THROW; /* Return number of available real-time signal with lowest priority. */ extern int __libc_current_sigrtmax (void) __THROW; -#endif /* signal.h */ - __END_DECLS #endif /* not signal.h */ diff --git a/signal/sigorset.c b/signal/sigorset.c index 9ea867d79d..8a586db6b5 100644 --- a/signal/sigorset.c +++ b/signal/sigorset.c @@ -17,18 +17,18 @@ #include #include -#define __need_NULL -#include +#include /* Combine sets LEFT and RIGHT by logical OR and place result in DEST. */ int sigorset (sigset_t *dest, const sigset_t *left, const sigset_t *right) { - if (dest == NULL || left == NULL || right == NULL) + if (!dest || !left || !right) { __set_errno (EINVAL); return -1; } - return __sigorset (dest, left, right); + __sigorset (dest, left, right); + return 0; } diff --git a/signal/sigsetops.c b/signal/sigsetops.c index 0317662a14..d56412f94b 100644 --- a/signal/sigsetops.c +++ b/signal/sigsetops.c @@ -1,11 +1,53 @@ -/* Define the real-function versions of all inline functions - defined in signal.h (or bits/sigset.h). */ +/* Compatibility symbols for old versions of signal.h. + Copyright (C) 2017 Free Software Foundation, Inc. + This file is part of the GNU C Library. -#include + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. -#define _EXTERN_INLINE -#ifndef __USE_EXTERN_INLINES -# define __USE_EXTERN_INLINES 1 -#endif + 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#include +#include +#include + +/* These were formerly defined by as inline functions, + so they require out-of-line compatibility definitions. */ +#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_26) -#include "signal.h" +int +attribute_compat_text_section +(__sigismember) (const __sigset_t *set, int sig) +{ + return __sigismember (set, sig); +} +compat_symbol (libc, __sigismember, __sigismember, GLIBC_2_0); + +int +attribute_compat_text_section +(__sigaddset) (__sigset_t *set, int sig) +{ + __sigaddset (set, sig); + return 0; +} +compat_symbol (libc, __sigaddset, __sigaddset, GLIBC_2_0); + +int +attribute_compat_text_section +(__sigdelset) (__sigset_t *set, int sig) +{ + __sigdelset (set, sig); + return 0; +} +compat_symbol (libc, __sigdelset, __sigdelset, GLIBC_2_0); + +#endif diff --git a/signal/sigsetops.h b/signal/sigsetops.h deleted file mode 100644 index cd1282000e..0000000000 --- a/signal/sigsetops.h +++ /dev/null @@ -1,32 +0,0 @@ -/* Copyright (C) 1991-2017 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 Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, see - . */ - -/* Definitions relevant to functions that operate on `sigset_t's. */ - -#include -#include -#include - -#define BITS (_NSIG - 1) -#define ELT(signo) (((signo) - 1) / BITS) -#define MASK(signo) (1 << (((signo) - 1) % BITS)) - -#undef sigemptyset -#undef sigfillset -#undef sigaddset -#undef sigdelset -#undef sigismember diff --git a/socket/sys/socket.h b/socket/sys/socket.h index 7af41097bb..bbfde8f602 100644 --- a/socket/sys/socket.h +++ b/socket/sys/socket.h @@ -26,11 +26,6 @@ __BEGIN_DECLS #include #define __need_size_t #include -#ifdef __USE_GNU -/* Get the __sigset_t definition. */ -# include -#endif - /* This operating system-specific header file defines the SOCK_*, PF_*, AF_*, MSG_*, SOL_*, and SO_* constants, and the `struct sockaddr', diff --git a/stdlib/abort.c b/stdlib/abort.c index d30de0b02c..19882f3e3d 100644 --- a/stdlib/abort.c +++ b/stdlib/abort.c @@ -21,6 +21,7 @@ #include #include #include +#include /* Try to get a machine dependent instruction which will make the program crash. This is used in case everything else fails. */ @@ -57,13 +58,13 @@ abort (void) /* Now it's for sure we are alone. But recursive calls are possible. */ - /* Unlock SIGABRT. */ + /* Unblock SIGABRT. */ if (stage == 0) { ++stage; - if (__sigemptyset (&sigs) == 0 && - __sigaddset (&sigs, SIGABRT) == 0) - __sigprocmask (SIG_UNBLOCK, &sigs, (sigset_t *) NULL); + __sigemptyset (&sigs); + __sigaddset (&sigs, SIGABRT); + __sigprocmask (SIG_UNBLOCK, &sigs, 0); } /* Flush all streams. We cannot close them now because the user diff --git a/sysdeps/arm/sys/ucontext.h b/sysdeps/arm/sys/ucontext.h index 49d60395dd..bbfeb20bb5 100644 --- a/sysdeps/arm/sys/ucontext.h +++ b/sysdeps/arm/sys/ucontext.h @@ -25,6 +25,7 @@ /* We need the signal context definitions even if they are not exposed by . */ +#include #include #include #include diff --git a/sysdeps/generic/sigsetops.h b/sysdeps/generic/sigsetops.h new file mode 100644 index 0000000000..e8e5553981 --- /dev/null +++ b/sysdeps/generic/sigsetops.h @@ -0,0 +1,77 @@ +/* __sigset_t manipulators. Generic/BSD version. + Copyright (C) 1991-2017 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 Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#ifndef _SIGSETOPS_H +#define _SIGSETOPS_H 1 + +#include + +/* Return a mask that includes SIG only. The cast to `sigset_t' avoids + overflow if `sigset_t' is wider than `int'. */ +# define __sigmask(sig) (((__sigset_t) 1) << ((sig) - 1)) + +#define __sigemptyset(set) \ + (__extension__ ({ \ + *(set) = (__sigset_t) 0; \ + (void)0; \ + })) +#define __sigfillset(set) \ + (__extension__ ({ \ + *(set) = ~(__sigset_t) 0; \ + (void)0; \ + })) + +# define __sigisemptyset(set) \ + (*(set) == (__sigset_t) 0) + +# define __sigandset(dest, left, right) \ + (__extension__ ({ \ + *(dest) = *(left) & *(right); \ + (void)0; \ + })) + +# define __sigorset(dest, left, right) \ + (__extension__ ({ \ + *(dest) = *(left) | *(right); \ + (void)0; \ + })) +#endif + +/* These macros needn't check for a bogus signal number; + checking is done in the non-__ versions. */ +# define __sigismember(set, sig) \ + (__extension__ ({ \ + __sigset_t __mask = __sigmask (sig); \ + (set) & __mask ? 1 : 0; \ + })) + +# define __sigaddset(set, sig) \ + (__extension__ ({ \ + __sigset_t __mask = __sigmask (sig); \ + (set) |= __mask; \ + (void)0; \ + })) + +# define __sigdelset(set, sig) \ + (__extension__ ({ \ + __sigset_t __mask = __sigmask (sig); \ + (set) &= ~__mask; \ + (void)0; \ + })) + +#endif diff --git a/sysdeps/generic/sys/ucontext.h b/sysdeps/generic/sys/ucontext.h index 052c5401cb..a0602a7ad3 100644 --- a/sysdeps/generic/sys/ucontext.h +++ b/sysdeps/generic/sys/ucontext.h @@ -27,6 +27,7 @@ /* We need the signal context definitions even if they are not exposed by . */ +#include #include #include #include diff --git a/sysdeps/i386/sys/ucontext.h b/sysdeps/i386/sys/ucontext.h index 241f270a99..92deea92ea 100644 --- a/sysdeps/i386/sys/ucontext.h +++ b/sysdeps/i386/sys/ucontext.h @@ -25,6 +25,7 @@ /* We need the signal context definitions even if they are not exposed by . */ +#include #include #include #include diff --git a/sysdeps/m68k/sys/ucontext.h b/sysdeps/m68k/sys/ucontext.h index 4e5ec3b090..4f185ce63f 100644 --- a/sysdeps/m68k/sys/ucontext.h +++ b/sysdeps/m68k/sys/ucontext.h @@ -25,6 +25,7 @@ /* We need the signal context definitions even if they are not exposed by . */ +#include #include #include #include diff --git a/sysdeps/mach/hurd/i386/bits/sigcontext.h b/sysdeps/mach/hurd/i386/bits/sigcontext.h index 286b80efbd..3d5a6736aa 100644 --- a/sysdeps/mach/hurd/i386/bits/sigcontext.h +++ b/sysdeps/mach/hurd/i386/bits/sigcontext.h @@ -26,6 +26,7 @@ /* Signal handlers are actually called: void handler (int sig, int code, struct sigcontext *scp); */ +#include #include /* State of this thread when the signal was taken. */ diff --git a/sysdeps/mips/sys/ucontext.h b/sysdeps/mips/sys/ucontext.h index cb8fbcd3d2..9c6f8f8221 100644 --- a/sysdeps/mips/sys/ucontext.h +++ b/sysdeps/mips/sys/ucontext.h @@ -25,6 +25,7 @@ /* We need the signal context definitions even if they are not exposed by . */ +#include #include #include #include diff --git a/sysdeps/posix/profil.c b/sysdeps/posix/profil.c index f5b8ee19fc..4d3fbe0b8a 100644 --- a/sysdeps/posix/profil.c +++ b/sysdeps/posix/profil.c @@ -22,6 +22,7 @@ #include #include #include +#include #ifndef SIGPROF diff --git a/sysdeps/posix/sigignore.c b/sysdeps/posix/sigignore.c index e7975739e8..601ae9685a 100644 --- a/sysdeps/posix/sigignore.c +++ b/sysdeps/posix/sigignore.c @@ -22,7 +22,7 @@ #include #include #include /* For the real memset prototype. */ - +#include int sigignore (int sig) @@ -30,8 +30,7 @@ sigignore (int sig) struct sigaction act; act.sa_handler = SIG_IGN; - if (__sigemptyset (&ac