X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=send.c;h=2ec0954db4a31bd99a52f67261d2f9144fc1f301;hp=05536b8ff9a51ba10b607d276dc240332c85bfef;hb=66572f4a9c4574c9f2a2c3ef59526ac66b807b0b;hpb=cfd5f411041c7ef44087b032751792fadc74586d diff --git a/send.c b/send.c index 05536b8..2ec0954 100644 --- a/send.c +++ b/send.c @@ -13,7 +13,6 @@ #include #include #include -#include #include #include "alias.h" @@ -118,9 +117,9 @@ static int mutt_addrsrc (address_t * a, address_t * lst) { for (; lst; lst = lst->next) { if (mutt_addrcmp (a, lst)) - return (1); + return 1; } - return (0); + return 0; } /* removes addresses from "b" which are contained in "a" */ @@ -219,7 +218,7 @@ static int edit_address (address_t ** a, const char *field) mutt_addrlist_to_local (*a); rfc822_addrcat(buf, sizeof(buf), *a, 0); if (mutt_get_field (field, buf, sizeof (buf), M_ALIAS) != 0) - return (-1); + return -1; address_list_wipe(a); *a = mutt_expand_aliases (mutt_parse_adrlist (NULL, buf)); if ((idna_ok = mutt_addrlist_to_idna (*a, &err)) != 0) { @@ -240,15 +239,15 @@ static int edit_envelope (ENVELOPE * en, int flags) regmatch_t pat_match[1]; if (edit_address (&en->to, "To: ") == -1 || en->to == NULL) - return (-1); + return -1; if (option (OPTASKCC) && edit_address (&en->cc, "Cc: ") == -1) - return (-1); + return -1; if (option (OPTASKBCC) && edit_address (&en->bcc, "Bcc: ") == -1) - return (-1); + return -1; if (en->subject) { if (option (OPTFASTREPLY)) - return (0); + return 0; else m_strcpy(buf, sizeof(buf), en->subject); } @@ -275,7 +274,7 @@ static int edit_envelope (ENVELOPE * en, int flags) } else { mutt_error (_("Ignoring $strip_was: Subject would be empty.")); - sleep (2); + mutt_sleep (2); } } if (mutt_get_field ("Subject: ", buf, sizeof (buf), 0) != 0 || (!buf[0] @@ -287,7 +286,7 @@ static int edit_envelope (ENVELOPE * en, int flags) != M_NO)) { mutt_message _("No subject, aborting."); - return (-1); + return -1; } m_strreplace(&en->subject, buf); @@ -502,7 +501,7 @@ static int default_to (address_t ** to, ENVELOPE * env, int flags, int hmfupto) break; default: - return (-1); /* abort */ + return -1; /* abort */ } } else @@ -511,7 +510,7 @@ static int default_to (address_t ** to, ENVELOPE * env, int flags, int hmfupto) else address_list_append(to, address_list_dup(env->from)); - return (0); + return 0; } int mutt_fetch_recips (ENVELOPE * out, ENVELOPE * in, int flags) @@ -533,11 +532,11 @@ int mutt_fetch_recips (ENVELOPE * out, ENVELOPE * in, int flags) if (in->mail_followup_to && hmfupto == M_YES && default_to (&out->cc, in, flags & SENDLISTREPLY, hmfupto) == -1) - return (-1); /* abort */ + return -1; /* abort */ } else { if (default_to (&out->to, in, flags & SENDGROUPREPLY, hmfupto) == -1) - return (-1); /* abort */ + return -1; /* abort */ if ((flags & SENDGROUPREPLY) && (!in->mail_followup_to || hmfupto != M_YES)) @@ -693,7 +692,7 @@ envelope_defaults (ENVELOPE * env, CONTEXT * ctx, HEADER * cur, int flags) */ mutt_error _("No tagged messages are visible!"); - return (-1); + return -1; } } else @@ -715,7 +714,7 @@ envelope_defaults (ENVELOPE * env, CONTEXT * ctx, HEADER * cur, int flags) if ((flags & SENDLISTREPLY) && !env->to) { mutt_error _("No mailing lists found!"); - return (-1); + return -1; } mutt_make_misc_reply_headers (env, ctx, cur, curenv); @@ -724,7 +723,7 @@ envelope_defaults (ENVELOPE * env, CONTEXT * ctx, HEADER * cur, int flags) else if (flags & SENDFORWARD) mutt_make_forward_subject (env, ctx, cur); - return (0); + return 0; } static int generate_body (FILE * tempfp, /* stream for outgoing message */ @@ -741,7 +740,7 @@ static int generate_body (FILE * tempfp, /* stream for outgoing message * if ((i = query_quadoption (OPT_INCLUDE, _("Include message in reply?"))) == -1) - return (-1); + return -1; if (i == M_YES) { mutt_message _("Including quoted message..."); @@ -753,7 +752,7 @@ static int generate_body (FILE * tempfp, /* stream for outgoing message * if (include_reply (ctx, h, tempfp) == -1) { mutt_error _("Could not include all requested messages!"); - return (-1); + return -1; } fputc ('\n', tempfp); } @@ -810,7 +809,7 @@ static int generate_body (FILE * tempfp, /* stream for outgoing message * mutt_clear_error (); - return (0); + return 0; } void mutt_set_followup_to (ENVELOPE * e) @@ -914,7 +913,7 @@ address_t *mutt_default_from (void) adr->mailbox = m_strdup(NONULL(mod_core.username)); } - return (adr); + return adr; } static int send_message (HEADER * msg) @@ -934,19 +933,19 @@ static int send_message (HEADER * msg) if ((mutt_write_mime_body (msg->content, tempfp) == -1)) { m_fclose(&tempfp); unlink (tempfile); - return (-1); + return -1; } if (m_fclose(&tempfp) != 0) { mutt_perror (_("Can't create temporary file")); unlink (tempfile); - return (-1); + return -1; } i = mutt_invoke_mta (msg->env->from, msg->env->to, msg->env->cc, msg->env->bcc, tempfile, (msg->content->encoding == ENC8BIT)); - return (i); + return i; } /* rfc2047 encode the content-descriptions */ @@ -1341,7 +1340,8 @@ int ci_send_message (int flags, /* send mode */ killfrom = 1; /* no need to check $use_from because if the user specified a from address it would have already been set by now */ } - mutt_select_fcc (fcc, sizeof (fcc), msg); + m_strcpy(fcc, sizeof(fcc), NONULL(MAlias.record)); + mutt_pretty_mailbox(fcc); if (killfrom) { address_list_wipe(&msg->env->from); killfrom = 0; @@ -1439,7 +1439,7 @@ int ci_send_message (int flags, /* send mode */ if (quadoption (OPT_ATTACH) == M_YES) { mutt_message _("No attachments made but indicator found in text. " "Abort sending."); - sleep (2); + mutt_sleep (2); } mutt_message (_("Mail not sent.")); goto main_loop;