#include <lib-mime/mime.h>
#include <lib-mime/rfc3676.h>
#include <lib-sys/unix.h>
-#include <lib-ui/curses.h>
-#include <lib-ui/enter.h>
+#include <lib-ui/lib-ui.h>
#include <lib-mx/mx.h>
#include "alias.h"
#include "keymap.h"
#include "copy.h"
-#include <lib-crypt/crypt.h>
+#include "crypt.h"
#include "mutt_idna.h"
#include "attach.h"
-#ifdef USE_NNTP
-#include <nntp/nntp.h>
-#endif
-
-#include "remailer.h"
+int url_parse_mailto(ENVELOPE *e, char **body, const char *src)
+{
+ char *t;
+ char *tmp;
+ char *headers;
+ char *tag, *value;
+ char scratch[HUGE_STRING];
+
+ int taglen;
+
+ string_list_t **last = &e->userhdrs;
+
+ if (!(t = strchr (src, ':')))
+ return -1;
+
+ if ((tmp = m_strdup(t + 1)) == NULL)
+ return -1;
+
+ if ((headers = strchr (tmp, '?')))
+ *headers++ = '\0';
+
+ url_decode(tmp);
+ e->to = rfc822_parse_adrlist(e->to, tmp);
+
+ tag = headers ? strtok (headers, "&") : NULL;
+
+ for (; tag; tag = strtok(NULL, "&")) {
+ if ((value = strchr (tag, '=')))
+ *value++ = '\0';
+ if (!value || !*value)
+ continue;
+
+ url_decode (tag);
+ url_decode (value);
+
+ if (mime_which_token(tag, -1) == MIME_BODY) {
+ if (body)
+ m_strreplace(body, value);
+ } else {
+#define SAFEPFX (option(OPTSTRICTMAILTO) ? "" : "X-Mailto-")
+ taglen = m_strlen(tag) + strlen(SAFEPFX);
+ /* mutt_parse_rfc822_line makes some assumptions */
+ snprintf(scratch, sizeof(scratch), "%s%s: %s", SAFEPFX, tag, value);
+#undef SAVEPFX
+ scratch[taglen] = '\0';
+ value = vskipspaces(&scratch[taglen + 1]);
+ last = mutt_parse_rfc822_line (e, NULL, scratch, value, 0, 0, last);
+ /* if $strict_mailto is set, force editing headers to let
+ * users have a look at what we got */
+ if (!option (OPTSTRICTMAILTO)) {
+ set_option (OPTXMAILTO);
+ set_option (OPTEDITHDRS);
+ }
+ }
+ }
+ p_delete(&tmp);
+ return 0;
+}
static void append_signature (FILE * f)
{
FILE *tmpfp;
fprintf (f, "\n%s", SignOffString);
}
- if (Signature && (tmpfp = mutt_open_read (Signature, &thepid))) {
+ if ((tmpfp = mutt_open_read(NONULL(MAlias.signature), &thepid))) {
if (option (OPTSIGDASHES))
fputs ("\n-- \n", f);
else if (SignOffString)
{
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" */
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) {
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);
-
- if (en->x_comment_to)
- m_strcpy(buf, sizeof(buf), en->x_comment_to);
- else
- buf[0] = 0;
- if (option (OPTXCOMMENTTO) && option (OPTASKXCOMMENTTO)
- && mutt_get_field ("X-Comment-To: ", buf, sizeof (buf), 0) != 0)
- return (-1);
- p_delete(&en->x_comment_to);
- en->x_comment_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);
}
}
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]
!= 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;
+ string_list_t *uh = UserHeader;
- for (; uh; uh = uh->next) {
- if (ascii_strncasecmp ("to:", uh->data, 3) == 0)
- env->to = rfc822_parse_adrlist (env->to, uh->data + 3);
- else if (ascii_strncasecmp ("cc:", uh->data, 3) == 0)
- env->cc = rfc822_parse_adrlist (env->cc, uh->data + 3);
- else if (ascii_strncasecmp ("bcc:", uh->data, 4) == 0)
- env->bcc = rfc822_parse_adrlist (env->bcc, uh->data + 4);
-#ifdef USE_NNTP
- else if (ascii_strncasecmp ("newsgroups:", uh->data, 11) == 0)
- env->newsgroups = nntp_get_header (uh->data + 11);
- else if (ascii_strncasecmp ("followup-to:", uh->data, 12) == 0)
- env->followup_to = nntp_get_header (uh->data + 12);
- else if (ascii_strncasecmp ("x-comment-to:", uh->data, 13) == 0)
- env->x_comment_to = nntp_get_header (uh->data + 13);
-#endif
- }
+ for (; uh; uh = uh->next) {
+ const char *p = strchr(uh->data, ':');
+ if (!p)
+ continue;
+
+ switch (mime_which_token(uh->data, p++ - uh->data)) {
+ case MIME_TO:
+ env->to = rfc822_parse_adrlist(env->to, p);
+ break;
+ case MIME_CC:
+ env->cc = rfc822_parse_adrlist(env->cc, p);
+ break;
+ case MIME_BCC:
+ env->bcc = rfc822_parse_adrlist(env->bcc, p);
+ break;
+ default: break;
+ }
+ }
}
-static void process_user_header (ENVELOPE * env)
+static void process_user_header(ENVELOPE * env)
{
- string_list_t *uh = UserHeader;
- string_list_t *last = env->userhdrs;
-
- if (last)
- while (last->next)
- last = last->next;
-
- for (; uh; uh = uh->next) {
- if (ascii_strncasecmp ("from:", uh->data, 5) == 0) {
- /* User has specified a default From: address. Remove default address */
- address_list_wipe(&env->from);
- env->from = rfc822_parse_adrlist (env->from, uh->data + 5);
- }
- else if (ascii_strncasecmp ("reply-to:", uh->data, 9) == 0) {
- address_list_wipe(&env->reply_to);
- env->reply_to = rfc822_parse_adrlist (env->reply_to, uh->data + 9);
- }
- else if (ascii_strncasecmp ("message-id:", uh->data, 11) == 0)
- m_strreplace(&env->message_id, uh->data + 11);
- else if (ascii_strncasecmp ("to:", uh->data, 3) != 0 &&
- ascii_strncasecmp ("cc:", uh->data, 3) != 0 &&
- ascii_strncasecmp ("bcc:", uh->data, 4) != 0 &&
-#ifdef USE_NNTP
- ascii_strncasecmp ("newsgroups:", uh->data, 11) != 0 &&
- ascii_strncasecmp ("followup-to:", uh->data, 12) != 0 &&
- ascii_strncasecmp ("x-comment-to:", uh->data, 13) != 0 &&
-#endif
- ascii_strncasecmp ("supersedes:", uh->data, 11) != 0 &&
- ascii_strncasecmp ("subject:", uh->data, 8) != 0) {
- if (last) {
- last->next = string_item_new();
- last = last->next;
- }
- else
- last = env->userhdrs = string_item_new();
- last->data = m_strdup(uh->data);
+ string_list_t *uh;
+ string_list_t **last = string_list_last(&env->userhdrs);
+
+ for (uh = UserHeader; uh; uh = uh->next) {
+ const char *p = strchr(uh->data, ':');
+ if (!p)
+ continue;
+
+ switch (mime_which_token(uh->data, p++ - uh->data)) {
+ case MIME_FROM:
+ /* User has specified a default From: address. Remove default address */
+ address_list_wipe(&env->from);
+ env->from = rfc822_parse_adrlist(env->from, p);
+ break;
+
+ case MIME_REPLY_TO:
+ address_list_wipe(&env->reply_to);
+ env->reply_to = rfc822_parse_adrlist (env->reply_to, p);
+ break;
+
+ case MIME_MESSAGE_ID:
+ m_strreplace(&env->message_id, p);
+ break;
+
+ case MIME_TO:
+ case MIME_CC:
+ case MIME_BCC:
+ case MIME_SUPERSEDES:
+ case MIME_SUPERCEDES:
+ case MIME_SUBJECT:
+ break;
+
+ default:
+ *last = string_item_new();
+ (*last)->data = m_strdup(uh->data);
+ last = &(*last)->next;
+ break;
+ }
}
- }
}
void mutt_forward_intro (FILE * fp, HEADER * cur)
mutt_parse_mime_message (ctx, cur);
mutt_message_hook (ctx, cur, M_MESSAGEHOOK);
- if ((cur->security & ENCRYPT) && option (OPTFORWDECODE)) {
- /* make sure we have the user's passphrase before proceeding... */
- crypt_valid_passphrase (cur->security);
- }
-
mutt_forward_intro (out, cur);
if (option (OPTFORWDECODE)) {
}
}
-void mutt_make_post_indent (CONTEXT * ctx, HEADER * cur, FILE * out)
-{
- char buffer[STRING];
-
- if (PostIndentString) {
- mutt_make_string (buffer, sizeof (buffer), PostIndentString, ctx, cur);
- fputs (buffer, out);
- fputc ('\n', out);
- }
-}
-
static int include_reply (CONTEXT * ctx, HEADER * cur, FILE * out)
{
int cmflags = M_CM_PREFIX | M_CM_DECODE | M_CM_CHARCONV | M_CM_REPLYING;
int chflags = CH_DECODE;
- if ((cur->security & ENCRYPT)) {
- /* make sure we have the user's passphrase before proceeding... */
- crypt_valid_passphrase (cur->security);
- }
-
mutt_parse_mime_message (ctx, cur);
mutt_message_hook (ctx, cur, M_MESSAGEHOOK);
-
mutt_make_attribution (ctx, cur, out);
if (!option (OPTHEADER))
}
mutt_copy_message (out, ctx, cur, cmflags, chflags);
-
- mutt_make_post_indent (ctx, cur, out);
-
return 0;
}
}
}
- 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));
}
break;
default:
- return (-1); /* abort */
+ return -1; /* abort */
}
}
else
else
address_list_append(to, address_list_dup(env->from));
- return (0);
+ return 0;
}
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))
}
else if (!env->subject)
env->subject = m_strdup("Re: your mail");
-
-#ifdef USE_NNTP
- if (option (OPTNEWSSEND) && option (OPTXCOMMENTTO) && curenv->from)
- env->x_comment_to = m_strdup(mutt_get_name (curenv->from));
-#endif
}
static string_list_t *mutt_make_references (ENVELOPE * e)
*/
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;
if ((flags & SENDLISTREPLY) && !env->to) {
mutt_error _("No mailing lists found!");
- return (-1);
+ return -1;
}
mutt_make_misc_reply_headers (env, ctx, cur, curenv);
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 */
if ((i =
query_quadoption (OPT_INCLUDE,
_("Include message in reply?"))) == -1)
- return (-1);
+ return -1;
if (i == M_YES) {
mutt_message _("Including quoted message...");
if (include_reply (ctx, h, tempfp) == -1) {
mutt_error _("Could not include all requested messages!");
- return (-1);
+ return -1;
}
fputc ('\n', tempfp);
}
else if (i == -1)
return -1;
}
- else if (flags & SENDKEY) {
- BODY *btmp;
-
- if ((btmp = crypt_pgp_make_key_attachment (NULL)) == NULL)
- return -1;
-
- btmp->next = msg->content;
- msg->content = btmp;
- }
mutt_clear_error ();
- return (0);
+ return 0;
}
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;
* Is this the right thing to do?
*/
- if (From)
- adr = address_dup(From);
- else if (option (OPTUSEDOMAIN)) {
+ if (MAlias.from)
+ adr = address_dup(MAlias.from);
+ else if (mod_core.use_domain) {
const char *fqdn = mutt_fqdn (1);
adr = address_new();
- adr->mailbox = p_new(char, m_strlen(Username) + m_strlen(fqdn) + 2);
- sprintf(adr->mailbox, "%s@%s", NONULL(Username), NONULL(fqdn));
+ adr->mailbox = p_new(char, m_strlen(mod_core.username) + m_strlen(fqdn) + 2);
+ sprintf(adr->mailbox, "%s@%s", NONULL(mod_core.username), NONULL(fqdn));
} else {
adr = address_new ();
- adr->mailbox = m_strdup(NONULL(Username));
+ adr->mailbox = m_strdup(NONULL(mod_core.username));
}
- return (adr);
+ return adr;
}
static int send_message (HEADER * msg)
int i;
/* Write out the message in MIME form. */
- tempfp = m_tempfile(tempfile, sizeof(tempfile), NONULL(Tempdir), NULL);
+ tempfp = m_tempfile(tempfile, sizeof(tempfile), NONULL(mod_core.tmpdir), NULL);
if (!tempfp)
return -1;
- mutt_write_rfc822_header (tempfp, msg->env, msg->content, 0,
- msg->chain ? 1 : 0);
+ mutt_write_rfc822_header (tempfp, msg->env, msg->content, 0);
fputc ('\n', tempfp); /* tie off the header. */
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;
}
- if (msg->chain)
- return mix_send_message (msg->chain, tempfile);
-
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 */
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
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)) {
address_list_wipe(&msg->env->from);
}
- if (!(flags & (SENDKEY | SENDPOSTPONED | SENDRESEND))) {
+ if (!(flags & (SENDPOSTPONED | SENDRESEND))) {
pbody = body_new();
pbody->next = msg->content; /* don't kill command-line attachments */
msg->content = pbody;
if (!tempfile) {
char buffer[_POSIX_PATH_MAX];
- tempfp = m_tempfile(buffer, sizeof(buffer), NONULL(Tempdir), NULL);
+ tempfp = m_tempfile(buffer, sizeof(buffer), NONULL(mod_core.tmpdir), NULL);
msg->content->filename = m_strdup(buffer);
} else {
tempfp = safe_fopen(tempfile, "a+");
if (flags & SENDBATCH) {
mutt_copy_stream (stdin, tempfp);
- if (option (OPTHDRS)) {
- process_user_recips (msg->env);
- process_user_header (msg->env);
- }
+ process_user_recips (msg->env);
+ process_user_header (msg->env);
mutt_expand_aliases_env (msg->env);
}
else if (!(flags & (SENDPOSTPONED | SENDRESEND))) {
envelope_defaults (msg->env, ctx, cur, flags) == -1)
goto cleanup;
- if (option (OPTHDRS))
- process_user_recips (msg->env);
+ process_user_recips (msg->env);
/* 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 *) ctx->data)->group);
-#endif
-
if (!(option (OPTAUTOEDIT) && option (OPTEDITHDRS)) &&
!((flags & SENDREPLY) && option (OPTFASTREPLY))) {
if (edit_envelope (msg->env, flags) == -1)
killfrom = 0;
}
- if (option (OPTHDRS))
- process_user_header (msg->env);
-
-
- if (option (OPTSIGONTOP) && (!(flags & SENDKEY) && Editor))
- append_signature (tempfp);
+ process_user_header (msg->env);
/* include replies/forwarded messages, unless we are given a template */
if (!tempfile && (ctx || !(flags & (SENDREPLY | SENDFORWARD)))
&& generate_body (tempfp, msg, flags, ctx, cur) == -1)
goto cleanup;
- if (!option (OPTSIGONTOP) && (!(flags & SENDKEY) && Editor))
- append_signature (tempfp);
+ append_signature (tempfp);
/*
* this wants to be done _after_ generate_body, so message-hooks
* can take effect.
*/
- if (option (OPTCRYPTAUTOSIGN))
+ if (mod_crypt.autosign)
msg->security |= SIGN;
- if (option (OPTCRYPTAUTOENCRYPT))
+ if (mod_crypt.autoencrypt)
msg->security |= ENCRYPT;
- if (option (OPTCRYPTREPLYENCRYPT) && cur && (cur->security & ENCRYPT))
+ if (mod_crypt.replyencrypt && cur && (cur->security & ENCRYPT))
msg->security |= ENCRYPT;
- if (option (OPTCRYPTREPLYSIGN) && cur && (cur->security & SIGN))
+ if (mod_crypt.replysign && cur && (cur->security & SIGN))
msg->security |= SIGN;
- if (option (OPTCRYPTREPLYSIGNENCRYPTED) && cur
- && (cur->security & ENCRYPT))
+ if (mod_crypt.replysignencrypted && cur && (cur->security & ENCRYPT))
msg->security |= SIGN;
- if (msg->security & (ENCRYPT | SIGN)) {
- if (option (OPTPGPAUTOINLINE))
- msg->security |= INLINE;
- if (option (OPTPGPREPLYINLINE) && cur && (cur->security & INLINE))
- msg->security |= INLINE;
- }
if (msg->security) {
/*
* disable individual mechanisms at run-time?
*/
if (cur) {
- if (option (OPTCRYPTAUTOPGP) && (cur->security & APPLICATION_PGP))
+ if (mod_crypt.autopgp && (cur->security & APPLICATION_PGP))
msg->security |= APPLICATION_PGP;
- else if (option (OPTCRYPTAUTOSMIME)
- && (cur->security & APPLICATION_SMIME))
+ else if (mod_crypt.autosmime && (cur->security & APPLICATION_SMIME))
msg->security |= APPLICATION_SMIME;
}
* for the decision.
*/
if (!(msg->security & (APPLICATION_SMIME | APPLICATION_PGP))) {
- if (option (OPTCRYPTAUTOSMIME) && option (OPTSMIMEISDEFAULT))
+ if (mod_crypt.autosmime && mod_crypt.smime_is_default)
msg->security |= APPLICATION_SMIME;
- else if (option (OPTCRYPTAUTOPGP))
+ else if (mod_crypt.autopgp)
msg->security |= APPLICATION_PGP;
- else if (option (OPTCRYPTAUTOSMIME))
+ else if (mod_crypt.autosmime)
msg->security |= APPLICATION_SMIME;
}
}
&& !(flags & (SENDRESEND | SENDPOSTPONED)))
msg->env->from->personal = m_strdup(Realname);
- if (!(flags & SENDKEY))
- m_fclose(&tempfp);
+ m_fclose(&tempfp);
if (!(flags & SENDBATCH)) {
struct stat st;
* setting of $forward_edit because the user probably needs to add the
* recipients.
*/
- if (!(flags & SENDKEY) &&
- ((flags & SENDFORWARD) == 0 ||
+ if (((flags & SENDFORWARD) == 0 ||
(option (OPTEDITHDRS) && option (OPTAUTOEDIT)) ||
query_quadoption (OPT_FORWEDIT,
- _("Edit forwarded message?")) == M_YES)) {
+ _("Edit forwarded message?")) == M_YES))
+ {
/* If the this isn't a text message, look for a mailcap edit command */
if (rfc1524_mailcap_isneeded(msg->content)) {
if (!mutt_edit_attachment (msg->content))
goto cleanup;
} else if (option (OPTEDITHDRS)) {
mutt_env_to_local (msg->env);
- mutt_edit_headers (Editor, msg->content->filename, msg, fcc,
- sizeof (fcc));
+ mutt_edit_headers(msg->content->filename, msg, fcc, sizeof (fcc));
mutt_env_to_idna (msg->env, NULL, NULL);
}
else {
- mutt_edit_file (Editor, msg->content->filename);
+ mutt_edit_file(msg->content->filename);
if (stat (msg->content->filename, &st) == 0) {
if (mtime != st.st_mtime)
mutt_message_hook (NULL, msg, M_SEND2HOOK);
}
- if (!(flags & (SENDPOSTPONED | SENDFORWARD | SENDKEY | SENDRESEND))) {
+ if (!(flags & (SENDPOSTPONED | SENDFORWARD | SENDRESEND))) {
if (stat (msg->content->filename, &st) == 0) {
/* if the file was not modified, bail out now */
if (mtime == st.st_mtime && !msg->content->next &&
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;
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) {
}
}
-#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);
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);
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;
}
}
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);