projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mappings as standalone module
[apps/madmutt.git]
/
postpone.c
diff --git
a/postpone.c
b/postpone.c
index
8d020d2
..
73a1057
100644
(file)
--- a/
postpone.c
+++ b/
postpone.c
@@
-17,6
+17,7
@@
#include <lib-lib/ascii.h>
#include <lib-lib/macros.h>
#include <lib-lib/file.h>
#include <lib-lib/ascii.h>
#include <lib-lib/macros.h>
#include <lib-lib/file.h>
+#include <lib-lib/mapping.h>
#include "mutt.h"
#include "enter.h"
#include "mutt.h"
#include "enter.h"
@@
-24,7
+25,6
@@
#include "mutt_menu.h"
#include "rfc1524.h"
#include "mime.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"
@@
-298,8
+298,7
@@
int mutt_get_postponed (CONTEXT * ctx, HEADER * hdr, HEADER ** cur, char *fcc,
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 */
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);
@@
-318,9
+317,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 */
@@
-409,8
+407,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':
@@
-611,7
+608,7
@@
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)
);
+
m_strcpy(file, sizeof(file), b->filename
);
b->d_filename = m_strdup(b->filename);
}
else {
b->d_filename = m_strdup(b->filename);
}
else {