X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=main.c;h=e5dc968e1517b0a0964dcc3fbb163e992820175a;hp=9a4a3dfa71a495f180f67d913c1928adf3003989;hb=558b0bd9de90a9dc28f409d8f46679bf48c72ded;hpb=6be673363a420d4f21e9ab1fbd5835ffba38a7ed

diff --git a/main.c b/main.c
index 9a4a3df..e5dc968 100644
--- a/main.c
+++ b/main.c
@@ -19,21 +19,19 @@
 
 #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 "alias.h"
-#include "mx.h"
 #include "buffy.h"
 #include "sort.h"
-#include <lib-crypt/crypt.h>
 #include "keymap.h"
 #include "mutt_idna.h"
-#include "xterm.h"
 
 #ifdef HAVE_GETOPT_H
 #include <getopt.h>
@@ -47,7 +45,7 @@ extern int optind;
 #endif
 
 #ifdef USE_NNTP
-#include "nntp/nntp.h"
+#include <nntp/nntp.h>
 #endif
 
 #ifdef USE_LIBESMTP
@@ -92,7 +90,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\
@@ -146,7 +144,7 @@ static void show_version (void)
   char buf[STRING];
 #endif
 
-  puts (mutt_make_version (1));
+  puts (mutt_make_version());
   puts (_(Notice));
 
   uname (&uts);
@@ -218,11 +216,6 @@ static void show_version (void)
 #else
          "-USE_SETGID  "
 #endif
-#ifdef USE_DOTLOCK
-         "+USE_DOTLOCK  "
-#else
-         "-USE_DOTLOCK  "
-#endif
 #ifdef USE_FCNTL
          "+USE_FCNTL  "
 #else
@@ -277,11 +270,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
@@ -378,11 +366,7 @@ static void show_version (void)
   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"));
 
@@ -475,14 +459,11 @@ int main (int argc, char **argv)
   p_clear(Options, countof(Options));
   p_clear(QuadOptions, countof(QuadOptions));
 
+  while ((i = getopt(argc, argv, "A:a:b:F:f:c:e:H:s:i:hm:npQ:RTtvyzZ"
 #ifdef USE_NNTP
-  while ((i =
-          getopt (argc, argv,
-                  "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:e:H:s:i:hm:npQ:RTtvyzZ")) != EOF)
+                                                                    "g:G"
 #endif
+                    )) >= 0)
     switch (i) {
     case 'A':
       alias_queries = mutt_add_list (alias_queries, optarg);
@@ -683,6 +664,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 ();
@@ -737,22 +719,20 @@ 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);
-          fclose (fin);
+          m_fclose(&fin);
           p_delete(&tempfile);
           exit (1);
         }
@@ -760,9 +740,9 @@ int main (int argc, char **argv)
           mutt_copy_stream (fin, fout);
         else if (bodytext)
           fputs (bodytext, fout);
-        fclose (fout);
+        m_fclose(&fout);
         if (fin && fin != stdin)
-          fclose (fin);
+          m_fclose(&fin);
       }
     }
 
@@ -814,8 +794,7 @@ int main (int argc, char **argv)
           mutt_endwin (Errorbuf);
           exit (1);
         }
-      }
-      else
+      } else
 #endif
       if (!Incoming.len) {
         mutt_endwin _("No incoming mailboxes defined.");
@@ -838,8 +817,7 @@ int main (int argc, char **argv)
       unset_option (OPTNEWS);
       nntp_expand_path (folder, sizeof (folder),
                         &CurrentNewsSrv->conn->account);
-    }
-    else
+    } else
 #endif
       mutt_expand_path (folder, sizeof (folder));
 
@@ -866,12 +844,13 @@ int main (int argc, char **argv)
         || !explicit_folder) {
       mutt_index_menu ();
       if (option (OPTXTERMSETTITLES))
-        mutt_xterm_set_title (NONULL (XtermLeave));
+        printf("\033]2;%s\007", NONULL(XtermLeave));
       if (Context)
         p_delete(&Context);
     }
     mutt_endwin (Errorbuf);
   }
 
+  luaM_shutdown();
   exit (0);
 }