X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=main.c;h=3002fb7a035799e99183d4d453a300b0d4fad108;hb=0ab517261694b001d2eb17f06f167a4cdd2c7c07;hp=18f3079a1f05ac23a437ebfe530cb83c36e71587;hpb=4c99e2f0c403adb86af688ea982350de5bcc5edf;p=apps%2Fmadmutt.git

diff --git a/main.c b/main.c
index 18f3079..3002fb7 100644
--- a/main.c
+++ b/main.c
@@ -23,10 +23,10 @@
 #include <lib-sys/mutt_signal.h>
 #include <lib-mime/mime.h>
 #include <lib-ui/curses.h>
-#include <lib-crypt/crypt.h>
 #include <lib-mx/mx.h>
 
 #include "mutt.h"
+#include "crypt.h"
 #include "alias.h"
 #include "buffy.h"
 #include "sort.h"
@@ -57,22 +57,11 @@ extern int optind;
 #include <depot.h>
 #elif defined(HAVE_GDBM)
 #include <gdbm.h>
-#elif defined(HAVE_DB4)
-#include <db.h>
 #endif
 #endif
 
-#ifdef USE_GNUTLS
 #include <gnutls/gnutls.h>
-#endif
-
-#ifdef CRYPT_BACKEND_GPGME
 #include <gpgme.h>
-#endif
-
-#ifdef USE_SSL
-#include <openssl/opensslv.h>
-#endif
 
 static const char *Notice = N_("\
 Copyright (C) 1996-2002 Michael R. Elkins and others.\n\
@@ -185,24 +174,11 @@ static void show_version (void)
   printf ("  qdbm %s\n", dpversion);
 #elif defined(HAVE_GDBM)
   printf ("  gdbm %s\n", gdbm_version);
-#elif defined(HAVE_DB4)
-  printf ("  DB4 %d.%d.%d\n", DB_VERSION_MAJOR, DB_VERSION_MINOR,
-          DB_VERSION_PATCH);
 #endif
 #endif
 
-#ifdef USE_GNUTLS
   printf ("  gnutls %s\n", LIBGNUTLS_VERSION);
-#endif
-
-#ifdef USE_SSL
-  printf ("  %s\n",OPENSSL_VERSION_TEXT);
-#endif
-
-#ifdef CRYPT_BACKEND_GPGME
   printf ("  gpgme %s\n", GPGME_VERSION);
-#endif
-
   puts (_("Compile Options:"));
 
   puts (
@@ -238,26 +214,6 @@ static void show_version (void)
 #else
          "-USE_NNTP  "
 #endif
-#ifdef USE_GSS
-         "+USE_GSS  "
-#else
-         "-USE_GSS  "
-#endif
-#ifdef USE_SSL
-         "+USE_SSL  "
-#else
-         "-USE_SSL  "
-#endif
-#ifdef USE_GNUTLS
-         "+USE_GNUTLS  "
-#else
-         "-USE_GNUTLS  "
-#endif
-#ifdef USE_SASL
-         "+USE_SASL  "
-#else
-         "-USE_SASL  "
-#endif
 #ifdef USE_LIBESMTP
          "+USE_LIBESMTP  "
 #else
@@ -304,11 +260,7 @@ static void show_version (void)
     );
 
   puts (
-#ifdef CRYPT_BACKEND_GPGME
          "+CRYPT_BACKEND_GPGME  "
-#else
-         "-CRYPT_BACKEND_GPGME  "
-#endif
          "\n  "
 #ifdef ENABLE_NLS
          "+ENABLE_NLS  "
@@ -345,11 +297,6 @@ static void show_version (void)
          "+HAVE_GETSID  "
 #else
          "-HAVE_GETSID  "
-#endif
-#ifdef HAVE_GETADDRINFO
-         "+HAVE_GETADDRINFO  "
-#else
-         "-HAVE_GETADDRINFO  "
 #endif
     );
 
@@ -406,6 +353,17 @@ static void start_curses (void)
 #define M_NEWS    (1<<5)        /* -g and -G */
 #endif
 
+__attribute__((format(printf, 1, 0)))
+static void mutt_nocurses_error (const char *fmt, ...)
+{
+    va_list ap;
+
+    va_start(ap, fmt);
+    vfprintf(stderr, fmt, ap);
+    va_end(ap);
+    fputc('\n', stderr);
+}
+
 int main (int argc, char **argv)
 {
   char folder[_POSIX_PATH_MAX] = "";
@@ -444,8 +402,7 @@ int main (int argc, char **argv)
 
   setlocale (LC_CTYPE, "");
 
-  mutt_error = mutt_nocurses_error;
-  mutt_message = mutt_nocurses_error;
+  mutt_error = mutt_message = mutt_nocurses_error;
   srand48 (time (NULL));
   umask (077);
 
@@ -589,9 +546,6 @@ int main (int argc, char **argv)
   mutt_init (flags & M_NOSYSRC, commands);
   string_list_wipe(&commands);
 
-  /* Initialize crypto */
-  crypt_init ();
-
   if (queries)
     return mutt_query_variables (queries);
   if (dump_variables > 0)
@@ -845,5 +799,6 @@ int main (int argc, char **argv)
   }
 
   luaM_shutdown();
+  mutt_sasl_shutdown();
   exit (0);
 }