X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=recvcmd.c;h=e4db1d8fe4f664011af29b90304a40277186eefe;hp=39af5fa11df2b346bf0882de8c33b514249cd4d9;hb=7d29626ce4e1fa932c6349c7253e6f774df069fc;hpb=ecfcc6df70230ba136c2fb3843700ecb749c41b7 diff --git a/recvcmd.c b/recvcmd.c index 39af5fa..e4db1d8 100644 --- a/recvcmd.c +++ b/recvcmd.c @@ -7,29 +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 "alias.h" #include "state.h" #include "handler.h" #include "recvattach.h" -#include "mutt_menu.h" -#include "rfc1524.h" #include "attach.h" -#include "mx.h" #include "copy.h" #include "mutt_idna.h" @@ -40,7 +32,7 @@ static short check_msg (BODY * b, short err) { - if (!mutt_is_message_type (b->type, b->subtype)) { + if (!mutt_is_message_type(b)) { if (err) mutt_error _("You may only bounce message/rfc822 parts."); @@ -115,9 +107,7 @@ 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 __attribute__ ((unused)), @@ -126,7 +116,7 @@ void mutt_attach_bounce (FILE * fp, HEADER * hdr __attribute__ ((unused)), short i; char prompt[STRING]; char buf[HUGE_STRING]; - const char *err = NULL; + char *err = NULL; address_t *adr = NULL; int ret = 0; int p = 0; @@ -158,12 +148,12 @@ void mutt_attach_bounce (FILE * fp, HEADER * hdr __attribute__ ((unused)), if (mutt_addrlist_to_idna (adr, &err) < 0) { mutt_error (_("Bad IDN: '%s'"), err); p_delete(&err); - address_delete (&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) /* @@ -173,7 +163,7 @@ void mutt_attach_bounce (FILE * fp, HEADER * hdr __attribute__ ((unused)), (p ? _("Bounce message to %s") : _("Bounce messages to %s")), buf); - if (mutt_strwidth (prompt) > COLS - extra_space) { + if (m_strwidth(prompt) > COLS - extra_space) { mutt_format_string (prompt, sizeof (prompt) - 4, 0, COLS - extra_space, 0, 0, prompt, sizeof (prompt), 0); @@ -183,7 +173,7 @@ void mutt_attach_bounce (FILE * fp, HEADER * hdr __attribute__ ((unused)), } if (query_quadoption (OPT_BOUNCE, prompt) != M_YES) { - address_delete (&adr); + address_list_wipe(&adr); CLEARLINE (LINES - 1); mutt_message (p ? _("Message not bounced.") : _("Messages not bounced.")); return; @@ -211,10 +201,7 @@ void mutt_attach_bounce (FILE * fp, HEADER * hdr __attribute__ ((unused)), /** - ** ** resend-message, from the attachment menu - ** - ** **/ void mutt_attach_resend (FILE * fp, HEADER * hdr __attribute__ ((unused)), ATTACHPTR ** idx, @@ -236,9 +223,7 @@ void mutt_attach_resend (FILE * fp, HEADER * hdr __attribute__ ((unused)), ATTAC /** - ** ** forward-message, from the attachment menu - ** **/ /* try to find a common parent message for the tagged attachments. */ @@ -254,8 +239,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; @@ -293,8 +277,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) @@ -311,7 +294,7 @@ 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; @@ -331,6 +314,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. */ @@ -393,9 +440,9 @@ static void attach_forward_bodies (FILE * fp, HEADER * hdr, 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; } @@ -493,21 +540,15 @@ 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); - } - + m_fclose(&tmpfp); + mutt_unlink(tmpbody); header_delete(&tmphdr); } @@ -561,9 +602,9 @@ static void attach_forward_msgs (FILE * fp, HEADER * hdr __attribute__ ((unused) /* no MIME encapsulation */ - mutt_mktemp (tmpbody); - if (!(tmpfp = safe_fopen (tmpbody, "w"))) { - mutt_error (_("Can't create %s."), tmpbody); + tmpfp = m_tempfile(tmpbody, sizeof(tmpbody), NONULL(Tempdir), NULL); + if (!tmpfp) { + mutt_error(_("Could not create temporary file")); header_delete(&tmphdr); return; } @@ -601,7 +642,7 @@ static void attach_forward_msgs (FILE * fp, HEADER * hdr __attribute__ ((unused) } } } - fclose (tmpfp); + m_fclose(&tmpfp); } else if (rc == M_YES) { /* do MIME encapsulation - we don't need to do much here */ last = &tmphdr->content; @@ -640,10 +681,7 @@ void mutt_attach_forward (FILE * fp, HEADER * hdr, /** - ** ** the various reply functions, from the attachment menu - ** - ** **/ /* Create the envelope defaults for a reply. @@ -723,7 +761,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) @@ -773,7 +811,7 @@ 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 @@ -812,9 +850,9 @@ void mutt_attach_reply (FILE * fp, HEADER * hdr, return; } - mutt_mktemp (tmpbody); - if ((tmpfp = safe_fopen (tmpbody, "w")) == NULL) { - mutt_error (_("Can't create %s."), tmpbody); + tmpfp = m_tempfile(tmpbody, sizeof(tmpbody), NONULL(Tempdir), NULL); + if (!tmpfp) { + mutt_error(_("Could not create temporary file")); header_delete(&tmphdr); return; } @@ -874,12 +912,12 @@ void mutt_attach_reply (FILE * fp, HEADER * hdr, copy_problematic_attachments (fp, &tmphdr->content, idx, idxlen, 0) == NULL) { header_delete(&tmphdr); - fclose (tmpfp); + 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);