missing bits.

[apps/madmutt.git] / main.c

diff --git a/main.c b/main.c
index a02ecbc..d21f9ee 100644 (file)
--- 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"
@@ -62,16 +62,9 @@ extern int optind;
 #endif
 #endif
 
-#ifdef USE_GNUTLS
 #include <gnutls/gnutls.h>
-#endif
-
 #include <gpgme.h>
 
-#ifdef USE_SSL
-#include <openssl/opensslv.h>
-#endif
-
 static const char *Notice = N_("\
 Copyright (C) 1996-2002 Michael R. Elkins and others.\n\
 Copyright (C) 2005 The Mutt-ng Team\n\
@@ -189,14 +182,7 @@ static void show_version (void)
 #endif
 #endif
 
-#ifdef USE_GNUTLS
   printf ("  gnutls %s\n", LIBGNUTLS_VERSION);
-#endif
-
-#ifdef USE_SSL
-  printf ("  %s\n",OPENSSL_VERSION_TEXT);
-#endif
-
   printf ("  gpgme %s\n", GPGME_VERSION);
   puts (_("Compile Options:"));
 
@@ -233,26 +219,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
@@ -336,11 +302,6 @@ static void show_version (void)
          "+HAVE_GETSID  "
 #else
          "-HAVE_GETSID  "
-#endif
-#ifdef HAVE_GETADDRINFO
-         "+HAVE_GETADDRINFO  "
-#else
-         "-HAVE_GETADDRINFO  "
 #endif
     );
 
@@ -397,6 +358,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] = "";
@@ -435,8 +407,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);