X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=send.c;h=27db967a3dc09378b46f5769bd64625bf8bfcd17;hp=3609f77a17626c48f2c0ace27527bc2592c8b2f0;hb=16536d59024177409f49134c3f03f69855c144b9;hpb=b8c71f93b0296f815a6538182343ba67e88c0012

diff --git a/send.c b/send.c
index 3609f77..27db967 100644
--- a/send.c
+++ b/send.c
@@ -7,44 +7,23 @@
  * 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 <utime.h>
 
 #include <lib-mime/mime.h>
+#include <lib-mime/rfc3676.h>
+#include <lib-ui/curses.h>
+#include <lib-ui/enter.h>
 
 #include "mutt.h"
-#include "enter.h"
-#include "mutt_curses.h"
-#include "rfc3676.h"
+#include "alias.h"
 #include "keymap.h"
 #include "copy.h"
 #include "mx.h"
-#include "mutt_crypt.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"
 #endif
@@ -110,13 +89,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;
       }
     }
@@ -152,7 +131,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;
@@ -192,7 +171,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);
@@ -208,7 +187,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
@@ -310,7 +289,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)
@@ -332,8 +311,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)
@@ -342,11 +321,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)
@@ -362,11 +341,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);
     }
   }
@@ -585,25 +564,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);
@@ -617,8 +577,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) {
@@ -656,10 +616,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;
@@ -679,7 +658,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);
   }
 
@@ -698,7 +677,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++) {
@@ -925,7 +904,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);
 
   }
 }
