X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=commands.c;h=85ff46a17635a07778013160531b7ef6e739860a;hp=6a0598597ebadc89057c4a0205ee0d197e9d1739;hb=7b392ef7b50798f9eb3e7c869e634c5fef0092d1;hpb=a742b680bdba8cb47d2b81ab3397cdbec7ed5b69

diff --git a/commands.c b/commands.c
index 6a05985..85ff46a 100644
--- a/commands.c
+++ b/commands.c
@@ -8,24 +8,9 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <errno.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/wait.h>
-#include <sys/stat.h>
-#include <sys/types.h>
+#include <lib-lib/lib-lib.h>
 #include <utime.h>
 
-#include <lib-lib/mem.h>
-#include <lib-lib/file.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/ascii.h>
-
 #include <lib-mime/mime.h>
 
 #include <lib-sys/exit.h>
@@ -34,13 +19,13 @@
 #include <lib-ui/curses.h>
 #include <lib-ui/enter.h>
 #include <lib-ui/menu.h>
+#include <lib-mx/mx.h>
 
 #include "mutt.h"
 #include "alias.h"
 #include "recvattach.h"
 #include "sort.h"
 #include "copy.h"
-#include "mx.h"
 #include "pager.h"
 #include <lib-crypt/crypt.h>
 #include "mutt_idna.h"
@@ -50,10 +35,6 @@
 
 #include <imap/imap.h>
 
-#ifdef BUFFY_SIZE
-#include "buffy.h"
-#endif
-
 /* The folder the user last saved to.  Used by ci_save_message() */
 static char LastSaveFolder[_POSIX_PATH_MAX] = "";
 
@@ -74,11 +55,10 @@ int mutt_display_message (HEADER * cur)
   mutt_parse_mime_message (Context, cur);
   mutt_message_hook (Context, cur, M_MESSAGEHOOK);
 
-  mutt_mktemp (tempfile);
-  if ((fpout = safe_fopen (tempfile, "w")) == NULL) {
+  fpout = m_tempfile(tempfile, sizeof(tempfile), NONULL(Tempdir), NULL);
+  if (!fpout) {
     mutt_error _("Could not create temporary file!");
-
-    return (0);
+    return 0;
   }
 
   if (DisplayFilter && *DisplayFilter) {
@@ -674,12 +654,7 @@ int mutt_save_message (HEADER * h, int delete,
   char prompt[SHORT_STRING], buf[_POSIX_PATH_MAX];
   CONTEXT ctx;
   struct stat st;
-
-#ifdef BUFFY_SIZE
-  BUFFY *tmp = NULL;
-#else
   struct utimbuf ut;
-#endif
 
   *redraw = 0;
 
@@ -793,20 +768,14 @@ int mutt_save_message (HEADER * h, int delete,
     mx_close_mailbox (&ctx, NULL);
 
     if (need_buffy_cleanup) {
-#ifdef BUFFY_SIZE
-      tmp = buffy_find_mailbox (buf);
-      if (tmp && tmp->new <= 0)
-        buffy_update_mailbox (tmp);
-#else
       /* fix up the times so buffy won't get confused */
       if (st.st_mtime > st.st_atime) {
         ut.actime = st.st_atime;
         ut.modtime = time (NULL);
         utime (buf, &ut);
-      }
-      else
+      } else {
         utime (buf, NULL);
-#endif
+      }
     }
 
     mutt_clear_error ();