remove some mutt_mktemp

[apps/madmutt.git] / send.c

diff --git a/send.c b/send.c
index 736e0c0..ce83c0c 100644 (file)
--- a/send.c
+++ b/send.c
@@ -971,9 +971,9 @@ static int send_message (HEADER * msg)
   int i;
 
   /* Write out the message in MIME form. */
   int i;
 
   /* Write out the message in MIME form. */

-  mutt_mktemp (tempfile);
-  if ((tempfp = safe_fopen (tempfile, "w")) == NULL)
-    return (-1);
+  tempfp = m_tempfile(tempfile, sizeof(tempfile), NONULL(Tempdir), NULL);
+  if (!tempfp)
+    return -1;

 
 #ifdef MIXMASTER
   mutt_write_rfc822_header (tempfp, msg->env, msg->content, 0,
 
 #ifdef MIXMASTER
   mutt_write_rfc822_header (tempfp, msg->env, msg->content, 0,


@@ -1065,7 +1065,6 @@ int ci_send_message (int flags, /* send mode */
                      CONTEXT * ctx,     /* current mailbox */
                      HEADER * cur)
 {                               /* current message */
                      CONTEXT * ctx,     /* current mailbox */
                      HEADER * cur)
 {                               /* current message */

-  char buffer[LONG_STRING];

   char fcc[_POSIX_PATH_MAX] = "";       /* where to copy this message */
   FILE *tempfp = NULL;
   BODY *pbody;
   char fcc[_POSIX_PATH_MAX] = "";       /* where to copy this message */
   FILE *tempfp = NULL;
   BODY *pbody;


@@ -1177,12 +1176,11 @@ int ci_send_message (int flags, /* send mode */
     }
 
     if (!tempfile) {
     }
 
     if (!tempfile) {

-      mutt_mktemp (buffer);
-      tempfp = safe_fopen (buffer, "w+");
+      char buffer[_POSIX_PATH_MAX];
+      tempfp = m_tempfile(buffer, sizeof(buffer), NONULL(Tempdir), NULL);

       msg->content->filename = m_strdup(buffer);
       msg->content->filename = m_strdup(buffer);

-    }
-    else {
-      tempfp = safe_fopen (tempfile, "a+");
+    } else {
+      tempfp = safe_fopen(tempfile, "a+");

       msg->content->filename = m_strdup(tempfile);
     }
 
       msg->content->filename = m_strdup(tempfile);
     }