projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rocco Rutte:
[apps/madmutt.git]
/
attach.c
diff --git
a/attach.c
b/attach.c
index
c87f9cf
..
a644784
100644
(file)
--- a/
attach.c
+++ b/
attach.c
@@
-13,6
+13,9
@@
#endif
#include "mutt.h"
#endif
#include "mutt.h"
+#include "ascii.h"
+#include "handler.h"
+#include "recvattach.h"
#include "mutt_menu.h"
#include "mutt_curses.h"
#include "keymap.h"
#include "mutt_menu.h"
#include "mutt_curses.h"
#include "keymap.h"
@@
-141,12
+144,12
@@
int mutt_compose_attachment (BODY * a)
b->parameter = NULL;
}
if (b->description) {
b->parameter = NULL;
}
if (b->description) {
-
FREE
(&a->description);
+
mem_free
(&a->description);
a->description = b->description;
b->description = NULL;
}
if (b->form_name) {
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;
}
a->form_name = b->form_name;
b->form_name = NULL;
}
@@
-245,7
+248,7
@@
int mutt_edit_attachment (BODY * a)
}
else if (a->type == TYPETEXT) {
/* On text, default to editor */
}
else if (a->type == TYPETEXT) {
/* On text, default to editor */
- mutt_edit_file (NONULL (Editor),
newfil
e);
+ mutt_edit_file (NONULL (Editor),
a->filenam
e);
}
else {
rfc1524_free_entry (&entry);
}
else {
rfc1524_free_entry (&entry);
@@
-329,9
+332,9
@@
void mutt_check_lookup_list (BODY * b, char *type, int len)
debug_print (1, ("\"%s\" -> %s\n", b->filename, type));
}
if (tmp.subtype)
debug_print (1, ("\"%s\" -> %s\n", b->filename, type));
}
if (tmp.subtype)
-
FREE
(&tmp.subtype);
+
mem_free
(&tmp.subtype);
if (tmp.xtype)
if (tmp.xtype)
-
FREE
(&tmp.xtype);
+
mem_free
(&tmp.xtype);
}
}
}
}
}
}
@@
-446,7
+449,7
@@
int mutt_view_attachment (FILE * fp, BODY * a, int flag, HEADER * hdr,
if (fp) {
/* recv case: we need to save the attachment to a file */
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 (mutt_save_attachment (fp, a, tempfile, 0, NULL) == -1)
goto return_error;
}
@@
-460,7
+463,7
@@
int mutt_view_attachment (FILE * fp, BODY * a, int flag, HEADER * hdr,
if (fp && !use_mailcap && a->filename) {
/* recv case */
strfcpy (pagerfile, a->filename, sizeof (pagerfile));
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);
}
else
mutt_mktemp (pagerfile);