about summary refs log tree commit diff
path: root/signal
diff options
context:
space:
mode:
Diffstat (limited to 'signal')
-rw-r--r--signal/Makefile8
-rw-r--r--signal/gsignal.c28
-rw-r--r--signal/signal.h54
-rw-r--r--signal/ssignal.c29
4 files changed, 37 insertions, 82 deletions
diff --git a/signal/Makefile b/signal/Makefile
index d3337385c9..eac9576895 100644
--- a/signal/Makefile
+++ b/signal/Makefile
@@ -12,9 +12,9 @@
 # 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., 675 Mass Ave,
-# Cambridge, MA 02139, USA.
+# 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.
 
 #
 #	Makefile for signal routines.
@@ -30,7 +30,7 @@ routines	:= signal raise killpg \
 		   sigstack sigaltstack sigintr \
 		   sigsetops sigempty sigfillset sigaddset sigdelset sigismem \
 		   sigreturn \
-		   gsignal ssignal siggetmask
+		   siggetmask bsd_signal
 
 tests		:= tst-signal
 
diff --git a/signal/gsignal.c b/signal/gsignal.c
deleted file mode 100644
index f5b79a991d..0000000000
--- a/signal/gsignal.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Copyright (C) 1991, 1995 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., 675 Mass Ave,
-Cambridge, MA 02139, USA.  */
-
-#include <signal.h>
-
-#undef	gsignal
-
-int
-gsignal (sig)
-     int sig;
-{
-  return raise (sig);
-}
diff --git a/signal/signal.h b/signal/signal.h
index 7b3c26094c..66ab3dd09a 100644
--- a/signal/signal.h
+++ b/signal/signal.h
@@ -22,7 +22,7 @@
 
 #ifndef	_SIGNAL_H
 
-#if	!defined(__need_sig_atomic_t) && !defined(__need_sigset_t)
+#if !defined __need_sig_atomic_t && !defined __need_sigset_t
 #define	_SIGNAL_H	1
 #include <features.h>
 #endif
@@ -32,15 +32,15 @@ __BEGIN_DECLS
 #include <gnu/types.h>
 #include <sigset.h>		/* __sigset_t, __sig_atomic_t.  */
 
-#if	!defined(__sig_atomic_t_defined) &&	\
-  (defined(_SIGNAL_H) || defined(__need_sig_atomic_t))
+#if !defined __sig_atomic_t_defined \
+    && (defined _SIGNAL_H || defined __need_sig_atomic_t)
 /* 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 /* `sig_atomic_t' undefined and <signal.h> or need `sig_atomic_t'.  */
-#undef	__need_sig_atomic_t
+#undef __need_sig_atomic_t
 
-#ifdef	_SIGNAL_H
+#ifdef _SIGNAL_H
 
 #include <signum.h>
 
@@ -51,15 +51,27 @@ typedef void (*__sighandler_t) __P ((int));
    returning the old handler, or SIG_ERR on error.  */
 extern __sighandler_t signal __P ((int __sig, __sighandler_t __handler));
 
+#if defined __FAVOR_BSD || defined __USE_XOPEN
+/* The X/Open definition of `signal' conflicts with the BSD version.
+   So they defined another function `bsd_signal'.  We will use this
+   implementation as the official `signal' function if the BSD
+   interface is preferred.  */
+extern __sighandler_t bsd_signal __P ((int __sig, __sighandler_t __handler));
+
+#ifdef __FAVOR_BSD
+#define signal(sig, handler) bsd_signal ((sig), (handler))
+#endif
+#endif
+
 /* Send signal SIG to process number PID.  If PID is zero,
    send SIG to all processes in the current process's process group.
    If PID is < -1, send SIG to all processes in process group - PID.  */
 extern int __kill __P ((__pid_t __pid, int __sig));
-#ifdef	__USE_POSIX
+#ifdef __USE_POSIX
 extern int kill __P ((__pid_t __pid, int __sig));
 #endif /* Use POSIX.  */
 
-#if defined(__USE_BSD) || defined(__USE_XOPEN_EXTENDED)
+#if defined __USE_BSD || defined __USE_XOPEN_EXTENDED
 /* Send SIG to all processes in process group PGRP.
    If PGRP is zero, send SIG to all processes in
    the current process's process group.  */
