X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=main.c;h=4a735efc0656ee30fa93ed97ce8df51deed89842;hp=84c320e840388628c0f18d52e5655ccbcbbd6d25;hb=97677c08933e16e25ecb3c12473ef1efdab7962b;hpb=dbb9a1e16d03a2d4664d6dc6a30c721b889d4982

diff --git a/main.c b/main.c
index 84c320e..4a735ef 100644
--- a/main.c
+++ b/main.c
@@ -19,10 +19,21 @@
 # include "config.h"
 #endif
 
+#include <string.h>
+#include <stdlib.h>
+#include <locale.h>
+#include <unistd.h>
+#include <errno.h>
+#include <sys/stat.h>
+#include <sys/utsname.h>
+
 #include <lib-lib/mem.h>
 #include <lib-lib/str.h>
 #include <lib-lib/macros.h>
 #include <lib-lib/file.h>
+#include <lib-lib/debug.h>
+
+#include <lib-sys/mutt_signal.h>
 
 #include <lib-ui/curses.h>
 
@@ -36,16 +47,6 @@
 #include "mutt_idna.h"
 #include "xterm.h"
 
-#include "lib/debug.h"
-
-#include <string.h>
-#include <stdlib.h>
-#include <locale.h>
-#include <unistd.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include <sys/utsname.h>
-
 #ifdef HAVE_GETOPT_H
 #include <getopt.h>
 #else
@@ -331,11 +332,6 @@ static void show_version (void)
          "+HAVE_REGCOMP  "
 #else
          "-HAVE_REGCOMP  "
-#endif
-#ifdef USE_GNU_REGEX
-         "+USE_GNU_REGEX  "
-#else
-         "-USE_GNU_REGEX  "
 #endif
          "\n  "
 #ifdef HAVE_COLOR
@@ -471,17 +467,14 @@ static void start_curses (void)
 #else
   /* should come before initscr() so that ncurses 4.2 doesn't try to install
      its own SIGWINCH handler */
-  mutt_signal_init ();
+  mutt_signal_initialize ();
 #endif
   if (initscr () == NULL) {
     puts _("Error initializing terminal.");
 
     exit (1);
   }
-#if 1                           /* USE_SLANG_CURSES  - commenting out suggested in #455. */
-  /* slang requires the signal handlers to be set after initializing */
-  mutt_signal_init ();
-#endif
+  mutt_signal_initialize ();
   ci_start_color ();
   keypad (stdscr, TRUE);
   cbreak ();
@@ -546,8 +539,8 @@ int main (int argc, char **argv)
   SRAND (time (NULL));
   umask (077);
 
-  p_clear(Options, sizeof(Options));
-  p_clear(QuadOptions, sizeof(QuadOptions));
+  p_clear(Options, countof(Options));
+  p_clear(QuadOptions, countof(QuadOptions));
 
 #ifdef USE_NNTP
   while ((i =