X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=main.c;h=2d2a78976971421cc51dadf08f276e28e4b73781;hp=96493be44b807291fa4168a7cc86db7cd3409b22;hb=f2ff91d8b7627e22af9715d384b6f9e9e802a39e;hpb=8476307969a605bea67f6b702b0c1e7a52038bed

diff --git a/main.c b/main.c
index 96493be..2d2a789 100644
--- a/main.c
+++ b/main.c
@@ -22,16 +22,15 @@
 #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 "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>
@@ -45,7 +44,7 @@ extern int optind;
 #endif
 
 #ifdef USE_NNTP
-#include "nntp/nntp.h"
+#include <nntp/nntp.h>
 #endif
 
 #ifdef USE_LIBESMTP
@@ -371,11 +370,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"));
 
@@ -468,14 +463,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);
@@ -676,6 +668,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 ();
@@ -730,22 +723,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(Tempdir), 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);
         }
@@ -753,9 +744,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);
       }
     }
 
@@ -807,8 +798,7 @@ int main (int argc, char **argv)
           mutt_endwin (Errorbuf);
           exit (1);
         }
-      }
-      else
+      } else
 #endif
       if (!Incoming.len) {
         mutt_endwin _("No incoming mailboxes defined.");
@@ -831,8 +821,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));
 
@@ -859,7 +848,7 @@ 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);
     }