X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=send.c;h=1773589450d2bd66636cb5fd16ca235f341016b5;hp=f1c0749d2bf65e150f0952fe83f6f7bb9b929832;hb=f3cbb9f51357972f6e74244494236a41dc4d84cd;hpb=dbb9a1e16d03a2d4664d6dc6a30c721b889d4982

diff --git a/send.c b/send.c
index f1c0749..1773589 100644
--- a/send.c
+++ b/send.c
@@ -7,53 +7,27 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/ascii.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/file.h>
+#include <lib-lib/lib-lib.h>
 
 #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 "enter.h"
-#include "rfc3676.h"
+#include "alias.h"
 #include "keymap.h"
 #include "copy.h"
-#include "mx.h"
 #include <lib-crypt/crypt.h>
 #include "mutt_idna.h"
-#include "url.h"
 #include "attach.h"
 
-#include "lib/debug.h"
-
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-#include <dirent.h>
-#include <time.h>
-#include <sys/types.h>
-#include <utime.h>
-
 #ifdef USE_NNTP
-#include "nntp.h"
+#include <nntp/nntp.h>
 #endif
 
-#ifdef MIXMASTER
 #include "remailer.h"
-#endif
-
 
 static void append_signature (FILE * f)
 {
@@ -70,7 +44,7 @@ static void append_signature (FILE * f)
     else if (SignOffString)
       fputs ("\n", f);
     mutt_copy_stream (tmpfp, f);
-    fclose (tmpfp);
+    m_fclose(&tmpfp);
     if (thepid != -1)
       mutt_wait_filter (thepid);
   }
@@ -111,13 +85,13 @@ static address_t *mutt_remove_xrefs (address_t * a, address_t * b)
       if (prev) {
         prev->next = b->next;
         b->next = NULL;
-        address_delete (&b);
+        address_list_wipe(&b);
         b = prev;
       }
       else {
         top = top->next;
         b->next = NULL;
-        address_delete (&b);
+        address_list_wipe(&b);
         b = top;
       }
     }
@@ -153,7 +127,7 @@ static address_t *remove_user (address_t * a, int leave_only)
       a = a->next;
       if (!leave_only || a || last) {
         tmp->next = NULL;
-        address_delete (&tmp);
+        address_list_wipe(&tmp);
       }
       else
         last = top = tmp;
@@ -193,7 +167,7 @@ static int edit_address (address_t ** a, const char *field)
     rfc822_write_address (buf, sizeof (buf), *a, 0);
     if (mutt_get_field (field, buf, sizeof (buf), M_ALIAS) != 0)
       return (-1);
-    address_delete (a);
+    address_list_wipe(a);
     *a = mutt_expand_aliases (mutt_parse_adrlist (NULL, buf));
     if ((idna_ok = mutt_addrlist_to_idna (*a, &err)) != 0) {
       mutt_error (_("Error: '%s' is a bad IDN."), err);
@@ -209,7 +183,7 @@ static int edit_address (address_t ** a, const char *field)
 static int edit_envelope (ENVELOPE * en, int flags)
 {
   char buf[HUGE_STRING];
-  LIST *uh = UserHeader;
+  string_list_t *uh = UserHeader;
   regmatch_t pat_match[1];
 
 #ifdef USE_NNTP
@@ -303,7 +277,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));
 }
