Remove the time module alltogether.

[apps/madmutt.git] / main.c

diff --git a/main.c b/main.c
index 4d322dc..f53dc03 100644 (file)
--- a/main.c
+++ b/main.c
@@ -138,11 +138,6 @@ static void show_version (void)
     puts (_("Compile Options:"));
 
     puts (
-#ifdef USE_SETGID
-        "  +USE_SETGID"
-#else
-        "  -USE_SETGID"
-#endif
 #ifdef USE_FCNTL
         "  +USE_FCNTL"
 #else
@@ -185,27 +180,12 @@ static void show_version (void)
     exit(0);
 }
 
-static void start_curses (void)
-{
-  km_init ();                   /* must come before mutt_init */
-  mutt_signal_initialize ();
-  if (initscr () == NULL) {
-    puts _("Error initializing terminal.");
-
-    exit (1);
-  }
-  mutt_signal_initialize ();
-  curses_initialize();
-}
-
 #define M_IGNORE  (1<<0)        /* -z */
 #define M_BUFFY   (1<<1)        /* -Z */
 #define M_NOSYSRC (1<<2)        /* -n */
 #define M_RO      (1<<3)        /* -R */
 #define M_SELECT  (1<<4)        /* -y */
-#ifdef USE_NNTP
 #define M_NEWS    (1<<5)        /* -g and -G */
-#endif
 
 __attribute__((format(printf, 1, 0)))
 static void mutt_nocurses_error (const char *fmt, ...)
@@ -252,9 +232,6 @@ int main (int argc, char **argv)
   srand48 (time (NULL));
   umask (077);
 
-  p_clear(Options, countof(Options));
-  p_clear(QuadOptions, countof(QuadOptions));
-
   while ((i = getopt(argc, argv, "a:b:F:f:c:e:H:s:i:hnpRTtvyzZ"
 #ifdef USE_NNTP
                                                                     "g:G"
@@ -365,8 +342,11 @@ int main (int argc, char **argv)
 
   /* This must come before mutt_init() because curses needs to be started
      before calling the init_pair() function to set the color scheme.  */
-  if (!option (OPTNOCURSES))
-    start_curses();
+  if (!option (OPTNOCURSES)) {
+    km_init();
+    curses_initialize();
+    mutt_signal_initialize();
+  }
 
   /* set defaults and read init files */
   mutt_init (flags & M_NOSYSRC, commands);