X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=recvcmd.c;h=0d8813b75979181ccd1ee38d8655cf054ec1a452;hp=dff5aee3c044997f852d133c5670ec8bd09a6d3d;hb=6605e3e4bf358e8d5835232623dc359af219cc6a;hpb=c98480f8568e6c1bc927c6c5f2b5e80b4aa6548c;ds=sidebyside

diff --git a/recvcmd.c b/recvcmd.c
index dff5aee..0d8813b 100644
--- a/recvcmd.c
+++ b/recvcmd.c
@@ -7,27 +7,20 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <lib-lib/lib-lib.h>
 
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/file.h>
+#include <lib-mime/mime.h>
+
+#include <lib-ui/lib-ui.h>
+#include <lib-ui/menu.h>
+#include <lib-mx/mx.h>
 
 #include "mutt.h"
-#include "enter.h"
+#include "alias.h"
 #include "state.h"
 #include "handler.h"
 #include "recvattach.h"
-#include "mutt_curses.h"
-#include "mutt_menu.h"
-#include "rfc1524.h"
-#include "mime.h"
 #include "attach.h"
-#include "mapping.h"
-#include "mx.h"
 #include "copy.h"
 #include "mutt_idna.h"
 
@@ -35,69 +28,56 @@
 /* some helper functions to verify that we are exclusively operating
  * on message/rfc822 attachments
  */
-
-static short check_msg (BODY * b, short err)
+static int check_all_msg(ATTACHPTR **idx, int idxlen, BODY *cur, bool err)
 {
-  if (!mutt_is_message_type (b->type, b->subtype)) {
-    if (err)
-      mutt_error _("You may only bounce message/rfc822 parts.");
-
-    return -1;
-  }
-  return 0;
-}
+    if (cur) {
+        if (!mutt_is_message_type(cur))
+            goto error;
+    } else {
+        for (int i = 0; i < idxlen; i++) {
+            BODY *b = idx[i]->content;
+            if (b->tagged && !mutt_is_message_type(b))
+                goto error;
+        }
+    }
+    return 0;
 
-static short check_all_msg (ATTACHPTR ** idx, short idxlen,
-                            BODY * cur, short err)
-{
-  short i;
+  error:
+    if (err)
+        mutt_error(_("You may only bounce message/rfc822 parts."));
 
-  if (cur && check_msg (cur, err) == -1)
     return -1;
-  else if (!cur) {
-    for (i = 0; i < idxlen; i++) {
-      if (idx[i]->content->tagged) {
-        if (check_msg (idx[i]->content, err) == -1)
-          return -1;
-      }
-    }
-  }
-  return 0;
 }
 
-
 /* can we decode all tagged attachments? */
-
-static short check_can_decode (ATTACHPTR ** idx, short idxlen, BODY * cur)
+static int check_can_decode(ATTACHPTR ** idx, int idxlen, BODY * cur)
 {
-  short i;
-
-  if (cur)
-    return mutt_can_decode (cur);
+    if (cur)
+        return mutt_can_decode(cur);
 
-  for (i = 0; i < idxlen; i++)
-    if (idx[i]->content->tagged && !mutt_can_decode (idx[i]->content))
-      return 0;
+    for (int i = 0; i < idxlen; i++) {
+        if (idx[i]->content->tagged && !mutt_can_decode(idx[i]->content))
+            return 0;
+    }
 
-  return 1;
+    return -1;
 }
 
-static short count_tagged (ATTACHPTR ** idx, short idxlen)
+static int count_tagged(ATTACHPTR **idx, int idxlen)
 {
-  short count = 0;
-  short i;
+    int count = 0;
 
-  for (i = 0; i < idxlen; i++)
-    if (idx[i]->content->tagged)
-      count++;
+    for (int i = 0; i < idxlen; i++) {
+        if (idx[i]->content->tagged)
+            count++;
+    }
 
-  return count;
+    return count;
 }
 
 /* count the number of tagged children below a multipart or message
  * attachment.
  */
