X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=main.c;h=f13f5a534c16969ad400eeedbb44cf3197b50fd3;hp=b3d7e66a37de76f50764b6b6003301108b9aab0a;hb=8e689b28eefc1a93797f299c33f7ec3e2e340329;hpb=5444b60629a8e4d01a78f5999615a084dd6cbd8a

diff --git a/main.c b/main.c
index b3d7e66..f13f5a5 100644
--- a/main.c
+++ b/main.c
@@ -19,13 +19,14 @@
 
 #include <sys/utsname.h>
 
+#include <lib-lua/lib-lua.h>
 #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"
@@ -65,9 +66,7 @@ extern int optind;
 #include <gnutls/gnutls.h>
 #endif
 
-#ifdef CRYPT_BACKEND_GPGME
 #include <gpgme.h>
-#endif
 
 #ifdef USE_SSL
 #include <openssl/opensslv.h>
@@ -89,7 +88,7 @@ void mutt_exit (int code)
 
 static void mutt_usage (void)
 {
-  puts (mutt_make_version (1));
+  puts (mutt_make_version());
 
   puts
     _("usage: madmutt [ -nRyzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f <file> ]\n\
@@ -143,7 +142,7 @@ static void show_version (void)
   char buf[STRING];
 #endif
 
-  puts (mutt_make_version (1));
+  puts (mutt_make_version());
   puts (_(Notice));
 
   uname (&uts);
@@ -198,10 +197,7 @@ static void show_version (void)
   printf ("  %s\n",OPENSSL_VERSION_TEXT);
 #endif
 
-#ifdef CRYPT_BACKEND_GPGME
   printf ("  gpgme %s\n", GPGME_VERSION);
-#endif
-
   puts (_("Compile Options:"));
 
   puts (
@@ -237,11 +233,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
@@ -252,11 +243,6 @@ static void show_version (void)
 #else
          "-USE_GNUTLS  "
 #endif
-#ifdef USE_SASL
-         "+USE_SASL  "
-#else
-         "-USE_SASL  "
-#endif
 #ifdef USE_LIBESMTP
          "+USE_LIBESMTP  "
 #else
@@ -269,11 +255,6 @@ static void show_version (void)
          "-HAVE_REGCOMP  "
 #endif
          "\n  "
-#ifdef HAVE_COLOR
-         "+HAVE_COLOR  "
-#else
-         "-HAVE_COLOR  "
-#endif
 #ifdef HAVE_START_COLOR
          "+HAVE_START_COLOR  "
 #else
@@ -308,11 +289,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  "
@@ -358,23 +335,12 @@ static void show_version (void)
     );
 
   puts (_("Built-In Defaults:"));
-
-#ifdef ISPELL
-  printf ("  +ISPELL=\"%s\"\n", ISPELL);
-#else
-  puts ("  -ISPELL");
-#endif
-
   printf ("  +SENDMAIL=\"%s\"\n", SENDMAIL);
   printf ("  +MAILPATH=\"%s\"\n", MAILPATH);
   printf ("  +PKGDATADIR=\"%s\"\n", PKGDATADIR);
   printf ("  +PKGDOCDIR=\"%s\"\n", PKGDOCDIR);
   printf ("  +SYSCONFDIR=\"%s\"\n", SYSCONFDIR);
-#ifdef MIXMASTER
   printf ("  +MIXMASTER=\"%s\"\n\n", MIXMASTER);
-#else
-  puts ("  -MIXMASTER\n");
-#endif
 
   puts (_("MadMutt is based on Madmutt wich was based on Mutt before\n"));
 
@@ -421,6 +387,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] = "";
@@ -459,8 +436,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);
 
@@ -604,9 +580,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)
@@ -672,6 +645,7 @@ int main (int argc, char **argv)
     char buf[LONG_STRING];
     char *tempfile = NULL, *infile = NULL;
     char *bodytext = NULL;
+    FILE *fout;
 
     if (!option (OPTNOCURSES))
       mutt_flushinp ();
@@ -726,18 +700,16 @@ int main (int argc, char **argv)
       else
         fin = NULL;
 
-      mutt_mktemp (buf);
-      tempfile = m_strdup(buf);
-
       if (draftFile)
         msg->env = mutt_read_rfc822_header (fin, NULL, 1, 0);
 
       /* is the following if still needed? */
 
-      if (tempfile) {
-        FILE *fout;
+      fout = m_tempfile(buf, sizeof(buf), NONULL(MCore.tmpdir), NULL);
+      tempfile = m_strdup(buf);
 
-        if ((fout = safe_fopen (tempfile, "w")) == NULL) {
+      if (tempfile) {
+        if (!fout) {
           if (!option (OPTNOCURSES))
             mutt_endwin (NULL);
           perror (tempfile);
@@ -860,5 +832,6 @@ int main (int argc, char **argv)
     mutt_endwin (Errorbuf);
   }
 
+  luaM_shutdown();
   exit (0);
 }