I don't care about systems where atimes are broken.

[apps/madmutt.git] / main.c

diff --git a/main.c b/main.c
index 8451c72..7f5581a 100644 (file)
--- a/main.c
+++ b/main.c
@@ -15,25 +15,10 @@
 
 #define MAIN_C 1
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <lib-lib/lib-lib.h>
 
-#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-lib/url.h>
-
 #include <lib-sys/mutt_signal.h>
 
 #include <lib-mime/mime.h>
@@ -41,6 +26,7 @@
 #include <lib-ui/curses.h>
 
 #include "mutt.h"
+#include "alias.h"
 #include "mx.h"
 #include "buffy.h"
 #include "sort.h"
@@ -161,9 +147,6 @@ options:\n\
   -a <file>\tattach a file to the message\n\
   -b <address>\tspecify a blind carbon-copy (BCC) address\n\
   -c <address>\tspecify a carbon-copy (CC) address");
-#if DEBUG
-  puts _("  -d <level>\tlog debugging output to ~/.madmuttdebug0");
-#endif
   puts _("\
   -e <command>\tspecify a command to be executed after initialization\n\
   -f <file>\tspecify which mailbox to read\n\
@@ -260,12 +243,6 @@ static void show_version (void)
 
   puts (_("Compile Options:"));
 
-#ifdef DEBUG
-  puts ("  +DEBUG");
-#else
-  puts ("  -DEBUG");
-#endif
-
   puts (
 #ifdef HOMESPOOL
          "  +HOMESPOOL  "
@@ -379,11 +356,6 @@ static void show_version (void)
          "+CRYPT_BACKEND_GPGME  "
 #else
          "-CRYPT_BACKEND_GPGME  "
-#endif
-#ifdef BUFFY_SIZE
-         "+BUFFY_SIZE "
-#else
-         "-BUFFY_SIZE "
 #endif
          "\n  "
 #ifdef ENABLE_NLS
@@ -412,11 +384,6 @@ static void show_version (void)
 #else
          "-HAVE_ICONV  "
 #endif
-#if ICONV_NONTRANS
-         "+ICONV_NONTRANS  "
-#else
-         "-ICONV_NONTRANS  "
-#endif
 #ifdef HAVE_LIBIDN
          "+HAVE_LIBIDN  "
 #else
@@ -547,10 +514,10 @@ int main (int argc, char **argv)
 #ifdef USE_NNTP
   while ((i =
           getopt (argc, argv,
-                  "A:a:b:F:f:c:d:e:g:GH:s:i:hm:npQ:RTtvyzZ")) != EOF)
+                  "A:a:b:F:f:c:e:g:GH:s:i:hm:npQ:RTtvyzZ")) != EOF)
 #else
   while ((i =
-          getopt (argc, argv, "A:a:b:F:f:c:d:e:H:s:i:hm:npQ:RTtvyzZ")) != EOF)
+          getopt (argc, argv, "A:a:b:F:f:c:e:H:s:i:hm:npQ:RTtvyzZ")) != EOF)
 #endif
     switch (i) {
     case 'A':
@@ -586,17 +553,6 @@ int main (int argc, char **argv)
         msg->env->cc = rfc822_parse_adrlist (msg->env->cc, optarg);
       break;
 
-    case 'd':
-      {
-        char buf[LONG_STRING];
-        int level = atoi (optarg);
-
-        snprintf (buf, sizeof (buf), "set debug_level=%d", level);
-        commands = mutt_add_list (commands, buf);
-        debug_setlevel (level);
-      }
-      break;
-
     case 't':
       dump_variables = 2;
       break;
@@ -704,7 +660,6 @@ int main (int argc, char **argv)
     start_curses ();
 
   /* set defaults and read init files */
-  mx_init ();
   mutt_init (flags & M_NOSYSRC, commands);
   string_list_wipe(&commands);