projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
license statements.
[apps/madmutt.git]
/
postpone.c
diff --git
a/postpone.c
b/postpone.c
index
a197f12
..
f73fa4e
100644
(file)
--- a/
postpone.c
+++ b/
postpone.c
@@
-12,8
+12,12
@@
# include "config.h"
#endif
# include "config.h"
#endif
+#include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/ascii.h>
+#include <lib-lib/macros.h>
+
#include "mutt.h"
#include "mutt.h"
-#include "ascii.h"
#include "enter.h"
#include "handler.h"
#include "mutt_menu.h"
#include "enter.h"
#include "handler.h"
#include "mutt_menu.h"
@@
-29,9
+33,6
@@
#endif
#include "mutt_crypt.h"
#endif
#include "mutt_crypt.h"
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
#include "lib/debug.h"
#include <ctype.h>
#include "lib/debug.h"
#include <ctype.h>
@@
-40,11
+41,11
@@
#include <sys/stat.h>
static struct mapping_t PostponeHelp[] = {
#include <sys/stat.h>
static struct mapping_t PostponeHelp[] = {
- {N_("Exit"), OP_EXIT},
- {N_("Del"), OP_DELETE},
+ {N_("Exit"),
OP_EXIT},
+ {N_("Del"),
OP_DELETE},
{N_("Undel"), OP_UNDELETE},
{N_("Undel"), OP_UNDELETE},
- {N_("Help"), OP_HELP},
- {NULL}
+ {N_("Help"),
OP_HELP},
+ {NULL
, OP_NULL
}
};
};
@@
-252,7
+253,7
@@
int mutt_get_postponed (CONTEXT * ctx, HEADER * hdr, HEADER ** cur, char *fcc,
if (!PostContext->msgcount) {
PostCount = 0;
mx_close_mailbox (PostContext, NULL);
if (!PostContext->msgcount) {
PostCount = 0;
mx_close_mailbox (PostContext, NULL);
-
mem_free
(&PostContext);
+
p_delete
(&PostContext);
mutt_error _("No postponed messages.");
return (-1);
mutt_error _("No postponed messages.");
return (-1);
@@
-264,13
+265,13
@@
int mutt_get_postponed (CONTEXT * ctx, HEADER * hdr, HEADER ** cur, char *fcc,
}
else if ((h = select_msg ()) == NULL) {
mx_close_mailbox (PostContext, NULL);
}
else if ((h = select_msg ()) == NULL) {
mx_close_mailbox (PostContext, NULL);
-
mem_free
(&PostContext);
+
p_delete
(&PostContext);
return (-1);
}
if (mutt_prepare_template (NULL, PostContext, hdr, h, 0) < 0) {
mx_fastclose_mailbox (PostContext);
return (-1);
}
if (mutt_prepare_template (NULL, PostContext, hdr, h, 0) < 0) {
mx_fastclose_mailbox (PostContext);
-
mem_free
(&PostContext);
+
p_delete
(&PostContext);
return (-1);
}
return (-1);
}
@@
-289,7
+290,7
@@
int mutt_get_postponed (CONTEXT * ctx, HEADER * hdr, HEADER ** cur, char *fcc,
mx_close_mailbox (PostContext, NULL);
set_quadoption (OPT_DELETE, opt_delete);
mx_close_mailbox (PostContext, NULL);
set_quadoption (OPT_DELETE, opt_delete);
-
mem_free
(&PostContext);
+
p_delete
(&PostContext);
for (tmp = hdr->env->userhdrs; tmp;) {
if (ascii_strncasecmp ("X-Mutt-References:", tmp->data, 18) == 0) {
for (tmp = hdr->env->userhdrs; tmp;) {
if (ascii_strncasecmp ("X-Mutt-References:", tmp->data, 18) == 0) {
@@
-528,8
+529,8
@@
int mutt_prepare_template (FILE * fp, CONTEXT * ctx, HEADER * newhdr,
newhdr->content->length = hdr->content->length;
mutt_parse_part (fp, newhdr->content);
newhdr->content->length = hdr->content->length;
mutt_parse_part (fp, newhdr->content);
-
mem_free
(&newhdr->env->message_id);
-
mem_free
(&newhdr->env->mail_followup_to); /* really? */
+
p_delete
(&newhdr->env->message_id);
+
p_delete
(&newhdr->env->mail_followup_to); /* really? */
/* decrypt pgp/mime encoded messages */
/* decrypt pgp/mime encoded messages */
@@
-610,7
+611,7
@@
int mutt_prepare_template (FILE * fp, CONTEXT * ctx, HEADER * newhdr,
file[0] = '\0';
if (b->filename) {
strfcpy (file, b->filename, sizeof (file));
file[0] = '\0';
if (b->filename) {
strfcpy (file, b->filename, sizeof (file));
- b->d_filename =
str_dup
(b->filename);
+ b->d_filename =
m_strdup
(b->filename);
}
else {
/* avoid Content-Disposition: header with temporary filename */
}
else {
/* avoid Content-Disposition: header with temporary filename */