small asan fixes; size_t and other ANSI C changes; restore readline variables in...

[thirdparty/bash.git] / sig.h

diff --git a/sig.h b/sig.h
index 68b5497ce8c7da83f040796f7c4ce18419aa5988..720e7969a23cf4e63cd805892d3e90e466306370 100644 (file)
--- a/sig.h
+++ b/sig.h
@@ -1,6 +1,6 @@
 /* sig.h -- header file for signal handler definitions. */
 
-/* Copyright (C) 1994-2009 Free Software Foundation, Inc.
+/* Copyright (C) 1994-2022 Free Software Foundation, Inc.
 
    This file is part of GNU Bash, the Bourne Again SHell.
 
@@ -25,18 +25,16 @@
 
 #include "stdc.h"
 
+#include <signal.h>            /* for sig_atomic_t */
+
 #if !defined (SIGABRT) && defined (SIGIOT)
 #  define SIGABRT SIGIOT
 #endif
 
-#define sighandler RETSIGTYPE
-typedef RETSIGTYPE SigHandler __P((int));
+#define sighandler void
+typedef void SigHandler (int);
 
-#if defined (VOID_SIGHANDLER)
-#  define SIGRETURN(n) return
-#else
-#  define SIGRETURN(n) return(n)
-#endif /* !VOID_SIGHANDLER */
+#define SIGRETURN(n)   return
 
 /* Here is a definition for set_signal_handler () which simply expands to
    a call to signal () for non-Posix systems.  The code for set_signal_handler
@@ -44,12 +42,9 @@ typedef RETSIGTYPE SigHandler __P((int));
 #if !defined (HAVE_POSIX_SIGNALS)
 #  define set_signal_handler(sig, handler) (SigHandler *)signal (sig, handler)
 #else
-extern SigHandler *set_signal_handler __P((int, SigHandler *));        /* in sig.c */
+extern SigHandler *set_signal_handler (int, SigHandler *);     /* in sig.c */
 #endif /* _POSIX_VERSION */
 
-/* Definitions used by the job control code. */
-#if defined (JOB_CONTROL)
-
 #if !defined (SIGCHLD) && defined (SIGCLD)
 #  define SIGCHLD SIGCLD
 #endif
@@ -96,44 +91,46 @@ do { \
   sigprocmask (SIG_BLOCK, &nvar, &ovar); \
 } while (0)
 
-#define UNBLOCK_SIGNAL(ovar)   sigprocmask (SIG_SETMASK, &ovar, (sigset_t)NULL)
+#define UNBLOCK_SIGNAL(ovar) sigprocmask (SIG_SETMASK, &ovar, (sigset_t *) NULL)
 
 #if defined (HAVE_POSIX_SIGNALS)
-#  define BLOCK_CHILD(nvar, ovar) \
-       BLOCK_SIGNAL (SIGCHLD, nvar, ovar)
-#  define UNBLOCK_CHILD(ovar) \
-       sigprocmask (SIG_SETMASK, &ovar, (sigset_t *) NULL)
+#  define BLOCK_CHILD(nvar, ovar) BLOCK_SIGNAL (SIGCHLD, nvar, ovar)
+#  define UNBLOCK_CHILD(ovar) UNBLOCK_SIGNAL(ovar)
 #else /* !HAVE_POSIX_SIGNALS */
 #  define BLOCK_CHILD(nvar, ovar) ovar = sigblock (sigmask (SIGCHLD))
 #  define UNBLOCK_CHILD(ovar) sigsetmask (ovar)
 #endif /* !HAVE_POSIX_SIGNALS */
 
-#endif /* JOB_CONTROL */
-
 /* Extern variables */
-extern volatile int sigwinch_received;
+extern volatile sig_atomic_t sigwinch_received;
+extern volatile sig_atomic_t sigterm_received;
 
-extern int interrupt_immediately;
+extern int interrupt_immediately;      /* no longer used */
 extern int terminate_immediately;
 
 /* Functions from sig.c. */
-extern sighandler termsig_sighandler __P((int));
-extern void termsig_handler __P((int));
-extern sighandler sigint_sighandler __P((int));
-extern void initialize_signals __P((int));
-extern void initialize_terminating_signals __P((void));
-extern void reset_terminating_signals __P((void));
-extern void top_level_cleanup __P((void));
-extern void throw_to_top_level __P((void));
-extern void jump_to_top_level __P((int)) __attribute__((__noreturn__));
-
-extern sighandler sigwinch_sighandler __P((int));
-extern void set_sigwinch_handler __P((void));
-extern void unset_sigwinch_handler __P((void));
+extern sighandler termsig_sighandler (int);
+extern void termsig_handler (int);
+extern sighandler sigint_sighandler (int);
+extern void initialize_signals (int);
+extern void initialize_terminating_signals (void);
+extern void reset_terminating_signals (void);
+extern void top_level_cleanup (void);
+extern void throw_to_top_level (void);
+extern void jump_to_top_level (int) __attribute__((__noreturn__));
+extern void restore_sigmask (void);
+
+extern sighandler sigwinch_sighandler (int);
+extern void set_sigwinch_handler (void);
+extern void unset_sigwinch_handler (void);
+
+extern sighandler sigterm_sighandler (int);
 
 /* Functions defined in trap.c. */
-extern SigHandler *set_sigint_handler __P((void));
-extern SigHandler *trap_to_sighandler __P((int));
-extern sighandler trap_handler __P((int));
+extern SigHandler *set_sigint_handler (void);
+extern SigHandler *trap_to_sighandler (int);
+extern sighandler trap_handler (int);
 
+extern int block_trapped_signals (sigset_t *, sigset_t *);
+extern int unblock_trapped_signals (sigset_t *);
 #endif /* _SIG_H_ */