X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=send.c;h=ce83c0ca36c999deea93e1ecd0863a6ab0fffa0f;hp=27db967a3dc09378b46f5769bd64625bf8bfcd17;hb=7b392ef7b50798f9eb3e7c869e634c5fef0092d1;hpb=1ee89902de184a640c171ae3285bff6882a791bd

diff --git a/send.c b/send.c
index 27db967..ce83c0c 100644
--- a/send.c
+++ b/send.c
@@ -12,20 +12,20 @@
 
 #include <lib-mime/mime.h>
 #include <lib-mime/rfc3676.h>
+#include <lib-sys/unix.h>
 #include <lib-ui/curses.h>
 #include <lib-ui/enter.h>
+#include <lib-mx/mx.h>
 
-#include "mutt.h"
 #include "alias.h"
 #include "keymap.h"
 #include "copy.h"
-#include "mx.h"
 #include <lib-crypt/crypt.h>
 #include "mutt_idna.h"
 #include "attach.h"
 
 #ifdef USE_NNTP
-#include "nntp.h"
+#include <nntp/nntp.h>
 #endif
 
 #ifdef MIXMASTER
@@ -281,7 +281,7 @@ static int edit_envelope (ENVELOPE * en, int flags)
 }
 
 #ifdef USE_NNTP
-char *nntp_get_header(const char *s)
+static char *nntp_get_header(const char *s)
 {
     return m_strdup(skipspaces(s));
 }
@@ -577,8 +577,8 @@ void mutt_fix_reply_recipients (ENVELOPE * env)
   }
 
   /* the CC field can get cluttered, especially with lists */
-  address_list_uniq(&env->to);
-  address_list_uniq(&env->cc);
+  address_list_uniq(env->to);
+  address_list_uniq(env->cc);
   env->cc = mutt_remove_xrefs (env->to, env->cc);
 
   if (env->cc && !env->to) {
@@ -904,7 +904,7 @@ void mutt_set_followup_to (ENVELOPE * e)
       }
     }
 
-    address_list_uniq(&e->mail_followup_to);
+    address_list_uniq(e->mail_followup_to);
 
   }
 }
@@ -971,9 +971,9 @@ static int send_message (HEADER * msg)
   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,
@@ -1065,7 +1065,6 @@ int ci_send_message (int flags, /* send mode */
                      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;
@@ -1177,12 +1176,11 @@ int ci_send_message (int flags, /* send mode */
     }
 
     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);
-    }
-    else {
-      tempfp = safe_fopen (tempfile, "a+");
+    } else {
+      tempfp = safe_fopen(tempfile, "a+");
       msg->content->filename = m_strdup(tempfile);
     }