@@ -1072,7 +1051,7 @@ static void fix_end_of_file (const char *data)
 
 int mutt_resend_message (FILE * fp, CONTEXT * ctx, HEADER * cur)
 {
-  HEADER *msg = mutt_new_header ();
+  HEADER *msg = header_new();
 
   if (mutt_prepare_template (fp, ctx, msg, cur, 1) < 0)
     return -1;
@@ -1135,7 +1114,7 @@ int ci_send_message (int flags, /* send mode */
    */
 
   if (!msg) {
-    msg = mutt_new_header ();
+    msg = header_new();
 
     if (flags == SENDPOSTPONED) {
       if ((flags =
@@ -1165,7 +1144,7 @@ int ci_send_message (int flags, /* send mode */
     }
 
     if (!msg->env)
-      msg->env = mutt_new_envelope ();
+      msg->env = envelope_new();
   }
 
   /* Parse and use an eventual list-post header */
@@ -1174,11 +1153,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;
 
@@ -1192,9 +1171,9 @@ 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) {
@@ -1208,8 +1187,6 @@ int ci_send_message (int flags, /* send mode */
     }
 
     if (!tempfp) {
-      debug_print (1, ("can't create tempfile %s (errno=%d)\n", 
-                  msg->content->filename, errno));
       mutt_perror (msg->content->filename);
       goto cleanup;
     }
@@ -1261,8 +1238,7 @@ int ci_send_message (int flags, /* send mode */
       msg->env->newsgroups = m_strdup(((NNTP_DATA *) ctx->data)->group);
 #endif
 
-    if (!(flags & SENDMAILX) &&
-        !(option (OPTAUTOEDIT) && option (OPTEDITHDRS)) &&
+    if (!(option (OPTAUTOEDIT) && option (OPTEDITHDRS)) &&
         !((flags & SENDREPLY) && option (OPTFASTREPLY))) {
       if (edit_envelope (msg->env, flags) == -1)
         goto cleanup;
@@ -1303,7 +1279,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;
     }
 
@@ -1311,9 +1287,7 @@ int ci_send_message (int flags, /* send mode */
       process_user_header (msg->env);
 
 
-    if (option (OPTSIGONTOP)
-        && (!(flags & (SENDMAILX | SENDKEY)) && Editor
-            && m_strcmp(Editor, "builtin") != 0))
+    if (option (OPTSIGONTOP) && (!(flags & SENDKEY) && Editor))
       append_signature (tempfp);
 
     /* include replies/forwarded messages, unless we are given a template */
@@ -1321,9 +1295,7 @@ int ci_send_message (int flags, /* send mode */
         && generate_body (tempfp, msg, flags, ctx, cur) == -1)
       goto cleanup;
 
-    if (!option (OPTSIGONTOP)
-        && (!(flags & (SENDMAILX | SENDKEY)) && Editor
-            && m_strcmp(Editor, "builtin") != 0))
+    if (!option (OPTSIGONTOP) && (!(flags & SENDKEY) && Editor))
       append_signature (tempfp);
 
     /* 
@@ -1331,24 +1303,22 @@ int ci_send_message (int flags, /* send mode */
      * can take effect.
      */
 
-    if (!(flags & SENDMAILX)) {
-      if (option (OPTCRYPTAUTOSIGN))
-        msg->security |= SIGN;
-      if (option (OPTCRYPTAUTOENCRYPT))
-        msg->security |= ENCRYPT;
-      if (option (OPTCRYPTREPLYENCRYPT) && cur && (cur->security & ENCRYPT))
-        msg->security |= ENCRYPT;
-      if (option (OPTCRYPTREPLYSIGN) && cur && (cur->security & SIGN))
-        msg->security |= SIGN;
-      if (option (OPTCRYPTREPLYSIGNENCRYPTED) && cur
-          && (cur->security & ENCRYPT))
-        msg->security |= SIGN;
-      if (msg->security & (ENCRYPT | SIGN)) {
-        if (option (OPTPGPAUTOINLINE))
-          msg->security |= INLINE;
-        if (option (OPTPGPREPLYINLINE) && cur && (cur->security & INLINE))
-          msg->security |= INLINE;
-      }
+    if (option (OPTCRYPTAUTOSIGN))
+      msg->security |= SIGN;
+    if (option (OPTCRYPTAUTOENCRYPT))
+      msg->security |= ENCRYPT;
+    if (option (OPTCRYPTREPLYENCRYPT) && cur && (cur->security & ENCRYPT))
+      msg->security |= ENCRYPT;
+    if (option (OPTCRYPTREPLYSIGN) && cur && (cur->security & SIGN))
+      msg->security |= SIGN;
+    if (option (OPTCRYPTREPLYSIGNENCRYPTED) && cur
+        && (cur->security & ENCRYPT))
+      msg->security |= SIGN;
+    if (msg->security & (ENCRYPT | SIGN)) {
+      if (option (OPTPGPAUTOINLINE))
+        msg->security |= INLINE;
+      if (option (OPTPGPREPLYINLINE) && cur && (cur->security & INLINE))
+        msg->security |= INLINE;
     }
 
     if (msg->security) {
@@ -1404,11 +1374,7 @@ int ci_send_message (int flags, /* send mode */
   if (!(flags & SENDKEY))
     safe_fclose (&tempfp);
 
-  if (flags & SENDMAILX) {
-    if (mutt_builtin_editor (msg->content->filename, msg, cur) == -1)
-      goto cleanup;
-  }
-  else if (!(flags & SENDBATCH)) {
+  if (!(flags & SENDBATCH)) {
     struct stat st;
     time_t mtime = mutt_decrease_mtime (msg->content->filename, NULL);
 
@@ -1430,12 +1396,10 @@ 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 (!Editor || m_strcmp("builtin", Editor) == 0)
-        mutt_builtin_editor (msg->content->filename, msg, cur);
-      else if (option (OPTEDITHDRS)) {
+      } else if (option (OPTEDITHDRS)) {
         mutt_env_to_local (msg->env);
         mutt_edit_headers (Editor, msg->content->filename, msg, fcc,
                            sizeof (fcc));
@@ -1486,7 +1450,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;
     }
   }
@@ -1494,7 +1458,7 @@ int ci_send_message (int flags, /* send mode */
 
   mutt_update_encoding (msg->content);
 
-  if (!(flags & (SENDMAILX | SENDBATCH))) {
+  if (!(flags & SENDBATCH)) {
   main_loop:
 
     fcc_error = 0;              /* reset value since we may have failed before */
@@ -1659,7 +1623,7 @@ int ci_send_message (int flags, /* send mode */
       && (msg->content->parts != clear_content))
     free_clear_content = 1;
 
-  if (!option (OPTNOCURSES) && !(flags & SENDMAILX))
+  if (!option (OPTNOCURSES))
     mutt_message _("Sending message...");
 
   mutt_prepare_envelope (msg->env, 1);
@@ -1740,10 +1704,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;
@@ -1751,7 +1715,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);
     }
 
   }
@@ -1767,11 +1731,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);
       }
 
@@ -1786,20 +1750,20 @@ int ci_send_message (int flags, /* send mode */
       goto cleanup;
     }
   }
-  else if (!option (OPTNOCURSES) && !(flags & SENDMAILX))
+  else if (!option (OPTNOCURSES))
     mutt_message (i != 0 ? _("Sending in background.") :
 #ifdef USE_NNTP
                   (flags & SENDNEWS) ? _("Article posted.") :
-                  _("Mail sent."));
+                  _("Mail sent.")
 #else
-                  _("Mail sent."));
+                  _("Mail sent.")
 #endif
-
+    );
   if (msg->security & ENCRYPT)
     p_delete(&pgpkeylist);
 
   if (free_clear_content)
-    mutt_free_body (&clear_content);
+    body_list_wipe(&clear_content);
 
   if (flags & SENDREPLY) {
     if (cur && ctx)
@@ -1824,7 +1788,7 @@ cleanup:
   }
 
   safe_fclose (&tempfp);
-  mutt_free_header (&msg);
+  header_delete(&msg);
 
   return rv;
 }