}
buf[0] = 0;
- rfc822_write_address (buf, sizeof (buf), adr, 1);
+ rfc822_addrcat(buf, sizeof(buf), adr, 1);
-#define extra_space (15+7+2)
/*
* See commands.c.
*/
(p ? _("Bounce message to %s") : _("Bounce messages to %s")),
buf);
- if (mutt_strwidth (prompt) > COLS - extra_space) {
+#define extra_space (15+7+2)
+ if (m_strwidth(prompt) > COLS - extra_space) {
mutt_format_string (prompt, sizeof (prompt) - 4,
0, COLS - extra_space, 0, 0,
prompt, sizeof (prompt), 0);
} else {
m_strcat(prompt, sizeof(prompt), "?");
}
+#undef extra_space
if (query_quadoption (OPT_BOUNCE, prompt) != M_YES) {
address_list_wipe(&adr);
HEADER * hdr, FILE * ofp, char *_prefix)
{
int chflags = CH_DECODE;
- char prefix[SHORT_STRING];
+ char prefix[STRING];
if (option (OPTWEED))
chflags |= CH_WEED | CH_REORDER;
tmphdr->env = envelope_new();
mutt_make_forward_subject (tmphdr->env, Context, parent);
- tmpfp = m_tempfile(tmpbody, sizeof(tmpbody), NONULL(Tempdir), NULL);
+ tmpfp = m_tempfile(tmpbody, sizeof(tmpbody), NONULL(mod_core.tmpdir), NULL);
if (!tmpfp) {
mutt_error(_("Could not create temporary file"));
return;
/* no MIME encapsulation */
- tmpfp = m_tempfile(tmpbody, sizeof(tmpbody), NONULL(Tempdir), NULL);
+ tmpfp = m_tempfile(tmpbody, sizeof(tmpbody), NONULL(mod_core.tmpdir), NULL);
if (!tmpfp) {
mutt_error(_("Could not create temporary file"));
header_delete(&tmphdr);
}
_mutt_copy_message (tmpfp, fp, cur, cur->content, cmflags, chflags);
- mutt_make_post_indent (Context, cur, tmpfp);
}
void mutt_attach_reply (FILE * fp, HEADER * hdr,
char tmpbody[_POSIX_PATH_MAX];
FILE *tmpfp;
- char prefix[SHORT_STRING];
+ char prefix[STRING];
int rc;
#ifdef USE_NNTP
return;
}
- tmpfp = m_tempfile(tmpbody, sizeof(tmpbody), NONULL(Tempdir), NULL);
+ tmpfp = m_tempfile(tmpbody, sizeof(tmpbody), NONULL(mod_core.tmpdir), NULL);
if (!tmpfp) {
mutt_error(_("Could not create temporary file"));
header_delete(&tmphdr);
}
}
- mutt_make_post_indent (Context, parent, tmpfp);
-
if (mime_reply_any && !cur &&
copy_problematic_attachments (fp, &tmphdr->content, idx, idxlen,
0) == NULL) {