X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=recvcmd.c;h=45dec598d16996a4052f5f2fda5c4cd375f2af4f;hp=f5fe28b906f62faa2bb291df26f28df774bcf63a;hb=f3cbb9f51357972f6e74244494236a41dc4d84cd;hpb=2a06362a155582cd59ae2ef6f0df71694a7eede3 diff --git a/recvcmd.c b/recvcmd.c index f5fe28b..45dec59 100644 --- a/recvcmd.c +++ b/recvcmd.c @@ -7,28 +7,21 @@ * please see the file GPL in the top level source directory. */ -#if HAVE_CONFIG_H -# include "config.h" -#endif - -#include -#include -#include -#include -#include +#include #include +#include +#include +#include +#include + #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 "attach.h" -#include "mx.h" #include "copy.h" #include "mutt_idna.h" @@ -114,19 +107,17 @@ static short count_tagged_children (ATTACHPTR ** idx, short idxlen, short i) /** - ** ** 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; @@ -157,7 +148,7 @@ 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; } @@ -182,7 +173,7 @@ void mutt_attach_bounce (FILE * fp, HEADER * hdr, } if (query_quadoption (OPT_BOUNCE, prompt) != M_YES) { - rfc822_free_address (&adr); + address_list_wipe(&adr); CLEARLINE (LINES - 1); mutt_message (p ? _("Message not bounced.") : _("Messages not bounced.")); return; @@ -210,13 +201,10 @@ void mutt_attach_bounce (FILE * fp, HEADER * hdr, /** - ** ** 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; @@ -235,9 +223,7 @@ void mutt_attach_resend (FILE * fp, HEADER * hdr, ATTACHPTR ** idx, /** - ** ** forward-message, from the attachment menu - ** **/ /* try to find a common parent message for the tagged attachments. */ @@ -330,6 +316,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. */ @@ -388,13 +438,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(Tempdir), NULL); + if (!tmpfp) { + mutt_error(_("Could not create temporary file")); return; } @@ -492,22 +542,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); } @@ -522,7 +566,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) { @@ -548,8 +592,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); @@ -560,10 +604,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(Tempdir), NULL); + if (!tmpfp) { + mutt_error(_("Could not create temporary file")); + header_delete(&tmphdr); return; } @@ -600,7 +644,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; @@ -615,7 +659,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); @@ -639,10 +683,7 @@ void mutt_attach_forward (FILE * fp, HEADER * hdr, /** - ** ** the various reply functions, from the attachment menu - ** - ** **/ /* Create the envelope defaults for a reply. @@ -722,7 +763,7 @@ attach_reply_envelope_defaults (ENVELOPE * env, ATTACHPTR ** idx, 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) @@ -738,7 +779,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; @@ -800,21 +841,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(Tempdir), NULL); + if (!tmpfp) { + mutt_error(_("Could not create temporary file")); + header_delete(&tmphdr); return; } @@ -872,13 +913,13 @@ void mutt_attach_reply (FILE * fp, HEADER * hdr, 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);