@@ -69,13 +81,13 @@ extern int killpg __P ((__pid_t __pgrp, int __sig));
 /* Raise signal SIG, i.e., send SIG to yourself.  */
 extern int raise __P ((int __sig));
 
-#ifdef	__USE_SVID
+#ifdef __USE_SVID
 /* SVID names for the same things.  */
 extern __sighandler_t ssignal __P ((int __sig, __sighandler_t __handler));
 extern int gsignal __P ((int __sig));
 #endif /* Use SVID.  */
 
-#ifdef	__USE_MISC
+#ifdef __USE_MISC
 /* Print a message describing the meaning of the given signal number.  */
 extern void psignal __P ((int __sig, __const char *__s));
 #endif /* Use misc.  */
@@ -95,7 +107,7 @@ extern int __sigsetmask __P ((int __mask));
    explitcly selects the BSD version.  */
 extern int __sigpause __P ((int __sig_or_mask, int __is_sig));
 
-#if defined(__USE_BSD) && !defined(__USE_XOPEN)
+#if defined __USE_BSD  && !defined __USE_XOPEN
 /* Set the mask of blocked signals to MASK,
    wait for a signal to arrive, and then restore the mask.  */
 #define sigpause(mask) __sigpause ((mask), 0)
@@ -107,7 +119,7 @@ extern int __sigpause __P ((int __sig_or_mask, int __is_sig));
 #endif
 
 
-#ifdef	__USE_BSD
+#ifdef __USE_BSD
 #define	sigmask(sig)	__sigmask(sig)
 
 extern int sigblock __P ((int __mask));
@@ -119,32 +131,32 @@ extern int siggetmask __P ((void));
 #endif /* Use BSD.  */
 
 
-#ifdef	__USE_MISC
+#ifdef __USE_MISC
 #define	NSIG	_NSIG
 #endif
 
-#ifdef	__USE_GNU
+#ifdef __USE_GNU
 typedef __sighandler_t sighandler_t;
 #endif
 
 /* 4.4 BSD uses the name `sig_t' for this.  */
-#ifdef	__USE_BSD
+#ifdef __USE_BSD
 typedef __sighandler_t sig_t;
 #endif
 
 #endif /* <signal.h> included.  */
 
 
-#ifdef	__USE_POSIX
+#ifdef __USE_POSIX
 
-#if	!defined(__sigset_t_defined) &&	\
-   (defined(_SIGNAL_H) || defined(__need_sigset_t))
+#if !defined __sigset_t_defined \
+    && (defined _SIGNAL_H  || defined __need_sigset_t)
 typedef __sigset_t sigset_t;
 #define	__sigset_t_defined	1
 #endif /* `sigset_t' not defined and <signal.h> or need `sigset_t'.  */
-#undef	__need_sigset_t
+#undef __need_sigset_t
 
-#ifdef	_SIGNAL_H
+#ifdef _SIGNAL_H
 
 /* Clear all signals from SET.  */
 extern int sigemptyset __P ((sigset_t *__set));
@@ -194,7 +206,7 @@ extern int sigwait __P ((__const sigset_t *__set, int *__sig));
 
 #endif /* Use POSIX.  */
 
-#if	defined(_SIGNAL_H) && defined(__USE_BSD)
+#if defined _SIGNAL_H && defined __USE_BSD
 
 /* Names of the signals.  This variable exists only for compatibility.
    Use `strsignal' instead (see <string.h>).  */
@@ -238,7 +250,7 @@ extern int sigreturn __P ((struct sigcontext *__scp));
 #endif /* signal.h included and use BSD.  */
 
 
-#if defined(_SIGNAL_H) && (defined(__USE_BSD) || defined(__USE_XOPEN_EXTENDED))
+#if defined _SIGNAL_H && (defined __USE_BSD || defined __USE_XOPEN_EXTENDED)
 
 #define	 __need_size_t
 #include <stddef.h>
diff --git a/signal/ssignal.c b/signal/ssignal.c
deleted file mode 100644
index 54ab7f0f45..0000000000
--- a/signal/ssignal.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Copyright (C) 1991, 1992, 1995 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., 675 Mass Ave,
-Cambridge, MA 02139, USA.  */
-
-#include <signal.h>
-
-#undef	ssignal
-
-__sighandler_t 
-ssignal (sig, func)
-     int sig;
-     __sighandler_t func;
-{
-  return signal (sig, func);
-}
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-11 17:07:32 +0000