-
 static short count_tagged_children (ATTACHPTR ** idx, short idxlen, short i)
 {
   short level = idx[i]->level;
@@ -109,23 +89,20 @@ static short count_tagged_children (ATTACHPTR ** idx, short idxlen, short i)
 
   return count;
 }
-
 
 
 /**
- **
  ** The bounce function, from the attachment menu
- **
  **/
 
-void mutt_attach_bounce (FILE * fp, HEADER * hdr,
+void mutt_attach_bounce (FILE * fp, HEADER * hdr __attribute__ ((unused)),
                          ATTACHPTR ** idx, short idxlen, BODY * cur)
 {
   short i;
   char prompt[STRING];
   char buf[HUGE_STRING];
   char *err = NULL;
-  ADDRESS *adr = NULL;
+  address_t *adr = NULL;
   int ret = 0;
   int p = 0;
 
@@ -136,9 +113,9 @@ void mutt_attach_bounce (FILE * fp, HEADER * hdr,
   p = (cur || count_tagged (idx, idxlen) == 1);
 
   if (p)
-    strfcpy (prompt, _("Bounce message to: "), sizeof (prompt));
+    m_strcpy(prompt, sizeof(prompt), _("Bounce message to: "));
   else
-    strfcpy (prompt, _("Bounce tagged messages to: "), sizeof (prompt));
+    m_strcpy(prompt, sizeof(prompt), _("Bounce tagged messages to: "));
 
   buf[0] = '\0';
   if (mutt_get_field (prompt, buf, sizeof (buf), M_ALIAS)
@@ -156,14 +133,13 @@ void mutt_attach_bounce (FILE * fp, HEADER * hdr,
   if (mutt_addrlist_to_idna (adr, &err) < 0) {
     mutt_error (_("Bad IDN: '%s'"), err);
     p_delete(&err);
-    rfc822_free_address (&adr);
+    address_list_wipe(&adr);
     return;
   }
 
   buf[0] = 0;
-  rfc822_write_address (buf, sizeof (buf), adr, 1);
+  rfc822_addrcat(buf, sizeof(buf), adr, 1);
 
-#define extra_space (15+7+2)
   /*
    * See commands.c.
    */
@@ -171,24 +147,23 @@ void mutt_attach_bounce (FILE * fp, HEADER * hdr,
             (p ? _("Bounce message to %s") : _("Bounce messages to %s")),
             buf);
 
-  if (mutt_strwidth (prompt) > COLS - extra_space) {
-    mutt_format_string (prompt, sizeof (prompt) - 4,
-                        0, COLS - extra_space, 0, 0,
+#define extra_space (15+7+2)
+  if (m_strwidth(prompt) > getmaxx(main_w) - extra_space) {
+    mutt_format_string (prompt, sizeof (prompt) - 4, 0,
+                        getmaxx(main_w) - extra_space, 0, 0,
                         prompt, sizeof (prompt), 0);
     m_strcat(prompt, sizeof(prompt), "...?");
   } else {
     m_strcat(prompt, sizeof(prompt), "?");
   }
+#undef extra_space
 
   if (query_quadoption (OPT_BOUNCE, prompt) != M_YES) {
-    rfc822_free_address (&adr);
-    CLEARLINE (LINES - 1);
+    address_list_wipe(&adr);
     mutt_message (p ? _("Message not bounced.") : _("Messages not bounced."));
     return;
   }
 
-  CLEARLINE (LINES - 1);
-
   if (cur)
     ret = mutt_bounce_message (fp, cur->hdr, adr);
   else {
@@ -205,17 +180,13 @@ void mutt_attach_bounce (FILE * fp, HEADER * hdr,
     mutt_error (p ? _("Error bouncing message!") :
                 _("Error bouncing messages!"));
 }
-
 
 
 /**
- **
  ** resend-message, from the attachment menu 
- **
- **
  **/
 
-void mutt_attach_resend (FILE * fp, HEADER * hdr, ATTACHPTR ** idx,
+void mutt_attach_resend (FILE * fp, HEADER * hdr __attribute__ ((unused)), ATTACHPTR ** idx,
                          short idxlen, BODY * cur)
 {
   short i;
@@ -231,12 +202,9 @@ void mutt_attach_resend (FILE * fp, HEADER * hdr, ATTACHPTR ** idx,
         mutt_resend_message (fp, Context, idx[i]->content->hdr);
   }
 }
-
 
 /**
- **
  ** forward-message, from the attachment menu 
- **
  **/
 
 /* try to find a common parent message for the tagged attachments. */
@@ -252,8 +220,7 @@ static HEADER *find_common_parent (ATTACHPTR ** idx, short idxlen,
       break;
 
   while (--i >= 0) {
-    if (mutt_is_message_type
-        (idx[i]->content->type, idx[i]->content->subtype)) {
+    if (mutt_is_message_type(idx[i]->content)) {
       nchildren = count_tagged_children (idx, idxlen, i);
       if (nchildren == nattach)
         return idx[i]->content->hdr;
@@ -291,8 +258,7 @@ static HEADER *find_parent (ATTACHPTR ** idx, short idxlen, BODY * cur,
 
   if (cur) {
     for (i = 0; i < idxlen; i++) {
-      if (mutt_is_message_type
-          (idx[i]->content->type, idx[i]->content->subtype)
+      if (mutt_is_message_type(idx[i]->content)
           && is_parent (i, idx, idxlen, cur))
         parent = idx[i]->content->hdr;
       if (idx[i]->content == cur)
@@ -309,19 +275,19 @@ static void include_header (int quote, FILE * ifp,
                             HEADER * hdr, FILE * ofp, char *_prefix)
 {
   int chflags = CH_DECODE;
-  char prefix[SHORT_STRING];
+  char prefix[STRING];
 
   if (option (OPTWEED))
     chflags |= CH_WEED | CH_REORDER;
 
   if (quote) {
     if (_prefix)
-      strfcpy (prefix, _prefix, sizeof (prefix));
+      m_strcpy(prefix, sizeof(prefix), _prefix);
     else if (!option (OPTTEXTFLOWED))
       _mutt_make_string (prefix, sizeof (prefix), NONULL (Prefix),
                          Context, hdr, 0);
     else
-      strfcpy (prefix, ">", sizeof (prefix));
+      m_strcpy(prefix, sizeof(prefix), ">");
 
     chflags |= CH_PREFIX;
   }
@@ -329,6 +295,70 @@ static void include_header (int quote, FILE * ifp,
   mutt_copy_header (ifp, hdr, ofp, chflags, quote ? prefix : NULL);
 }
 
+/* create a send-mode duplicate from a receive-mode body */
+static int mutt_copy_body (FILE * fp, BODY ** tgt, BODY * src)
+{
+  char tmp[_POSIX_PATH_MAX];
+  BODY *b;
+
+  parameter_t *par, **ppar;
+
+  short use_disp;
+
+  if (src->filename) {
+    use_disp = 1;
+    m_strcpy(tmp, sizeof(tmp), src->filename);
+  } else {
+    use_disp = 0;
+    tmp[0] = '\0';
+  }
+
+  mutt_adv_mktemp (NULL, tmp, sizeof (tmp));
+  if (mutt_save_attachment (fp, src, tmp, 0, NULL) == -1)
+    return -1;
+
+  *tgt = body_new();
+  b = *tgt;
+
+  memcpy (b, src, sizeof (BODY));
+  b->parts = NULL;
+  b->next = NULL;
+
+  b->filename = m_strdup(tmp);
+  b->use_disp = use_disp;
+  b->unlink = 1;
+
+  if (mutt_is_text_part (b))
+    b->noconv = 1;
+
+  b->xtype = m_strdup(b->xtype);
+  b->subtype = m_strdup(b->subtype);
+  b->form_name = m_strdup(b->form_name);
+  b->filename = m_strdup(b->filename);
+  b->d_filename = m_strdup(b->d_filename);
+  b->description = m_strdup(b->description);
+
+  /* 
+   * we don't seem to need the HEADER structure currently.
+   * XXX - this may change in the future
+   */
+
+  if (b->hdr)
+    b->hdr = NULL;
+
+  /* copy parameters */
+  for (par = b->parameter, ppar = &b->parameter; par;
+       ppar = &(*ppar)->next, par = par->next) {
+    *ppar = parameter_new();
+    (*ppar)->attribute = m_strdup(par->attribute);
+    (*ppar)->value = m_strdup(par->value);
+  }
+
+  mutt_stamp_attachment (b);
+
+  return 0;
+}
+
 /* Attach all the body parts which can't be decoded. 
  * This code is shared by forwarding and replying. */
 
@@ -387,13 +417,13 @@ static void attach_forward_bodies (FILE * fp, HEADER * hdr,
     parent = hdr;
 
 
-  tmphdr = mutt_new_header ();
-  tmphdr->env = mutt_new_envelope ();
+  tmphdr = header_new();
+  tmphdr->env = envelope_new();
   mutt_make_forward_subject (tmphdr->env, Context, parent);
 
-  mutt_mktemp (tmpbody);
-  if ((tmpfp = safe_fopen (tmpbody, "w")) == NULL) {
-    mutt_error (_("Can't open temporary file %s."), tmpbody);
+  tmpfp = m_tempfile(tmpbody, sizeof(tmpbody), NONULL(mod_core.tmpdir), NULL);
+  if (!tmpfp) {
+    mutt_error(_("Could not create temporary file"));
     return;
   }
 
@@ -406,7 +436,7 @@ static void attach_forward_bodies (FILE * fp, HEADER * hdr,
       _mutt_make_string (prefix, sizeof (prefix), NONULL (Prefix), Context,
                          parent, 0);
     else
-      strfcpy (prefix, ">", sizeof (prefix));
+      m_strcpy(prefix, sizeof(prefix), ">");
   }
 
   include_header (option (OPTFORWQUOTE), fp, parent, tmpfp, prefix);
@@ -491,22 +521,16 @@ static void attach_forward_bodies (FILE * fp, HEADER * hdr,
   }
 
   mutt_forward_trailer (tmpfp);
-
-  fclose (tmpfp);
-  tmpfp = NULL;
+  m_fclose(&tmpfp);
 
   /* now that we have the template, send it. */
   ci_send_message (flags, tmphdr, tmpbody, NULL, parent);
   return;
 
 bail:
-
-  if (tmpfp) {
-    fclose (tmpfp);
-    mutt_unlink (tmpbody);
-  }
-
-  mutt_free_header (&tmphdr);
+  m_fclose(&tmpfp);
+  mutt_unlink(tmpbody);
+  header_delete(&tmphdr);
 }
 
 
@@ -521,7 +545,7 @@ bail:
  * the attachment index. 
  */
 
-static void attach_forward_msgs (FILE * fp, HEADER * hdr,
+static void attach_forward_msgs (FILE * fp, HEADER * hdr __attribute__ ((unused)),
                                  ATTACHPTR ** idx, short idxlen, BODY * cur,
                                  int flags)
 {
@@ -547,8 +571,8 @@ static void attach_forward_msgs (FILE * fp, HEADER * hdr,
       }
   }
 
-  tmphdr = mutt_new_header ();
-  tmphdr->env = mutt_new_envelope ();
+  tmphdr = header_new();
+  tmphdr->env = envelope_new();
   mutt_make_forward_subject (tmphdr->env, Context, curhdr);
 
 
@@ -559,10 +583,10 @@ static void attach_forward_msgs (FILE * fp, HEADER * hdr,
 
     /* no MIME encapsulation */
 
-    mutt_mktemp (tmpbody);
-    if (!(tmpfp = safe_fopen (tmpbody, "w"))) {
-      mutt_error (_("Can't create %s."), tmpbody);
-      mutt_free_header (&tmphdr);
+    tmpfp = m_tempfile(tmpbody, sizeof(tmpbody), NONULL(mod_core.tmpdir), NULL);
+    if (!tmpfp) {
+      mutt_error(_("Could not create temporary file"));
+      header_delete(&tmphdr);
       return;
     }
 
@@ -599,7 +623,7 @@ static void attach_forward_msgs (FILE * fp, HEADER * hdr,
         }
       }
     }
-    fclose (tmpfp);
+    m_fclose(&tmpfp);
   }
   else if (rc == M_YES) {       /* do MIME encapsulation - we don't need to do much here */
     last = &tmphdr->content;
@@ -614,7 +638,7 @@ static void attach_forward_msgs (FILE * fp, HEADER * hdr,
     }
   }
   else
-    mutt_free_header (&tmphdr);
+    header_delete(&tmphdr);
 
   ci_send_message (flags, tmphdr, *tmpbody ? tmpbody : NULL, NULL, curhdr);
 
@@ -627,21 +651,17 @@ void mutt_attach_forward (FILE * fp, HEADER * hdr,
   short nattach;
 
 
-  if (check_all_msg (idx, idxlen, cur, 0) == 0)
+  if (check_all_msg (idx, idxlen, cur, 0) == 0) {
     attach_forward_msgs (fp, hdr, idx, idxlen, cur, flags);
-  else {
+  } else {
     nattach = count_tagged (idx, idxlen);
     attach_forward_bodies (fp, hdr, idx, idxlen, cur, nattach, flags);
   }
 }
-
 
 
 /**
- ** 
  ** the various reply functions, from the attachment menu
- **
- **
  **/
 
 /* Create the envelope defaults for a reply.
@@ -685,43 +705,31 @@ attach_reply_envelope_defaults (ENVELOPE * env, ATTACHPTR ** idx,
     return -1;
   }
 
-#ifdef USE_NNTP
-  if ((flags & SENDNEWS)) {
-    /* in case followup set Newsgroups: with Followup-To: if it present */
-    if (!env->newsgroups && curenv &&
-        m_strcasecmp(curenv->followup_to, "poster"))
-      env->newsgroups = m_strdup(curenv->followup_to);
-  }
-  else
-#endif
-  {
-    if (parent) {
-      if (mutt_fetch_recips (env, curenv, flags) == -1)
+  if (parent) {
+    if (mutt_fetch_recips (env, curenv, flags) == -1)
+      return -1;
+  } else {
+    for (i = 0; i < idxlen; i++) {
+      if (idx[i]->content->tagged
+          && mutt_fetch_recips (env, idx[i]->content->hdr->env,
+                                flags) == -1)
         return -1;
     }
-    else {
-      for (i = 0; i < idxlen; i++) {
-        if (idx[i]->content->tagged
-            && mutt_fetch_recips (env, idx[i]->content->hdr->env,
-                                  flags) == -1)
-          return -1;
-      }
-    }
-
-    if ((flags & SENDLISTREPLY) && !env->to) {
-      mutt_error _("No mailing lists found!");
+  }
 
-      return (-1);
-    }
+  if ((flags & SENDLISTREPLY) && !env->to) {
+    mutt_error _("No mailing lists found!");
 
-    mutt_fix_reply_recipients (env);
+    return -1;
   }
+
+  mutt_fix_reply_recipients (env);
   mutt_make_misc_reply_headers (env, Context, curhdr, curenv);
 
   if (parent)
     mutt_add_to_reference_headers (env, curenv, NULL, NULL);
   else {
-    LIST **p = NULL, **q = NULL;
+    string_list_t **p = NULL, **q = NULL;
 
     for (i = 0; i < idxlen; i++) {
       if (idx[i]->content->tagged)
@@ -737,7 +745,7 @@ attach_reply_envelope_defaults (ENVELOPE * env, ATTACHPTR ** idx,
 /*  This is _very_ similar to send.c's include_reply(). */
 
 static void attach_include_reply (FILE * fp, FILE * tmpfp, HEADER * cur,
-                                  int flags)
+                                  int flags __attribute__ ((unused)))
 {
   int cmflags = M_CM_PREFIX | M_CM_DECODE | M_CM_CHARCONV;
   int chflags = CH_DECODE;
@@ -754,7 +762,6 @@ static void attach_include_reply (FILE * fp, FILE * tmpfp, HEADER * cur,
   }
 
   _mutt_copy_message (tmpfp, fp, cur, cur->content, cmflags, chflags);
-  mutt_make_post_indent (Context, cur, tmpfp);
 }
 
 void mutt_attach_reply (FILE * fp, HEADER * hdr,
@@ -771,16 +778,9 @@ void mutt_attach_reply (FILE * fp, HEADER * hdr,
   char tmpbody[_POSIX_PATH_MAX];
   FILE *tmpfp;
 
-  char prefix[SHORT_STRING];
+  char prefix[STRING];
   int rc;
 
-#ifdef USE_NNTP
-  if (flags & SENDNEWS)
-    set_option (OPTNEWSSEND);
-  else
-    unset_option (OPTNEWSSEND);
-#endif
-
   if (check_all_msg (idx, idxlen, cur, 0) == -1) {
     nattach = count_tagged (idx, idxlen);
     if ((parent = find_parent (idx, idxlen, cur, nattach)) == NULL)
@@ -799,21 +799,21 @@ void mutt_attach_reply (FILE * fp, HEADER * hdr,
   else if (nattach == 1)
     mime_reply_any = 1;
 
-  tmphdr = mutt_new_header ();
-  tmphdr->env = mutt_new_envelope ();
+  tmphdr = header_new();
+  tmphdr->env = envelope_new();
 
   if (attach_reply_envelope_defaults (tmphdr->env, idx, idxlen,
                                       parent ? parent : (cur ? cur->
                                                          hdr : NULL),
                                       flags) == -1) {
-    mutt_free_header (&tmphdr);
+    header_delete(&tmphdr);
     return;
   }
 
-  mutt_mktemp (tmpbody);
-  if ((tmpfp = safe_fopen (tmpbody, "w")) == NULL) {
-    mutt_error (_("Can't create %s."), tmpbody);
-    mutt_free_header (&tmphdr);
+  tmpfp = m_tempfile(tmpbody, sizeof(tmpbody), NONULL(mod_core.tmpdir), NULL);
+  if (!tmpfp) {
+    mutt_error(_("Could not create temporary file"));
+    header_delete(&tmphdr);
     return;
   }
 
@@ -838,7 +838,7 @@ void mutt_attach_reply (FILE * fp, HEADER * hdr,
       _mutt_make_string (prefix, sizeof (prefix), NONULL (Prefix),
                          Context, parent, 0);
     else
-      strfcpy (prefix, ">", sizeof (prefix));
+      m_strcpy(prefix, sizeof(prefix), ">");
 
     st.prefix = prefix;
     st.flags = M_CHARCONV;
@@ -866,18 +866,16 @@ void mutt_attach_reply (FILE * fp, HEADER * hdr,
       }
     }
 
-    mutt_make_post_indent (Context, parent, tmpfp);
-
     if (mime_reply_any && !cur &&
         copy_problematic_attachments (fp, &tmphdr->content, idx, idxlen,
                                       0) == NULL) {
-      mutt_free_header (&tmphdr);
-      fclose (tmpfp);
+      header_delete(&tmphdr);
+      m_fclose(&tmpfp);
       return;
     }
   }
 
-  fclose (tmpfp);
+  m_fclose(&tmpfp);
 
   if (ci_send_message (flags, tmphdr, tmpbody, NULL, parent) == 0)
     mutt_set_flag (Context, hdr, M_REPLIED, 1);