projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
wibble
[apps/madmutt.git]
/
postpone.c
diff --git
a/postpone.c
b/postpone.c
index
a3d7289
..
7cfe924
100644
(file)
--- a/
postpone.c
+++ b/
postpone.c
@@
-12,14
+12,20
@@
# 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 <lib-lib/file.h>
+#include <lib-lib/mapping.h>
+
+#include <lib-mime/mime.h>
+
#include "mutt.h"
#include "mutt.h"
-#include "ascii.h"
#include "enter.h"
#include "handler.h"
#include "mutt_menu.h"
#include "rfc1524.h"
#include "enter.h"
#include "handler.h"
#include "mutt_menu.h"
#include "rfc1524.h"
-#include "mime.h"
-#include "mapping.h"
#include "sort.h"
#include "thread.h"
#include "mx.h"
#include "sort.h"
#include "thread.h"
#include "mx.h"
@@
-29,9
+35,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
+43,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
+255,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
+267,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,15
+292,14
@@
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) {
if (ctx) {
/* if a mailbox is currently open, look to see if the orignal message
the user attempted to reply to is in this mailbox */
for (tmp = hdr->env->userhdrs; tmp;) {
if (ascii_strncasecmp ("X-Mutt-References:", tmp->data, 18) == 0) {
if (ctx) {
/* if a mailbox is currently open, look to see if the orignal message
the user attempted to reply to is in this mailbox */
- p = tmp->data + 18;
- SKIPWS (p);
+ p = vskipspaces(tmp->data + 18);
if (!ctx->id_hash)
ctx->id_hash = mutt_make_id_hash (ctx);
*cur = hash_find (ctx->id_hash, p);
if (!ctx->id_hash)
ctx->id_hash = mutt_make_id_hash (ctx);
*cur = hash_find (ctx->id_hash, p);
@@
-316,9
+318,8
@@
int mutt_get_postponed (CONTEXT * ctx, HEADER * hdr, HEADER ** cur, char *fcc,
code |= SENDREPLY;
}
else if (ascii_strncasecmp ("X-Mutt-Fcc:", tmp->data, 11) == 0) {
code |= SENDREPLY;
}
else if (ascii_strncasecmp ("X-Mutt-Fcc:", tmp->data, 11) == 0) {
- p = tmp->data + 11;
- SKIPWS (p);
- strfcpy (fcc, p, fcclen);
+ p = vskipspaces(tmp->data + 11);
+ m_strcpy(fcc, fcclen, p);
mutt_pretty_mailbox (fcc);
/* remove the X-Mutt-Fcc: header field */
mutt_pretty_mailbox (fcc);
/* remove the X-Mutt-Fcc: header field */
@@
-332,10
+333,10
@@
int mutt_get_postponed (CONTEXT * ctx, HEADER * hdr, HEADER ** cur, char *fcc,
tmp = next;
}
else if ((WithCrypto & APPLICATION_PGP)
tmp = next;
}
else if ((WithCrypto & APPLICATION_PGP)
- && (
str_ncmp
("Pgp:", tmp->data, 4) == 0 /* this is generated
+ && (
m_strncmp
("Pgp:", tmp->data, 4) == 0 /* this is generated
* by old mutt versions
*/
* by old mutt versions
*/
- ||
str_ncmp
("X-Mutt-PGP:", tmp->data, 11) == 0)) {
+ ||
m_strncmp
("X-Mutt-PGP:", tmp->data, 11) == 0)) {
hdr->security = mutt_parse_crypt_hdr (strchr (tmp->data, ':') + 1, 1);
hdr->security |= APPLICATION_PGP;
hdr->security = mutt_parse_crypt_hdr (strchr (tmp->data, ':') + 1, 1);
hdr->security |= APPLICATION_PGP;
@@
-350,7
+351,7
@@
int mutt_get_postponed (CONTEXT * ctx, HEADER * hdr, HEADER ** cur, char *fcc,
tmp = next;
}
else if ((WithCrypto & APPLICATION_SMIME)
tmp = next;
}
else if ((WithCrypto & APPLICATION_SMIME)
- &&
str_ncmp
("X-Mutt-SMIME:", tmp->data, 13) == 0) {
+ &&
m_strncmp
("X-Mutt-SMIME:", tmp->data, 13) == 0) {
hdr->security = mutt_parse_crypt_hdr (strchr (tmp->data, ':') + 1, 1);
hdr->security |= APPLICATION_SMIME;
hdr->security = mutt_parse_crypt_hdr (strchr (tmp->data, ':') + 1, 1);
hdr->security |= APPLICATION_SMIME;
@@
-366,7
+367,7
@@
int mutt_get_postponed (CONTEXT * ctx, HEADER * hdr, HEADER ** cur, char *fcc,
}
#ifdef MIXMASTER
}
#ifdef MIXMASTER
- else if (
str_ncmp
("X-Mutt-Mix:", tmp->data, 11) == 0) {
+ else if (
m_strncmp
("X-Mutt-Mix:", tmp->data, 11) == 0) {
char *t;
mutt_free_list (&hdr->chain);
char *t;
mutt_free_list (&hdr->chain);
@@
-407,8
+408,7
@@
int mutt_parse_crypt_hdr (char *p, int set_signas)
if (!WithCrypto)
return 0;
if (!WithCrypto)
return 0;
- SKIPWS (p);
- for (; *p; p++) {
+ for (p = vskipspaces(p); *p; p++) {
switch (*p) {
case 'e':
switch (*p) {
case 'e':
@@
-489,10
+489,10
@@
int mutt_parse_crypt_hdr (char *p, int set_signas)
/* the cryptalg field must not be empty */
if ((WithCrypto & APPLICATION_SMIME) && *smime_cryptalg)
/* the cryptalg field must not be empty */
if ((WithCrypto & APPLICATION_SMIME) && *smime_cryptalg)
-
str_replace
(&SmimeCryptAlg, smime_cryptalg);
+
m_strreplace
(&SmimeCryptAlg, smime_cryptalg);
if ((WithCrypto & APPLICATION_PGP) && (set_signas || *pgp_sign_as))
if ((WithCrypto & APPLICATION_PGP) && (set_signas || *pgp_sign_as))
-
str_replace
(&PgpSignAs, pgp_sign_as);
+
m_strreplace
(&PgpSignAs, pgp_sign_as);
return pgp;
}
return pgp;
}
@@
-510,7
+510,7
@@
int mutt_prepare_template (FILE * fp, CONTEXT * ctx, HEADER * newhdr,
int rv = -1;
STATE s;
int rv = -1;
STATE s;
-
memset (&s, 0, sizeof (s)
);
+
p_clear(&s, 1
);
if (!fp && (msg = mx_open_message (ctx, hdr->msgno)) == NULL)
return (-1);
if (!fp && (msg = mx_open_message (ctx, hdr->msgno)) == NULL)
return (-1);
@@
-522,14
+522,14
@@
int mutt_prepare_template (FILE * fp, CONTEXT * ctx, HEADER * newhdr,
/* parse the message header and MIME structure */
/* parse the message header and MIME structure */
- fseek (fp, hdr->offset, 0);
+ fseek
o
(fp, hdr->offset, 0);
newhdr->offset = hdr->offset;
newhdr->env = mutt_read_rfc822_header (fp, newhdr, 1, weed);
newhdr->content->length = hdr->content->length;
mutt_parse_part (fp, newhdr->content);
newhdr->offset = hdr->offset;
newhdr->env = mutt_read_rfc822_header (fp, newhdr, 1, weed);
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 */
@@
-609,8
+609,8
@@
int mutt_prepare_template (FILE * fp, CONTEXT * ctx, HEADER * newhdr,
file[0] = '\0';
if (b->filename) {
file[0] = '\0';
if (b->filename) {
-
strfcpy (file, b->filename, sizeof (file)
);
- b->d_filename =
str_dup
(b->filename);
+
m_strcpy(file, sizeof(file), 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 */
@@
-633,7
+633,7
@@
int mutt_prepare_template (FILE * fp, CONTEXT * ctx, HEADER * newhdr,
mutt_delete_parameter ("x-mutt-noconv", &b->parameter);
}
mutt_delete_parameter ("x-mutt-noconv", &b->parameter);
}
- mutt_adv_mktemp (file, sizeof (file));
+ mutt_adv_mktemp (
NULL,
file, sizeof (file));
if ((s.fpout = safe_fopen (file, "w")) == NULL)
goto bail;
if ((s.fpout = safe_fopen (file, "w")) == NULL)
goto bail;
@@
-646,7
+646,7
@@
int mutt_prepare_template (FILE * fp, CONTEXT * ctx, HEADER * newhdr,
newhdr->security |= mutt_is_application_pgp (newhdr->content);
b->type = TYPETEXT;
newhdr->security |= mutt_is_application_pgp (newhdr->content);
b->type = TYPETEXT;
-
str_replace
(&b->subtype, "plain");
+
m_strreplace
(&b->subtype, "plain");
mutt_delete_parameter ("x-action", &b->parameter);
}
else
mutt_delete_parameter ("x-action", &b->parameter);
}
else
@@
-655,7
+655,7
@@
int mutt_prepare_template (FILE * fp, CONTEXT * ctx, HEADER * newhdr,
if (safe_fclose (&s.fpout) != 0)
goto bail;
if (safe_fclose (&s.fpout) != 0)
goto bail;
-
str_replace
(&b->filename, file);
+
m_strreplace
(&b->filename, file);
b->unlink = 1;
mutt_stamp_attachment (b);
b->unlink = 1;
mutt_stamp_attachment (b);