projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
exit mem_realloc, enters p_realloc/xrealloc.
[apps/madmutt.git]
/
attach.c
diff --git
a/attach.c
b/attach.c
index
c695e34
..
dfdab79
100644
(file)
--- a/
attach.c
+++ b/
attach.c
@@
-12,6
+12,8
@@
# include "config.h"
#endif
# include "config.h"
#endif
+#include <lib-lib/mem.h>
+
#include "mutt.h"
#include "ascii.h"
#include "handler.h"
#include "mutt.h"
#include "ascii.h"
#include "handler.h"
@@
-26,7
+28,6
@@
#include "mx.h"
#include "mutt_crypt.h"
#include "mx.h"
#include "mutt_crypt.h"
-#include "lib/mem.h"
#include "lib/intl.h"
#include "lib/str.h"
#include "lib/debug.h"
#include "lib/intl.h"
#include "lib/str.h"
#include "lib/debug.h"
@@
-144,19
+145,19
@@
int mutt_compose_attachment (BODY * a)
b->parameter = NULL;
}
if (b->description) {
b->parameter = NULL;
}
if (b->description) {
-
mem_free
(&a->description);
+
p_delete
(&a->description);
a->description = b->description;
b->description = NULL;
}
if (b->form_name) {
a->description = b->description;
b->description = NULL;
}
if (b->form_name) {
-
mem_free
(&a->form_name);
+
p_delete
(&a->form_name);
a->form_name = b->form_name;
b->form_name = NULL;
}
/* Remove headers by copying out data to another file, then
* copying the file back */
a->form_name = b->form_name;
b->form_name = NULL;
}
/* Remove headers by copying out data to another file, then
* copying the file back */
- fseek (fp, b->offset, 0);
+ fseek
o
(fp, b->offset, 0);
mutt_mktemp (tempfile);
if ((tfp = safe_fopen (tempfile, "w")) == NULL) {
mutt_perror (_("Failure to open file to strip headers."));
mutt_mktemp (tempfile);
if ((tfp = safe_fopen (tempfile, "w")) == NULL) {
mutt_perror (_("Failure to open file to strip headers."));
@@
-335,9
+336,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)
-
mem_free
(&tmp.subtype);
+
p_delete
(&tmp.subtype);
if (tmp.xtype)
if (tmp.xtype)
-
mem_free
(&tmp.xtype);
+
p_delete
(&tmp.xtype);
}
}
}
}
}
}
@@
-452,7
+453,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 */
-
mem_free
(&fname);
+
p_delete
(&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;
}
@@
-724,7
+725,7
@@
int mutt_save_attachment (FILE * fp, BODY * m, char *path, int flags,
hn->msgno = hdr->msgno; /* required for MH/maildir */
hn->read = 1;
hn->msgno = hdr->msgno; /* required for MH/maildir */
hn->read = 1;
- fseek (fp, m->offset, 0);
+ fseek
o
(fp, m->offset, 0);
if (fgets (buf, sizeof (buf), fp) == NULL)
return -1;
if (mx_open_mailbox (path, M_APPEND | M_QUIET, &ctx) == NULL)
if (fgets (buf, sizeof (buf), fp) == NULL)
return -1;
if (mx_open_mailbox (path, M_APPEND | M_QUIET, &ctx) == NULL)
@@
-759,7
+760,7
@@
int mutt_save_attachment (FILE * fp, BODY * m, char *path, int flags,
mutt_perror ("fopen");
return (-1);
}
mutt_perror ("fopen");
return (-1);
}
- fseek ((s.fpin = fp), m->offset, 0);
+ fseek
o
((s.fpin = fp), m->offset, 0);
mutt_decode_attachment (m, &s);
if (fclose (s.fpout) != 0) {
mutt_decode_attachment (m, &s);
if (fclose (s.fpout) != 0) {