#endif
#include "mutt.h"
+#include "enter.h"
+#include "ascii.h"
#include "mutt_curses.h"
#include "rfc2047.h"
#include "keymap.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);
+ mem_free (&en->newsgroups);
en->newsgroups = str_dup (buf);
if (en->followup_to)
if (option (OPTASKFOLLOWUP)
&& mutt_get_field ("Followup-To: ", buf, sizeof (buf), 0) != 0)
return (-1);
- FREE (&en->followup_to);
+ mem_free (&en->followup_to);
en->followup_to = str_dup (buf);
if (en->x_comment_to)
if (option (OPTXCOMMENTTO) && option (OPTASKXCOMMENTTO)
&& mutt_get_field ("X-Comment-To: ", buf, sizeof (buf), 0) != 0)
return (-1);
- FREE (&en->x_comment_to);
+ mem_free (&en->x_comment_to);
en->x_comment_to = str_dup (buf);
}
else
}
}
-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 = str_dup (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];
* been taken from a List-Post header. Is that correct?
*/
if (curenv->real_subj) {
- FREE (&env->subject);
- env->subject = safe_malloc (str_len (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)
if (tmp) {
tmp = rfc822_cpy_adr_real (tmp);
if (!option (OPTREVREAL))
- FREE (&tmp->personal);
+ mem_free (&tmp->personal);
if (!tmp->personal)
tmp->personal = str_dup (Realname);
}
else if (option (OPTUSEDOMAIN)) {
adr = rfc822_new_address ();
adr->mailbox =
- safe_malloc (str_len (Username) + str_len (fqdn) + 2);
+ mem_malloc (str_len (Username) + str_len (fqdn) + 2);
sprintf (adr->mailbox, "%s@%s", NONULL (Username), NONULL (fqdn)); /* __SPRINTF_CHECKED__ */
}
else {
/* save current value of "pgp_sign_as" */
char *signas = NULL;
char *tag = NULL, *err = NULL;
+ char *ctype;
int rv = -1;
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 (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
mutt_protect (msg, pgpkeylist) == -1) {
msg->content = mutt_remove_multipart (msg->content);
- FREE (&pgpkeylist);
+ mem_free (&pgpkeylist);
decode_descriptions (msg->content);
goto main_loop;
#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;
}
}