@@ -311,7 +285,7 @@ char *nntp_get_header(const char *s)
 
 static void process_user_recips (ENVELOPE * env)
 {
-  LIST *uh = UserHeader;
+  string_list_t *uh = UserHeader;
 
   for (; uh; uh = uh->next) {
     if (ascii_strncasecmp ("to:", uh->data, 3) == 0)
@@ -333,8 +307,8 @@ static void process_user_recips (ENVELOPE * env)
 
 static void process_user_header (ENVELOPE * env)
 {
-  LIST *uh = UserHeader;
-  LIST *last = env->userhdrs;
+  string_list_t *uh = UserHeader;
+  string_list_t *last = env->userhdrs;
 
   if (last)
     while (last->next)
@@ -343,11 +317,11 @@ static void process_user_header (ENVELOPE * env)
   for (; uh; uh = uh->next) {
     if (ascii_strncasecmp ("from:", uh->data, 5) == 0) {
       /* User has specified a default From: address.  Remove default address */
-      address_delete (&env->from);
+      address_list_wipe(&env->from);
       env->from = rfc822_parse_adrlist (env->from, uh->data + 5);
     }
     else if (ascii_strncasecmp ("reply-to:", uh->data, 9) == 0) {
-      address_delete (&env->reply_to);
+      address_list_wipe(&env->reply_to);
       env->reply_to = rfc822_parse_adrlist (env->reply_to, uh->data + 9);
     }
     else if (ascii_strncasecmp ("message-id:", uh->data, 11) == 0)
@@ -363,11 +337,11 @@ static void process_user_header (ENVELOPE * env)
              ascii_strncasecmp ("supersedes:", uh->data, 11) != 0 &&
              ascii_strncasecmp ("subject:", uh->data, 8) != 0) {
       if (last) {
-        last->next = mutt_new_list ();
+        last->next = string_item_new();
         last = last->next;
       }
       else
-        last = env->userhdrs = mutt_new_list ();
+        last = env->userhdrs = string_item_new();
       last->data = m_strdup(uh->data);
     }
   }
@@ -586,25 +560,6 @@ int mutt_fetch_recips (ENVELOPE * out, ENVELOPE * in, int flags)
   return 0;
 }
 
-LIST *mutt_make_references (ENVELOPE * e)
-{
-  LIST *t = NULL, *l = NULL;
-
-  if (e->references)
-    l = mutt_copy_list (e->references);
-  else
-    l = mutt_copy_list (e->in_reply_to);
-
-  if (e->message_id) {
-    t = mutt_new_list ();
-    t->data = m_strdup(e->message_id);
-    t->next = l;
-    l = t;
-  }
-
-  return l;
-}
-
 void mutt_fix_reply_recipients (ENVELOPE * env)
 {
   mutt_expand_aliases_env (env);
@@ -618,8 +573,8 @@ void mutt_fix_reply_recipients (ENVELOPE * env)
   }
 
   /* the CC field can get cluttered, especially with lists */
-  env->to = mutt_remove_duplicates (env->to);
-  env->cc = mutt_remove_duplicates (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) {
@@ -637,8 +592,10 @@ void mutt_make_forward_subject (ENVELOPE * env, CONTEXT * ctx, HEADER * cur)
   m_strreplace(&env->subject, buffer);
 }
 
-void mutt_make_misc_reply_headers (ENVELOPE * env, CONTEXT * ctx,
-                                   HEADER * cur, ENVELOPE * curenv)
+void mutt_make_misc_reply_headers (ENVELOPE * env,
+                                   CONTEXT * ctx __attribute__ ((unused)),
+                                   HEADER * cur __attribute__ ((unused)),
+                                   ENVELOPE * curenv)
 {
   /* This takes precedence over a subject that might have
    * been taken from a List-Post header.  Is that correct?
@@ -646,7 +603,7 @@ void mutt_make_misc_reply_headers (ENVELOPE * env, CONTEXT * ctx,
   if (curenv->real_subj) {
     p_delete(&env->subject);
     env->subject = p_new(char, m_strlen(curenv->real_subj) + 5);
-    sprintf (env->subject, "Re: %s", curenv->real_subj);        /* __SPRINTF_CHECKED__ */
+    sprintf (env->subject, "Re: %s", curenv->real_subj);
   }
   else if (!env->subject)
     env->subject = m_strdup("Re: your mail");
@@ -657,10 +614,29 @@ void mutt_make_misc_reply_headers (ENVELOPE * env, CONTEXT * ctx,
 #endif
 }
 
+static string_list_t *mutt_make_references (ENVELOPE * e)
+{
+  string_list_t *t = NULL, *l = NULL;
+
+  if (e->references)
+    l = string_list_dup(e->references);
+  else
+    l = string_list_dup(e->in_reply_to);
+
+  if (e->message_id) {
+    t = string_item_new();
+    t->data = m_strdup(e->message_id);
+    t->next = l;
+    l = t;
+  }
+
+  return l;
+}
+
 void mutt_add_to_reference_headers (ENVELOPE * env, ENVELOPE * curenv,
-                                    LIST *** pp, LIST *** qq)
+                                    string_list_t *** pp, string_list_t *** qq)
 {
-  LIST **p = NULL, **q = NULL;
+  string_list_t **p = NULL, **q = NULL;
 
   if (pp)
     p = *pp;
@@ -680,7 +656,7 @@ void mutt_add_to_reference_headers (ENVELOPE * env, ENVELOPE * curenv,
   *p = mutt_make_references (curenv);
 
   if (curenv->message_id) {
-    *q = mutt_new_list ();
+    *q = string_item_new();
     (*q)->data = m_strdup(curenv->message_id);
   }
 
@@ -699,7 +675,7 @@ mutt_make_reference_headers (ENVELOPE * curenv, ENVELOPE * env, CONTEXT * ctx)
 
   if (!curenv) {
     HEADER *h;
-    LIST **p = NULL, **q = NULL;
+    string_list_t **p = NULL, **q = NULL;
     int i;
 
     for (i = 0; i < ctx->vcount; i++) {
@@ -857,13 +833,13 @@ static int generate_body (FILE * tempfp,        /* stream for outgoing message *
       return -1;
   }
   else if (flags & SENDKEY) {
-    BODY *tmp;
+    BODY *btmp;
 
-    if ((tmp = crypt_pgp_make_key_attachment (NULL)) == NULL)
+    if ((btmp = crypt_pgp_make_key_attachment (NULL)) == NULL)
       return -1;
 
-    tmp->next = msg->content;
-    msg->content = tmp;
+    btmp->next = msg->content;
+    msg->content = btmp;
   }
 
   mutt_clear_error ();
@@ -926,7 +902,7 @@ void mutt_set_followup_to (ENVELOPE * e)
       }
     }
 
-    e->mail_followup_to = mutt_remove_duplicates(e->mail_followup_to);
+    address_list_uniq(e->mail_followup_to);
 
   }
 }
@@ -976,7 +952,7 @@ address_t *mutt_default_from (void)
   else if (option (OPTUSEDOMAIN)) {
     adr = address_new ();
     adr->mailbox = p_new(char, m_strlen(Username) + m_strlen(fqdn) + 2);
-    sprintf (adr->mailbox, "%s@%s", NONULL (Username), NONULL (fqdn));  /* __SPRINTF_CHECKED__ */
+    sprintf (adr->mailbox, "%s@%s", NONULL (Username), NONULL (fqdn));
   }
   else {
     adr = address_new ();
@@ -993,36 +969,28 @@ 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,
                             msg->chain ? 1 : 0);
-#endif
-#ifndef MIXMASTER
-  mutt_write_rfc822_header (tempfp, msg->env, msg->content, 0, 0);
-#endif
-
   fputc ('\n', tempfp);         /* tie off the header. */
 
   if ((mutt_write_mime_body (msg->content, tempfp) == -1)) {
-    fclose (tempfp);
+    m_fclose(&tempfp);
     unlink (tempfile);
     return (-1);
   }
 
-  if (fclose (tempfp) != 0) {
-    mutt_perror (tempfile);
+  if (m_fclose(&tempfp) != 0) {
+    mutt_perror (_("Can't create temporary file"));
     unlink (tempfile);
     return (-1);
   }
 
-#ifdef MIXMASTER
   if (msg->chain)
     return mix_send_message (msg->chain, tempfile);
-#endif
 
   i = mutt_invoke_mta (msg->env->from, msg->env->to, msg->env->cc,
                        msg->env->bcc, tempfile,
@@ -1068,14 +1036,14 @@ static void fix_end_of_file (const char *data)
   fseeko (fp, -1, SEEK_END);
   if ((c = fgetc (fp)) != '\n')
     fputc ('\n', fp);
-  safe_fclose (&fp);
+  m_fclose(&fp);
 }
 
 int mutt_resend_message (FILE * fp, CONTEXT * ctx, HEADER * cur)
 {
   HEADER *msg = header_new();
 
-  if (mutt_prepare_template (fp, ctx, msg, cur, 1) < 0)
+  if (mutt_prepare_template (fp, ctx, msg, cur, option(OPTWEED)) < 0)
     return -1;
 
   return ci_send_message (SENDRESEND, msg, NULL, ctx, cur);
@@ -1087,7 +1055,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;
@@ -1175,11 +1142,11 @@ int ci_send_message (int flags, /* send mode */
     /* Use any list-post header as a template */
     url_parse_mailto (msg->env, NULL, cur->env->list_post);
     /* We don't let them set the sender's address. */
-    address_delete (&msg->env->from);
+    address_list_wipe(&msg->env->from);
   }
 
   if (!(flags & (SENDKEY | SENDPOSTPONED | SENDRESEND))) {
-    pbody = mutt_new_body ();
+    pbody = body_new();
     pbody->next = msg->content; /* don't kill command-line attachments */
     msg->content = pbody;
 
@@ -1193,24 +1160,21 @@ int ci_send_message (int flags, /* send mode */
     msg->content->disposition = DISPINLINE;
     if (option (OPTTEXTFLOWED) && msg->content->type == TYPETEXT
         && !ascii_strcasecmp (msg->content->subtype, "plain")) {
-      mutt_set_parameter ("format", "flowed", &msg->content->parameter);
+      parameter_setval(&msg->content->parameter, "format", "flowed");
       if (option (OPTDELSP))
-        mutt_set_parameter ("delsp", "yes", &msg->content->parameter);
+        parameter_setval(&msg->content->parameter, "delsp", "yes");
     }
 
     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);
     }
 
     if (!tempfp) {
-      debug_print (1, ("can't create tempfile %s (errno=%d)\n", 
-                  msg->content->filename, errno));
       mutt_perror (msg->content->filename);
       goto cleanup;
     }
@@ -1303,7 +1267,7 @@ int ci_send_message (int flags, /* send mode */
     msg->replied = 0;
 
     if (killfrom) {
-      address_delete (&msg->env->from);
+      address_list_wipe(&msg->env->from);
       killfrom = 0;
     }
 
@@ -1396,11 +1360,11 @@ int ci_send_message (int flags, /* send mode */
     msg->env->from->personal = m_strdup(Realname);
 
   if (!(flags & SENDKEY))
-    safe_fclose (&tempfp);
+    m_fclose(&tempfp);
 
   if (!(flags & SENDBATCH)) {
     struct stat st;
-    time_t mtime = mutt_decrease_mtime (msg->content->filename, NULL);
+    time_t mtime = m_decrease_mtime(msg->content->filename, NULL);
 
     mutt_update_encoding (msg->content);
 
@@ -1420,7 +1384,7 @@ int ci_send_message (int flags, /* send mode */
          query_quadoption (OPT_FORWEDIT,
                            _("Edit forwarded message?")) == M_YES)) {
       /* If the this isn't a text message, look for a mailcap edit command */
-      if (mutt_needs_mailcap (msg->content)) {
+      if (rfc1524_mailcap_isneeded(msg->content)) {
         if (!mutt_edit_attachment (msg->content))
           goto cleanup;
       } else if (option (OPTEDITHDRS)) {
@@ -1474,7 +1438,7 @@ int ci_send_message (int flags, /* send mode */
     }
     mutt_select_fcc (fcc, sizeof (fcc), msg);
     if (killfrom) {
-      address_delete (&msg->env->from);
+      address_list_wipe(&msg->env->from);
       killfrom = 0;
     }
   }
@@ -1728,10 +1692,10 @@ int ci_send_message (int flags, /* send mode */
     if (save_sig) {
       /* cleanup the second signature structures */
       if (save_content->parts) {
-        mutt_free_body (&save_content->parts->next);
+        body_list_wipe(&save_content->parts->next);
         save_content->parts = NULL;
       }
-      mutt_free_body (&save_content);
+      body_list_wipe(&save_content);
 
       /* restore old signature and attachments */
       msg->content->parts->next = save_sig;
@@ -1739,7 +1703,7 @@ int ci_send_message (int flags, /* send mode */
     }
     else if (save_content) {
       /* destroy the new encrypted body. */
-      mutt_free_body (&save_content);
+      body_list_wipe(&save_content);
     }
 
   }
@@ -1755,11 +1719,11 @@ int ci_send_message (int flags, /* send mode */
       if ((msg->security & ENCRYPT)
       ||  ((msg->security & SIGN)
       &&  msg->content->type == TYPEAPPLICATION)) {
-        mutt_free_body (&msg->content); /* destroy PGP data */
+        body_list_wipe(&msg->content); /* destroy PGP data */
         msg->content = clear_content;   /* restore clear text. */
       }
       else if ((msg->security & SIGN) && msg->content->type == TYPEMULTIPART) {
-        mutt_free_body (&msg->content->parts->next);    /* destroy sig */
+        body_list_wipe(&msg->content->parts->next);    /* destroy sig */
         msg->content = mutt_remove_multipart (msg->content);
       }
 
@@ -1787,7 +1751,7 @@ int ci_send_message (int flags, /* send mode */
     p_delete(&pgpkeylist);
 
   if (free_clear_content)
-    mutt_free_body (&clear_content);
+    body_list_wipe(&clear_content);
 
   if (flags & SENDREPLY) {
     if (cur && ctx)
@@ -1811,7 +1775,7 @@ cleanup:
     }
   }
 
-  safe_fclose (&tempfp);
+  m_fclose(&tempfp);
   header_delete(&msg);
 
   return rv;