#endif
#include "mutt.h"
+#include "enter.h"
+#include "ascii.h"
#include "mutt_curses.h"
#include "rfc2047.h"
+#include "rfc3676.h"
#include "keymap.h"
#include "mime.h"
#include "copy.h"
#include "mutt_crypt.h"
#include "mutt_idna.h"
#include "url.h"
+#include "attach.h"
#include "lib/mem.h"
#include "lib/intl.h"
mutt_error (_("Error: '%s' is a bad IDN."), err);
mutt_refresh ();
mutt_sleep (2);
- FREE (&err);
+ mem_free (&err);
}
}
while (idna_ok != 0);
buf[0] = 0;
if (mutt_get_field ("Newsgroups: ", buf, sizeof (buf), 0) != 0)
return (-1);
- FREE (&en->newsgroups);
- en->newsgroups = safe_strdup (buf);
+ mem_free (&en->newsgroups);
+ en->newsgroups = str_dup (buf);
if (en->followup_to)
strfcpy (buf, en->followup_to, sizeof (buf));
if (option (OPTASKFOLLOWUP)
&& mutt_get_field ("Followup-To: ", buf, sizeof (buf), 0) != 0)
return (-1);
- FREE (&en->followup_to);
- en->followup_to = safe_strdup (buf);
+ mem_free (&en->followup_to);
+ en->followup_to = str_dup (buf);
if (en->x_comment_to)
strfcpy (buf, en->x_comment_to, sizeof (buf));
if (option (OPTXCOMMENTTO) && option (OPTASKXCOMMENTTO)
&& mutt_get_field ("X-Comment-To: ", buf, sizeof (buf), 0) != 0)
return (-1);
- FREE (&en->x_comment_to);
- en->x_comment_to = safe_strdup (buf);
+ mem_free (&en->x_comment_to);
+ en->x_comment_to = str_dup (buf);
}
else
#endif
char *nntp_get_header (const char *s)
{
SKIPWS (s);
- return safe_strdup (s);
+ return str_dup (s);
}
#endif
}
else
last = env->userhdrs = mutt_new_list ();
- last->data = safe_strdup (uh->data);
+ last->data = str_dup (uh->data);
}
}
}
-LIST *mutt_copy_list (LIST * p)
-{
- LIST *t, *r = NULL, *l = NULL;
-
- for (; p; p = p->next) {
- t = (LIST *) safe_malloc (sizeof (LIST));
- t->data = safe_strdup (p->data);
- t->next = NULL;
- if (l) {
- r->next = t;
- r = r->next;
- }
- else
- l = r = t;
- }
- return (l);
-}
-
void mutt_forward_intro (FILE * fp, HEADER * cur)
{
char buffer[STRING];
if (e->message_id) {
t = mutt_new_list ();
- t->data = safe_strdup (e->message_id);
+ t->data = str_dup (e->message_id);
t->next = l;
l = t;
}
* been taken from a List-Post header. Is that correct?
*/
if (curenv->real_subj) {
- FREE (&env->subject);
- env->subject = safe_malloc (mutt_strlen (curenv->real_subj) + 5);
+ mem_free (&env->subject);
+ env->subject = mem_malloc (str_len (curenv->real_subj) + 5);
sprintf (env->subject, "Re: %s", curenv->real_subj); /* __SPRINTF_CHECKED__ */
}
else if (!env->subject)
- env->subject = safe_strdup ("Re: your mail");
+ env->subject = str_dup ("Re: your mail");
#ifdef USE_NNTP
if (option (OPTNEWSSEND) && option (OPTXCOMMENTTO) && curenv->from)
- env->x_comment_to = safe_strdup (mutt_get_name (curenv->from));
+ env->x_comment_to = str_dup (mutt_get_name (curenv->from));
#endif
}
if (curenv->message_id) {
*q = mutt_new_list ();
- (*q)->data = safe_strdup (curenv->message_id);
+ (*q)->data = str_dup (curenv->message_id);
}
if (pp)
if ((flags & SENDNEWS)) {
/* in case followup set Newsgroups: with Followup-To: if it present */
if (!env->newsgroups && curenv &&
- safe_strcasecmp (curenv->followup_to, "poster"))
- env->newsgroups = safe_strdup (curenv->followup_to);
+ str_casecmp (curenv->followup_to, "poster"))
+ env->newsgroups = str_dup (curenv->followup_to);
}
else
#endif
#ifdef USE_NNTP
if (option (OPTNEWSSEND)) {
if (!e->followup_to && e->newsgroups && (strrchr (e->newsgroups, ',')))
- e->followup_to = safe_strdup (e->newsgroups);
+ e->followup_to = str_dup (e->newsgroups);
return;
}
#endif
if (tmp) {
tmp = rfc822_cpy_adr_real (tmp);
if (!option (OPTREVREAL))
- FREE (&tmp->personal);
+ mem_free (&tmp->personal);
if (!tmp->personal)
- tmp->personal = safe_strdup (Realname);
+ tmp->personal = str_dup (Realname);
}
return (tmp);
}
else if (option (OPTUSEDOMAIN)) {
adr = rfc822_new_address ();
adr->mailbox =
- safe_malloc (mutt_strlen (Username) + mutt_strlen (fqdn) + 2);
+ mem_malloc (str_len (Username) + str_len (fqdn) + 2);
sprintf (adr->mailbox, "%s@%s", NONULL (Username), NONULL (fqdn)); /* __SPRINTF_CHECKED__ */
}
else {
adr = rfc822_new_address ();
- adr->mailbox = safe_strdup (NONULL (Username));
+ adr->mailbox = str_dup (NONULL (Username));
}
return (adr);
/* save current value of "pgp_sign_as" */
char *signas = NULL;
char *tag = NULL, *err = NULL;
+ char *ctype;
int rv = -1;
if ((WithCrypto & APPLICATION_PGP) && (flags & SENDPOSTPONED))
- signas = safe_strdup (PgpSignAs);
+ signas = str_dup (PgpSignAs);
/* Delay expansion of aliases until absolutely necessary--shouldn't
* be necessary unless we are prompting the user or about to execute a
pbody->next = msg->content; /* don't kill command-line attachments */
msg->content = pbody;
- mutt_parse_content_type (ContentType, msg->content);
+ ctype = str_dup (ContentType);
+ mutt_parse_content_type (ctype, msg->content);
+ mem_free (&ctype);
+
msg->content->unlink = 1;
msg->content->use_disp = 0;
msg->content->disposition = DISPINLINE;
if (option (OPTTEXTFLOWED) && msg->content->type == TYPETEXT
- && !ascii_strcasecmp (msg->content->subtype, "plain"))
+ && !ascii_strcasecmp (msg->content->subtype, "plain")) {
mutt_set_parameter ("format", "flowed", &msg->content->parameter);
+ if (option (OPTDELSP))
+ mutt_set_parameter ("delsp", "yes", &msg->content->parameter);
+ }
if (!tempfile) {
mutt_mktemp (buffer);
tempfp = safe_fopen (buffer, "w+");
- msg->content->filename = safe_strdup (buffer);
+ msg->content->filename = str_dup (buffer);
}
else {
tempfp = safe_fopen (tempfile, "a+");
- msg->content->filename = safe_strdup (tempfile);
+ msg->content->filename = str_dup (tempfile);
}
if (!tempfp) {
#ifdef USE_NNTP
if ((flags & SENDNEWS) && ctx && ctx->magic == M_NNTP
&& !msg->env->newsgroups)
- msg->env->newsgroups = safe_strdup (((NNTP_DATA *) ctx->data)->group);
+ msg->env->newsgroups = str_dup (((NNTP_DATA *) ctx->data)->group);
#endif
if (!(flags & SENDMAILX) &&
if (option (OPTSIGONTOP)
&& (!(flags & (SENDMAILX | SENDKEY)) && Editor
- && mutt_strcmp (Editor, "builtin") != 0))
+ && str_cmp (Editor, "builtin") != 0))
append_signature (tempfp);
/* include replies/forwarded messages, unless we are given a template */
if (!option (OPTSIGONTOP)
&& (!(flags & (SENDMAILX | SENDKEY)) && Editor
- && mutt_strcmp (Editor, "builtin") != 0))
+ && str_cmp (Editor, "builtin") != 0))
append_signature (tempfp);
/*
that $realname can be set in a send-hook */
if (msg->env->from && !msg->env->from->personal
&& !(flags & (SENDRESEND | SENDPOSTPONED)))
- msg->env->from->personal = safe_strdup (Realname);
+ msg->env->from->personal = str_dup (Realname);
if (!((WithCrypto & APPLICATION_PGP) && (flags & SENDKEY)))
safe_fclose (&tempfp);
query_quadoption (OPT_FORWEDIT,
_("Edit forwarded message?")) == M_YES)) {
/* If the this isn't a text message, look for a mailcap edit command */
- if (mutt_needs_mailcap (msg->content))
- mutt_edit_attachment (msg->content);
- else if (!Editor || mutt_strcmp ("builtin", Editor) == 0)
+ if (mutt_needs_mailcap (msg->content)) {
+ if (!mutt_edit_attachment (msg->content))
+ goto cleanup;
+ } else if (!Editor || str_cmp ("builtin", Editor) == 0)
mutt_builtin_editor (msg->content->filename, msg, cur);
else if (option (OPTEDITHDRS)) {
mutt_env_to_local (msg->env);
else
mutt_edit_file (Editor, msg->content->filename);
+ if (option (OPTTEXTFLOWED))
+ rfc3676_space_stuff (msg);
+
mutt_message_hook (NULL, msg, M_SEND2HOOK);
}
if (mutt_env_to_idna (msg->env, &tag, &err)) {
mutt_error (_("Bad IDN in \"%s\": '%s'"), tag, err);
- FREE (&err);
+ mem_free (&err);
if (!(flags & SENDBATCH))
goto main_loop;
else
if (msg->content->next)
msg->content = mutt_make_multipart (msg->content);
+ if (mutt_attach_check (msg) &&
+ !msg->content->next &&
+ query_quadoption (OPT_ATTACH,
+ _("No attachments made but indicator found in text. "
+ "Cancel sending?")) == M_YES) {
+ if (quadoption (OPT_ATTACH) == M_YES) {
+ mutt_message _("No attachments made but indicator found in text. "
+ "Abort sending.");
+ sleep (2);
+ }
+ mutt_message (_("Mail not sent."));
+ goto main_loop;
+ }
+
/*
* Ok, we need to do it this way instead of handling all fcc stuff in
* one place in order to avoid going to main_loop with encoded "env"
mutt_protect (msg, pgpkeylist) == -1) {
msg->content = mutt_remove_multipart (msg->content);
- FREE (&pgpkeylist);
+ mem_free (&pgpkeylist);
decode_descriptions (msg->content);
goto main_loop;
fcc[0] = '\0';
#endif
- if (*fcc && mutt_strcmp ("/dev/null", fcc) != 0) {
+ if (*fcc && str_cmp ("/dev/null", fcc) != 0) {
BODY *tmpbody = msg->content;
BODY *save_sig = NULL;
BODY *save_parts = NULL;
/* check to see if the user wants copies of all attachments */
if (!option (OPTFCCATTACH) && msg->content->type == TYPEMULTIPART) {
if (WithCrypto
- && (mutt_strcmp (msg->content->subtype, "encrypted") == 0 ||
- mutt_strcmp (msg->content->subtype, "signed") == 0)) {
+ && (str_cmp (msg->content->subtype, "encrypted") == 0 ||
+ str_cmp (msg->content->subtype, "signed") == 0)) {
if (clear_content->type == TYPEMULTIPART) {
if (!(msg->security & ENCRYPT) && (msg->security & SIGN)) {
/* save initial signature and attachments */
#endif
if (WithCrypto && (msg->security & ENCRYPT))
- FREE (&pgpkeylist);
+ mem_free (&pgpkeylist);
if (WithCrypto && free_clear_content)
mutt_free_body (&clear_content);
if ((WithCrypto & APPLICATION_PGP) && (flags & SENDPOSTPONED)) {
if (signas) {
- FREE (&PgpSignAs);
+ mem_free (&PgpSignAs);
PgpSignAs = signas;
}
}
projects / apps / madmutt.git / blobdiff