X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=recvcmd.c;h=0d8813b75979181ccd1ee38d8655cf054ec1a452;hp=1f46204643844fc3cca7f3c2bf81f98e5b4e41e1;hb=6605e3e4bf358e8d5835232623dc359af219cc6a;hpb=f435868132e200bfa71ac155f037cf64bf5414ba;ds=sidebyside diff --git a/recvcmd.c b/recvcmd.c index 1f46204..0d8813b 100644 --- a/recvcmd.c +++ b/recvcmd.c @@ -12,7 +12,6 @@ #include #include -#include #include #include @@ -29,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)) { - 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; @@ -103,7 +89,6 @@ static short count_tagged_children (ATTACHPTR ** idx, short idxlen, short i) return count; } - /** @@ -163,9 +148,9 @@ void mutt_attach_bounce (FILE * fp, HEADER * hdr __attribute__ ((unused)), buf); #define extra_space (15+7+2) - if (m_strwidth(prompt) > COLS - extra_space) { - mutt_format_string (prompt, sizeof (prompt) - 4, - 0, COLS - extra_space, 0, 0, + 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 { @@ -175,13 +160,10 @@ void mutt_attach_bounce (FILE * fp, HEADER * hdr __attribute__ ((unused)), if (query_quadoption (OPT_BOUNCE, prompt) != M_YES) { address_list_wipe(&adr); - CLEARLINE (LINES - 1); mutt_message (p ? _("Message not bounced.") : _("Messages not bounced.")); return; } - CLEARLINE (LINES - 1); - if (cur) ret = mutt_bounce_message (fp, cur->hdr, adr); else { @@ -198,7 +180,6 @@ void mutt_attach_bounce (FILE * fp, HEADER * hdr __attribute__ ((unused)), mutt_error (p ? _("Error bouncing message!") : _("Error bouncing messages!")); } - /** @@ -221,7 +202,6 @@ void mutt_attach_resend (FILE * fp, HEADER * hdr __attribute__ ((unused)), ATTAC mutt_resend_message (fp, Context, idx[i]->content->hdr); } } - /** ** forward-message, from the attachment menu @@ -671,14 +651,13 @@ 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); } } - /** @@ -726,37 +705,25 @@ 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) @@ -814,13 +781,6 @@ void mutt_attach_reply (FILE * fp, HEADER * hdr, 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)