projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
always build imap as well.
[apps/madmutt.git]
/
recvcmd.c
diff --git
a/recvcmd.c
b/recvcmd.c
index
17ced5a
..
c051b8a
100644
(file)
--- a/
recvcmd.c
+++ b/
recvcmd.c
@@
-15,6
+15,9
@@
#include <lib-lib/str.h>
#include <lib-lib/macros.h>
#include <lib-lib/file.h>
#include <lib-lib/str.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 "enter.h"
#include "mutt.h"
#include "enter.h"
@@
-24,9
+27,7
@@
#include "mutt_curses.h"
#include "mutt_menu.h"
#include "rfc1524.h"
#include "mutt_curses.h"
#include "mutt_menu.h"
#include "rfc1524.h"
-#include "mime.h"
#include "attach.h"
#include "attach.h"
-#include "mapping.h"
#include "mx.h"
#include "copy.h"
#include "mutt_idna.h"
#include "mx.h"
#include "copy.h"
#include "mutt_idna.h"
@@
-125,7
+126,7
@@
void mutt_attach_bounce (FILE * fp, HEADER * hdr,
char prompt[STRING];
char buf[HUGE_STRING];
char *err = NULL;
char prompt[STRING];
char buf[HUGE_STRING];
char *err = NULL;
-
ADDRESS
*adr = NULL;
+
address_t
*adr = NULL;
int ret = 0;
int p = 0;
int ret = 0;
int p = 0;
@@
-136,9
+137,9
@@
void mutt_attach_bounce (FILE * fp, HEADER * hdr,
p = (cur || count_tagged (idx, idxlen) == 1);
if (p)
p = (cur || count_tagged (idx, idxlen) == 1);
if (p)
-
strfcpy (prompt, _("Bounce message to: "), sizeof (prompt
));
+
m_strcpy(prompt, sizeof(prompt), _("Bounce message to: "
));
else
else
-
strfcpy (prompt, _("Bounce tagged messages to: "), sizeof (prompt
));
+
m_strcpy(prompt, sizeof(prompt), _("Bounce tagged messages to: "
));
buf[0] = '\0';
if (mutt_get_field (prompt, buf, sizeof (buf), M_ALIAS)
buf[0] = '\0';
if (mutt_get_field (prompt, buf, sizeof (buf), M_ALIAS)
@@
-156,7
+157,7
@@
void mutt_attach_bounce (FILE * fp, HEADER * hdr,
if (mutt_addrlist_to_idna (adr, &err) < 0) {
mutt_error (_("Bad IDN: '%s'"), err);
p_delete(&err);
if (mutt_addrlist_to_idna (adr, &err) < 0) {
mutt_error (_("Bad IDN: '%s'"), err);
p_delete(&err);
-
rfc822_free_address
(&adr);
+
address_delete
(&adr);
return;
}
return;
}
@@
-175,13
+176,13
@@
void mutt_attach_bounce (FILE * fp, HEADER * hdr,
mutt_format_string (prompt, sizeof (prompt) - 4,
0, COLS - extra_space, 0, 0,
prompt, sizeof (prompt), 0);
mutt_format_string (prompt, sizeof (prompt) - 4,
0, COLS - extra_space, 0, 0,
prompt, sizeof (prompt), 0);
- str_cat (prompt, sizeof (prompt), "...?");
+ m_strcat(prompt, sizeof(prompt), "...?");
+ } else {
+ m_strcat(prompt, sizeof(prompt), "?");
}
}
- else
- str_cat (prompt, sizeof (prompt), "?");
if (query_quadoption (OPT_BOUNCE, prompt) != M_YES) {
if (query_quadoption (OPT_BOUNCE, prompt) != M_YES) {
-
rfc822_free_address
(&adr);
+
address_delete
(&adr);
CLEARLINE (LINES - 1);
mutt_message (p ? _("Message not bounced.") : _("Messages not bounced."));
return;
CLEARLINE (LINES - 1);
mutt_message (p ? _("Message not bounced.") : _("Messages not bounced."));
return;
@@
-316,12
+317,12
@@
static void include_header (int quote, FILE * ifp,
if (quote) {
if (_prefix)
if (quote) {
if (_prefix)
-
strfcpy (prefix, _prefix, sizeof (prefix)
);
+
m_strcpy(prefix, sizeof(prefix), _prefix
);
else if (!option (OPTTEXTFLOWED))
_mutt_make_string (prefix, sizeof (prefix), NONULL (Prefix),
Context, hdr, 0);
else
else if (!option (OPTTEXTFLOWED))
_mutt_make_string (prefix, sizeof (prefix), NONULL (Prefix),
Context, hdr, 0);
else
-
strfcpy (prefix, ">", sizeof (prefix)
);
+
m_strcpy(prefix, sizeof(prefix), ">"
);
chflags |= CH_PREFIX;
}
chflags |= CH_PREFIX;
}
@@
-406,7
+407,7
@@
static void attach_forward_bodies (FILE * fp, HEADER * hdr,
_mutt_make_string (prefix, sizeof (prefix), NONULL (Prefix), Context,
parent, 0);
else
_mutt_make_string (prefix, sizeof (prefix), NONULL (Prefix), Context,
parent, 0);
else
-
strfcpy (prefix, ">", sizeof (prefix)
);
+
m_strcpy(prefix, sizeof(prefix), ">"
);
}
include_header (option (OPTFORWQUOTE), fp, parent, tmpfp, prefix);
}
include_header (option (OPTFORWQUOTE), fp, parent, tmpfp, prefix);
@@
-689,7
+690,7
@@
attach_reply_envelope_defaults (ENVELOPE * env, ATTACHPTR ** idx,
if ((flags & SENDNEWS)) {
/* in case followup set Newsgroups: with Followup-To: if it present */
if (!env->newsgroups && curenv &&
if ((flags & SENDNEWS)) {
/* in case followup set Newsgroups: with Followup-To: if it present */
if (!env->newsgroups && curenv &&
-
str_casecmp
(curenv->followup_to, "poster"))
+
m_strcasecmp
(curenv->followup_to, "poster"))
env->newsgroups = m_strdup(curenv->followup_to);
}
else
env->newsgroups = m_strdup(curenv->followup_to);
}
else
@@
-838,7
+839,7
@@
void mutt_attach_reply (FILE * fp, HEADER * hdr,
_mutt_make_string (prefix, sizeof (prefix), NONULL (Prefix),
Context, parent, 0);
else
_mutt_make_string (prefix, sizeof (prefix), NONULL (Prefix),
Context, parent, 0);
else
-
strfcpy (prefix, ">", sizeof (prefix)
);
+
m_strcpy(prefix, sizeof(prefix), ">"
);
st.prefix = prefix;
st.flags = M_CHARCONV;
st.prefix = prefix;
st.flags = M_CHARCONV;