#endif
#include "mutt.h"
+#include "ascii.h"
+#include "handler.h"
+#include "recvattach.h"
#include "mutt_menu.h"
#include "mutt_curses.h"
#include "keymap.h"
b->parameter = NULL;
}
if (b->description) {
- FREE (&a->description);
+ mem_free (&a->description);
a->description = b->description;
b->description = NULL;
}
if (b->form_name) {
- FREE (&a->form_name);
+ mem_free (&a->form_name);
a->form_name = b->form_name;
b->form_name = NULL;
}
}
else if (a->type == TYPETEXT) {
/* On text, default to editor */
- mutt_edit_file (NONULL (Editor), newfile);
+ mutt_edit_file (NONULL (Editor), a->filename);
}
else {
rfc1524_free_entry (&entry);
debug_print (1, ("\"%s\" -> %s\n", b->filename, type));
}
if (tmp.subtype)
- FREE (&tmp.subtype);
+ mem_free (&tmp.subtype);
if (tmp.xtype)
- FREE (&tmp.xtype);
+ mem_free (&tmp.xtype);
}
}
}
if (fp) {
/* recv case: we need to save the attachment to a file */
- FREE (&fname);
+ mem_free (&fname);
if (mutt_save_attachment (fp, a, tempfile, 0, NULL) == -1)
goto return_error;
}
if (fp && !use_mailcap && a->filename) {
/* recv case */
strfcpy (pagerfile, a->filename, sizeof (pagerfile));
- mutt_adv_mktemp (pagerfile, sizeof (pagerfile));
+ mutt_adv_mktemp (NULL, pagerfile, sizeof (pagerfile));
}
else
mutt_mktemp (pagerfile);