projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fclose -> m_fclose
[apps/madmutt.git]
/
postpone.c
diff --git
a/postpone.c
b/postpone.c
index
4d34734
..
d8d8cf5
100644
(file)
--- a/
postpone.c
+++ b/
postpone.c
@@
-8,38
+8,24
@@
* please see the file GPL in the top level source directory.
*/
* please see the file GPL in the top level source directory.
*/
-#if HAVE_CONFIG_H
-# 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 <lib-lib/file.h>
-#include <lib-lib/mapping.h>
+#include <lib-lib/lib-lib.h>
#include <lib-mime/mime.h>
#include <lib-mime/mime.h>
+#include <lib-ui/enter.h>
+#include <lib-ui/menu.h>
+#include <lib-ui/curses.h>
+#include <lib-mx/mx.h>
+
+#include <lib-sys/unix.h>
+
#include "mutt.h"
#include "mutt.h"
-#include "enter.h"
#include "handler.h"
#include "handler.h"
-#include "mutt_menu.h"
-#include "rfc1524.h"
#include "sort.h"
#include "thread.h"
#include "sort.h"
#include "thread.h"
-#include "mx.h"
-#include "mutt_crypt.h"
+#include <lib-crypt/crypt.h>
#include <imap/imap.h>
#include <imap/imap.h>
-#include <imap/mx_imap.h>
-
-#include "lib/debug.h"
-
-#include <ctype.h>
-#include <unistd.h>
-#include <string.h>
-#include <sys/stat.h>
static struct mapping_t PostponeHelp[] = {
{N_("Exit"), OP_EXIT},
static struct mapping_t PostponeHelp[] = {
{N_("Exit"), OP_EXIT},
@@
-89,10
+75,7
@@
int mutt_num_postponed (int force)
newpc = imap_mailbox_check (Postponed, 0);
if (newpc >= 0) {
PostCount = newpc;
newpc = imap_mailbox_check (Postponed, 0);
if (newpc >= 0) {
PostCount = newpc;
- debug_print (2, ("%d postponed IMAP messages found.\n", PostCount));
}
}
- else
- debug_print (2, ("using old IMAP postponed count.\n"));
}
return PostCount;
}
}
return PostCount;
}
@@
-147,7
+130,7
@@
void mutt_update_num_postponed (void)
UpdateNumPostponed = 1;
}
UpdateNumPostponed = 1;
}
-static void post_entry (char *s, size_t slen, MUTTMENU * menu, int entry)
+static void post_entry (char *s, s
s
ize_t slen, MUTTMENU * menu, int entry)
{
CONTEXT *ctx = (CONTEXT *) menu->data;
{
CONTEXT *ctx = (CONTEXT *) menu->data;
@@
-229,13
+212,13
@@
static HEADER *select_msg (void)
* SENDREPLY recalled message is a reply
*/
int mutt_get_postponed (CONTEXT * ctx, HEADER * hdr, HEADER ** cur, char *fcc,
* SENDREPLY recalled message is a reply
*/
int mutt_get_postponed (CONTEXT * ctx, HEADER * hdr, HEADER ** cur, char *fcc,
- size_t fcclen)
+ s
s
ize_t fcclen)
{
HEADER *h;
int code = SENDPOSTPONED;
{
HEADER *h;
int code = SENDPOSTPONED;
-
LIST
*tmp;
-
LIST
*last = NULL;
-
LIST
*next;
+
string_list_t
*tmp;
+
string_list_t
*last = NULL;
+
string_list_t
*next;
char *p;
int opt_delete;
char *p;
int opt_delete;
@@
-309,7
+292,7
@@
int mutt_get_postponed (CONTEXT * ctx, HEADER * hdr, HEADER ** cur, char *fcc,
else
hdr->env->userhdrs = tmp->next;
tmp->next = NULL;
else
hdr->env->userhdrs = tmp->next;
tmp->next = NULL;
-
mutt_free_list
(&tmp);
+
string_list_wipe
(&tmp);
tmp = next;
if (*cur)
code |= SENDREPLY;
tmp = next;
if (*cur)
code |= SENDREPLY;
@@
-326,7
+309,7
@@
int mutt_get_postponed (CONTEXT * ctx, HEADER * hdr, HEADER ** cur, char *fcc,
else
hdr->env->userhdrs = tmp->next;
tmp->next = NULL;
else
hdr->env->userhdrs = tmp->next;
tmp->next = NULL;
-
mutt_free_list
(&tmp);
+
string_list_wipe
(&tmp);
tmp = next;
}
else if ((m_strncmp("Pgp:", tmp->data, 4) == 0 /* this is generated
tmp = next;
}
else if ((m_strncmp("Pgp:", tmp->data, 4) == 0 /* this is generated
@@
-343,7
+326,7
@@
int mutt_get_postponed (CONTEXT * ctx, HEADER * hdr, HEADER ** cur, char *fcc,
else
hdr->env->userhdrs = tmp->next;
tmp->next = NULL;
else
hdr->env->userhdrs = tmp->next;
tmp->next = NULL;
-
mutt_free_list
(&tmp);
+
string_list_wipe
(&tmp);
tmp = next;
}
else if (m_strncmp("X-Mutt-SMIME:", tmp->data, 13) == 0) {
tmp = next;
}
else if (m_strncmp("X-Mutt-SMIME:", tmp->data, 13) == 0) {
@@
-357,7
+340,7
@@
int mutt_get_postponed (CONTEXT * ctx, HEADER * hdr, HEADER ** cur, char *fcc,
else
hdr->env->userhdrs = tmp->next;
tmp->next = NULL;
else
hdr->env->userhdrs = tmp->next;
tmp->next = NULL;
-
mutt_free_list
(&tmp);
+
string_list_wipe
(&tmp);
tmp = next;
}
tmp = next;
}
@@
-365,7
+348,7
@@
int mutt_get_postponed (CONTEXT * ctx, HEADER * hdr, HEADER ** cur, char *fcc,
else if (m_strncmp("X-Mutt-Mix:", tmp->data, 11) == 0) {
char *t;
else if (m_strncmp("X-Mutt-Mix:", tmp->data, 11) == 0) {
char *t;
-
mutt_free_list
(&hdr->chain);
+
string_list_wipe
(&hdr->chain);
t = strtok (tmp->data + 11, " \t\n");
while (t) {
t = strtok (tmp->data + 11, " \t\n");
while (t) {
@@
-379,7
+362,7
@@
int mutt_get_postponed (CONTEXT * ctx, HEADER * hdr, HEADER ** cur, char *fcc,
else
hdr->env->userhdrs = tmp->next;
tmp->next = NULL;
else
hdr->env->userhdrs = tmp->next;
tmp->next = NULL;
-
mutt_free_list
(&tmp);
+
string_list_wipe
(&tmp);
tmp = next;
}
#endif
tmp = next;
}
#endif
@@
-541,14
+524,14
@@
int mutt_prepare_template (FILE * fp, CONTEXT * ctx, HEADER * newhdr,
|| b == NULL) {
err:
mx_close_message (&msg);
|| b == NULL) {
err:
mx_close_message (&msg);
-
mutt_free_envelope
(&newhdr->env);
-
mutt_free_body
(&newhdr->content);
+
envelope_delete
(&newhdr->env);
+
body_list_wipe
(&newhdr->content);
mutt_error _("Decryption failed.");
return -1;
}
mutt_error _("Decryption failed.");
return -1;
}
-
mutt_free_body
(&newhdr->content);
+
body_list_wipe
(&newhdr->content);
newhdr->content = b;
mutt_clear_error ();
newhdr->content = b;
mutt_clear_error ();
@@
-561,15
+544,14
@@
int mutt_prepare_template (FILE * fp, CONTEXT * ctx, HEADER * newhdr,
if (mutt_is_multipart_signed (newhdr->content)) {
newhdr->security |= SIGN;
if (mutt_is_multipart_signed (newhdr->content)) {
newhdr->security |= SIGN;
- if (ascii_strcasecmp (mutt_get_parameter
- ("protocol", newhdr->content->parameter),
- "application/pgp-signature") == 0)
+ if (ascii_strcasecmp(parameter_getval(newhdr->content->parameter, "protocol"),
+ "application/pgp-signature") == 0)
newhdr->security |= APPLICATION_PGP;
else
newhdr->security |= APPLICATION_SMIME;
/* destroy the signature */
newhdr->security |= APPLICATION_PGP;
else
newhdr->security |= APPLICATION_SMIME;
/* destroy the signature */
-
mutt_free_body
(&newhdr->content->parts->next);
+
body_list_wipe
(&newhdr->content->parts->next);
newhdr->content = mutt_remove_multipart (newhdr->content);
}
newhdr->content = mutt_remove_multipart (newhdr->content);
}
@@
-612,14
+594,14
@@
int mutt_prepare_template (FILE * fp, CONTEXT * ctx, HEADER * newhdr,
if (b->type == TYPETEXT) {
if (!ascii_strcasecmp
if (b->type == TYPETEXT) {
if (!ascii_strcasecmp
- ("yes",
mutt_get_parameter ("x-mutt-noconv", b->parameter
)))
+ ("yes",
parameter_getval(b->parameter, "x-mutt-noconv"
)))
b->noconv = 1;
else {
s.flags |= M_CHARCONV;
b->noconv = 0;
}
b->noconv = 1;
else {
s.flags |= M_CHARCONV;
b->noconv = 0;
}
-
mutt_delete_parameter ("x-mutt-noconv", &b->parameter
);
+
parameter_delval(&b->parameter, "x-mutt-noconv"
);
}
mutt_adv_mktemp (NULL, file, sizeof (file));
}
mutt_adv_mktemp (NULL, file, sizeof (file));
@@
-635,12
+617,12
@@
int mutt_prepare_template (FILE * fp, CONTEXT * ctx, HEADER * newhdr,
b->type = TYPETEXT;
m_strreplace(&b->subtype, "plain");
b->type = TYPETEXT;
m_strreplace(&b->subtype, "plain");
-
mutt_delete_parameter ("x-action", &b->parameter
);
+
parameter_delval(&b->parameter, "x-action"
);
}
else
mutt_decode_attachment (b, &s);
}
else
mutt_decode_attachment (b, &s);
- if (
safe_fclose
(&s.fpout) != 0)
+ if (
m_fclose
(&s.fpout) != 0)
goto bail;
m_strreplace(&b->filename, file);
goto bail;
m_strreplace(&b->filename, file);
@@
-648,7
+630,7
@@
int mutt_prepare_template (FILE * fp, CONTEXT * ctx, HEADER * newhdr,
mutt_stamp_attachment (b);
mutt_stamp_attachment (b);
-
mutt_free_body
(&b->parts);
+
body_list_wipe
(&b->parts);
if (b->hdr)
b->hdr->content = NULL; /* avoid dangling pointer */
}
if (b->hdr)
b->hdr->content = NULL; /* avoid dangling pointer */
}
@@
-674,13
+656,13
@@
bail:
/* that's it. */
if (bfp != fp)
/* that's it. */
if (bfp != fp)
-
fclose (
bfp);
+
m_fclose(&
bfp);
if (msg)
mx_close_message (&msg);
if (rv == -1) {
if (msg)
mx_close_message (&msg);
if (rv == -1) {
-
mutt_free_envelope
(&newhdr->env);
-
mutt_free_body
(&newhdr->content);
+
envelope_delete
(&newhdr->env);
+
body_list_wipe
(&newhdr->content);
}
return rv;
}
return rv;