string_list_wipe(&tmp);
tmp = next;
}
-
-#ifdef MIXMASTER
else if (m_strncmp("X-Mutt-Mix:", tmp->data, 11) == 0) {
char *t;
string_list_wipe(&tmp);
tmp = next;
}
-#endif
-
else {
last = tmp;
tmp = tmp->next;
s.flags = 0;
if (b->type == TYPETEXT) {
- if (!ascii_strcasecmp
- ("yes", parameter_getval(b->parameter, "x-mutt-noconv")))
- b->noconv = 1;
- else {
+ b->noconv = !ascii_strcasecmp("yes", parameter_getval(b->parameter,
+ "x-mutt-noconv"));
+ if (b->noconv)
s.flags |= M_CHARCONV;
- b->noconv = 0;
- }
parameter_delval(&b->parameter, "x-mutt-noconv");
}
- mutt_adv_mktemp (NULL, file, sizeof (file));
- if ((s.fpout = safe_fopen (file, "w")) == NULL)
+ s.fpout = m_tempfile(file, sizeof(file), NONULL(Tempdir), file);
+ if (!s.fpout)
goto bail;
-
if (mutt_is_application_pgp (b) & (ENCRYPT | SIGN)) {
mutt_body_handler (b, &s);
/* that's it. */
if (bfp != fp)
- fclose (bfp);
+ m_fclose(&bfp);
if (msg)
mx_close_message (&msg);