projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
unused, drop
[apps/madmutt.git]
/
postpone.c
diff --git
a/postpone.c
b/postpone.c
index
f7d7328
..
d37f043
100644
(file)
--- a/
postpone.c
+++ b/
postpone.c
@@
-13,9
+13,12
@@
#endif
#include <lib-lib/mem.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 "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"
@@
-31,9
+34,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>
@@
-320,7
+320,7
@@
int mutt_get_postponed (CONTEXT * ctx, HEADER * hdr, HEADER ** cur, char *fcc,
else if (ascii_strncasecmp ("X-Mutt-Fcc:", tmp->data, 11) == 0) {
p = tmp->data + 11;
SKIPWS (p);
else if (ascii_strncasecmp ("X-Mutt-Fcc:", tmp->data, 11) == 0) {
p = tmp->data + 11;
SKIPWS (p);
-
strfcpy (fcc, p, fcclen
);
+
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 */
@@
-334,10
+334,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;
@@
-352,7
+352,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;
@@
-368,7
+368,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);
@@
-512,7
+512,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);
@@
-611,8
+611,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 */