X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=send.c;h=2ec0954db4a31bd99a52f67261d2f9144fc1f301;hp=62207d2e7a690e94175023fbde2fb175d0e1ce6d;hb=95986f5aee1c2ee7d12c4b1e4bc47874856c5831;hpb=5fbd8a74d24624a118c9b835b136c73b8da076d7 diff --git a/send.c b/send.c index 62207d2..2ec0954 100644 --- a/send.c +++ b/send.c @@ -12,8 +12,7 @@ #include #include #include -#include -#include +#include #include #include "alias.h" @@ -23,10 +22,6 @@ #include "mutt_idna.h" #include "attach.h" -#ifdef USE_NNTP -#include "nntp.h" -#endif - int url_parse_mailto(ENVELOPE *e, char **body, const char *src) { char *t; @@ -122,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" */ @@ -223,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) { @@ -243,40 +238,16 @@ static int edit_envelope (ENVELOPE * en, int flags) string_list_t *uh = UserHeader; regmatch_t pat_match[1]; -#ifdef USE_NNTP - if (option (OPTNEWSSEND)) { - if (en->newsgroups) - m_strcpy(buf, sizeof(buf), en->newsgroups); - else - buf[0] = 0; - if (mutt_get_field ("Newsgroups: ", buf, sizeof (buf), 0) != 0) - return (-1); - p_delete(&en->newsgroups); - en->newsgroups = m_strdup(buf); - - if (en->followup_to) - m_strcpy(buf, sizeof(buf), en->followup_to); - else - buf[0] = 0; - if (option (OPTASKFOLLOWUP) - && mutt_get_field ("Followup-To: ", buf, sizeof (buf), 0) != 0) - return (-1); - p_delete(&en->followup_to); - en->followup_to = m_strdup(buf); - } else -#endif - { - if (edit_address (&en->to, "To: ") == -1 || en->to == NULL) - return (-1); - if (option (OPTASKCC) && edit_address (&en->cc, "Cc: ") == -1) - return (-1); - if (option (OPTASKBCC) && edit_address (&en->bcc, "Bcc: ") == -1) - return (-1); - } + if (edit_address (&en->to, "To: ") == -1 || en->to == NULL) + return -1; + if (option (OPTASKCC) && edit_address (&en->cc, "Cc: ") == -1) + return -1; + if (option (OPTASKBCC) && edit_address (&en->bcc, "Bcc: ") == -1) + return -1; if (en->subject) { if (option (OPTFASTREPLY)) - return (0); + return 0; else m_strcpy(buf, sizeof(buf), en->subject); } @@ -303,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] @@ -315,20 +286,13 @@ static int edit_envelope (ENVELOPE * en, int flags) != M_NO)) { mutt_message _("No subject, aborting."); - return (-1); + return -1; } m_strreplace(&en->subject, buf); return 0; } -#ifdef USE_NNTP -static char *nntp_get_header(const char *s) -{ - return m_strdup(skipspaces(s)); -} -#endif - static void process_user_recips (ENVELOPE * env) { string_list_t *uh = UserHeader; @@ -348,14 +312,6 @@ static void process_user_recips (ENVELOPE * env) case MIME_BCC: env->bcc = rfc822_parse_adrlist(env->bcc, p); break; -#ifdef USE_NNTP - case MIME_NEWSGROUPS: - env->newsgroups = nntp_get_header(p); - break; - case MIME_FOLLOWUP_TO: - env->followup_to = nntp_get_header(p); - break; -#endif default: break; } } @@ -390,10 +346,6 @@ static void process_user_header(ENVELOPE * env) case MIME_TO: case MIME_CC: case MIME_BCC: -#ifdef USE_NNTP - case MIME_NEWSGROUPS: - case MIME_FOLLOWUP_TO: -#endif case MIME_SUPERSEDES: case MIME_SUPERCEDES: case MIME_SUBJECT: @@ -510,7 +462,7 @@ static int default_to (address_t ** to, ENVELOPE * env, int flags, int hmfupto) } } - if (!option (OPTREPLYSELF) && mutt_addr_is_user (env->from)) { + if (mutt_addr_is_user(env->from)) { /* mail is from the user, assume replying to recipients */ address_list_append(to, address_list_dup(env->to)); } @@ -549,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 @@ -558,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) @@ -580,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)) @@ -740,22 +692,13 @@ envelope_defaults (ENVELOPE * env, CONTEXT * ctx, HEADER * cur, int flags) */ mutt_error _("No tagged messages are visible!"); - return (-1); + return -1; } } else curenv = cur->env; if (flags & SENDREPLY) { -#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 (tag) { HEADER *h; @@ -771,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); @@ -780,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 */ @@ -797,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..."); @@ -809,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); } @@ -866,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) @@ -878,14 +821,6 @@ void mutt_set_followup_to (ENVELOPE * e) if (!option(OPTFOLLOWUPTO)) return; -#ifdef USE_NNTP - if (option(OPTNEWSSEND)) { - if (!e->followup_to && e->newsgroups && strrchr(e->newsgroups, ',')) - e->followup_to = m_strdup(e->newsgroups); - return; - } -#endif - if (e->mail_followup_to) return; @@ -978,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) @@ -998,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 */ @@ -1088,13 +1023,6 @@ int ci_send_message (int flags, /* send mode */ int rv = -1; -#ifdef USE_NNTP - if (flags & SENDNEWS) - set_option (OPTNEWSSEND); - else - unset_option (OPTNEWSSEND); -#endif - if (!flags && !msg && quadoption (OPT_RECALL) != M_NO && mutt_num_postponed (1)) { /* If the user is composing a new message, check to see if there @@ -1124,20 +1052,6 @@ int ci_send_message (int flags, /* send mode */ if ((flags = mutt_get_postponed (ctx, msg, &cur, fcc, sizeof (fcc))) < 0) goto cleanup; -#ifdef USE_NNTP - /* - * If postponed message is a news article, it have - * a "Newsgroups:" header line, then set appropriate flag. - */ - if (msg->env->newsgroups) { - flags |= SENDNEWS; - set_option (OPTNEWSSEND); - } - else { - flags &= ~SENDNEWS; - unset_option (OPTNEWSSEND); - } -#endif } if (flags & (SENDPOSTPONED | SENDRESEND)) { @@ -1232,12 +1146,6 @@ int ci_send_message (int flags, /* send mode */ /* Expand aliases and remove duplicates/crossrefs */ mutt_fix_reply_recipients (msg->env); -#ifdef USE_NNTP - if ((flags & SENDNEWS) && ctx && ctx->magic == M_NNTP - && !msg->env->newsgroups) - msg->env->newsgroups = m_strdup(((nntp_data_t *)ctx->data)->group); -#endif - if (!(option (OPTAUTOEDIT) && option (OPTEDITHDRS)) && !((flags & SENDREPLY) && option (OPTFASTREPLY))) { if (edit_envelope (msg->env, flags) == -1) @@ -1432,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; @@ -1450,13 +1359,7 @@ int ci_send_message (int flags, /* send mode */ i = mutt_compose_menu (msg, fcc, sizeof (fcc), cur); if (i == -1) { /* abort */ -#ifdef USE_NNTP - if (flags & SENDNEWS) - mutt_message (_("Article not posted.")); - - else -#endif - mutt_message _("Mail not sent."); + mutt_message _("Mail not sent."); goto cleanup; } else if (i == 1) { @@ -1492,21 +1395,18 @@ int ci_send_message (int flags, /* send mode */ } } -#ifdef USE_NNTP - if (!(flags & SENDNEWS)) -#endif - if (!msg->env->to && !msg->env->cc && !msg->env->bcc) { - if (!(flags & SENDBATCH)) { - mutt_error _("No recipients are specified!"); + if (!msg->env->to && !msg->env->cc && !msg->env->bcc) { + if (!(flags & SENDBATCH)) { + mutt_error _("No recipients are specified!"); - goto main_loop; - } - else { - puts _("No recipients were specified."); + goto main_loop; + } + else { + puts _("No recipients were specified."); - goto cleanup; - } + goto cleanup; } + } if (mutt_env_to_idna (msg->env, &tag, &err)) { mutt_error (_("Bad IDN in \"%s\": '%s'"), tag, err); @@ -1527,19 +1427,6 @@ int ci_send_message (int flags, /* send mode */ goto main_loop; } -#ifdef USE_NNTP - if ((flags & SENDNEWS) && !msg->env->subject) { - mutt_error _("No subject specified."); - - goto main_loop; - } - - if ((flags & SENDNEWS) && !msg->env->newsgroups) { - mutt_error _("No newsgroup specified."); - - goto main_loop; - } -#endif if (msg->content->next) msg->content = mutt_make_multipart (msg->content); @@ -1552,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; @@ -1735,14 +1622,7 @@ int ci_send_message (int flags, /* send mode */ } } else if (!option (OPTNOCURSES)) - mutt_message (i != 0 ? _("Sending in background.") : -#ifdef USE_NNTP - (flags & SENDNEWS) ? _("Article posted.") : - _("Mail sent.") -#else - _("Mail sent.") -#endif - ); + mutt_message (i != 0 ? _("Sending in background.") : _("Mail sent.")); if (msg->security & ENCRYPT) p_delete(&pgpkeylist);