X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-sys%2Fmutt_signal.c;h=8609671b937c3d1c36864f2dc7ce21de399e8298;hp=4807fa185c17b997a87ad7d7246fe38ac29ff1e4;hb=84bc6d1930165b21919541b3b24294a9d99c3541;hpb=1ee89902de184a640c171ae3285bff6882a791bd

diff --git a/lib-sys/mutt_signal.c b/lib-sys/mutt_signal.c
index 4807fa1..8609671 100644
--- a/lib-sys/mutt_signal.c
+++ b/lib-sys/mutt_signal.c
@@ -20,32 +20,20 @@ static struct sigaction SysOldQuit;
 static int IsEndwin = 0;
 
 /* Attempt to catch "ordinary" signals and shut down gracefully. */
-RETSIGTYPE exit_handler (int sig)
+static void exit_handler (int sig)
 {
   curs_set (1);
   endwin ();                    /* just to be safe */
-#ifdef SYS_SIGLIST_DECLARED
-  printf (_("%s...  Exiting.\n"), sys_siglist[sig]);
-#else
-#if defined(__sun__) && defined(__svr4__)
-  printf (_("Caught %s...  Exiting.\n"), _sys_siglist[sig]);
-#else
-#if defined(__alpha) && defined(__osf__)
-  printf (_("Caught %s...  Exiting.\n"), __sys_siglist[sig]);
-#else
-  printf (_("Caught signal %d...  Exiting.\n"), sig);
-#endif
-#endif
-#endif
+  printf(_("Caught %s...  Exiting.\n"), strsignal(sig));
   exit (0);
 }
 
-RETSIGTYPE chld_handler(int sig __attribute__((unused)))
+static void chld_handler(int sig __attribute__((unused)))
 {
   /* empty */
 }
 
-RETSIGTYPE sighandler (int sig)
+static void sighandler (int sig)
 {
   int save_errno = errno;
 
@@ -63,14 +51,14 @@ RETSIGTYPE sighandler (int sig)
     if (!IsEndwin)
       refresh ();
     mutt_curs_set (-1);
-#if defined (USE_SLANG_CURSES) || defined (HAVE_RESIZETERM)
+#if defined (HAVE_RESIZETERM)
     /* We don't receive SIGWINCH when suspended; however, no harm is done by
      * just assuming we received one, and triggering the 'resize' anyway. */
     SigWinch = 1;
 #endif
     break;
 
-#if defined (USE_SLANG_CURSES) || defined (HAVE_RESIZETERM)
+#if defined (HAVE_RESIZETERM)
   case SIGWINCH:
     SigWinch = 1;
     break;
@@ -84,13 +72,6 @@ RETSIGTYPE sighandler (int sig)
   errno = save_errno;
 }
 
-#ifdef USE_SLANG_CURSES
-int mutt_intr_hook (void)
-{
-  return (-1);
-}
-#endif /* USE_SLANG_CURSES */
-
 void mutt_signal_initialize (void)
 {
   struct sigaction act;
@@ -124,7 +105,7 @@ void mutt_signal_initialize (void)
   sigaction (SIGCONT, &act, NULL);
   sigaction (SIGTSTP, &act, NULL);
   sigaction (SIGINT, &act, NULL);
-#if defined (USE_SLANG_CURSES) || defined (HAVE_RESIZETERM)
+#if defined (HAVE_RESIZETERM)
   sigaction (SIGWINCH, &act, NULL);
 #endif
 
@@ -137,17 +118,6 @@ void mutt_signal_initialize (void)
   /* we don't want to mess with stopped children */
   act.sa_flags |= SA_NOCLDSTOP;
   sigaction (SIGCHLD, &act, NULL);
-
-#ifdef USE_SLANG_CURSES
-  /* This bit of code is required because of the implementation of
-   * SLcurses_wgetch().  If a signal is received (like SIGWINCH) when we
-   * are in blocking mode, SLsys_getkey() will not return an error unless
-   * a handler function is defined and it returns -1.  This is needed so
-   * that if the user resizes the screen while at a prompt, it will just
-   * abort and go back to the main-menu.
-   */
-  SLang_getkey_intr_hook = mutt_intr_hook;
-#endif
 }
 
 /* signals which are important to block while doing critical ops */
@@ -159,7 +129,7 @@ void mutt_block_signals (void)
     sigaddset (&Sigset, SIGHUP);
     sigaddset (&Sigset, SIGTSTP);
     sigaddset (&Sigset, SIGINT);
-#if defined (USE_SLANG_CURSES) || defined (HAVE_RESIZETERM)
+#if defined (HAVE_RESIZETERM)
     sigaddset (&Sigset, SIGWINCH);
 #endif
     sigprocmask (SIG_BLOCK, &Sigset, 0);