remove some mutt_mktemp

[apps/madmutt.git] / pop / pop.c

diff --git a/pop/pop.c b/pop/pop.c
index a6e1fd8..be2d105 100644 (file)
--- a/pop/pop.c
+++ b/pop/pop.c
@@ -10,9 +10,9 @@
 #include <lib-lib/lib-lib.h>
 
 #include <lib-ui/curses.h>
+#include <lib-mx/mx.h>
 
 #include "mutt.h"
-#include "mx.h"
 #include "pop.h"
 #include <lib-crypt/crypt.h>
 
@@ -45,9 +45,9 @@ static pop_query_status pop_read_header (POP_DATA * pop_data, HEADER * h)
   char buf[LONG_STRING];
   char tempfile[_POSIX_PATH_MAX];
 
-  mutt_mktemp (tempfile);
-  if (!(f = safe_fopen (tempfile, "w+"))) {
-    mutt_perror (tempfile);
+  f = m_tempfile(tempfile, sizeof(tempfile), NONULL(Tempdir), NULL);
+  if (!f) {
+    mutt_error(_("Could not create temporary file"));
     return PFD_FUNCT_ERROR;
   }
 
@@ -349,11 +349,10 @@ int pop_fetch_message (MESSAGE * msg, CONTEXT * ctx, int msgno)
     bar.msg = _("Fetching message...");
     mutt_progress_bar (&bar, 0);
 
-    mutt_mktemp (path);
-    msg->fp = safe_fopen (path, "w+");
+    msg->fp = m_tempfile(path, sizeof(path), NONULL(Tempdir), NULL);
     if (!msg->fp) {
-      mutt_perror (path);
-      mutt_sleep (2);
+      mutt_error(_("Could not create temporary file"));
+      mutt_sleep(2);
       return -1;
     }