projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move score_* to mod_score
[apps/madmutt.git]
/
recvcmd.c
diff --git
a/recvcmd.c
b/recvcmd.c
index
45dec59
..
e0c8457
100644
(file)
--- a/
recvcmd.c
+++ b/
recvcmd.c
@@
-32,7
+32,7
@@
static short check_msg (BODY * b, short err)
{
static short check_msg (BODY * b, short err)
{
- if (!mutt_is_message_type
(b->type, b->subtype
)) {
+ if (!mutt_is_message_type
(b
)) {
if (err)
mutt_error _("You may only bounce message/rfc822 parts.");
if (err)
mutt_error _("You may only bounce message/rfc822 parts.");
@@
-153,9
+153,8
@@
void mutt_attach_bounce (FILE * fp, HEADER * hdr __attribute__ ((unused)),
}
buf[0] = 0;
}
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.
*/
/*
* See commands.c.
*/
@@
-163,7
+162,8
@@
void mutt_attach_bounce (FILE * fp, HEADER * hdr __attribute__ ((unused)),
(p ? _("Bounce message to %s") : _("Bounce messages to %s")),
buf);
(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);
mutt_format_string (prompt, sizeof (prompt) - 4,
0, COLS - extra_space, 0, 0,
prompt, sizeof (prompt), 0);
@@
-171,6
+171,7
@@
void mutt_attach_bounce (FILE * fp, HEADER * hdr __attribute__ ((unused)),
} else {
m_strcat(prompt, sizeof(prompt), "?");
}
} else {
m_strcat(prompt, sizeof(prompt), "?");
}
+#undef extra_space
if (query_quadoption (OPT_BOUNCE, prompt) != M_YES) {
address_list_wipe(&adr);
if (query_quadoption (OPT_BOUNCE, prompt) != M_YES) {
address_list_wipe(&adr);
@@
-239,8
+240,7
@@
static HEADER *find_common_parent (ATTACHPTR ** idx, short idxlen,
break;
while (--i >= 0) {
break;
while (--i >= 0) {
- if (mutt_is_message_type
- (idx[i]->content->type, idx[i]->content->subtype)) {
+ if (mutt_is_message_type(idx[i]->content)) {
nchildren = count_tagged_children (idx, idxlen, i);
if (nchildren == nattach)
return idx[i]->content->hdr;
nchildren = count_tagged_children (idx, idxlen, i);
if (nchildren == nattach)
return idx[i]->content->hdr;
@@
-278,8
+278,7
@@
static HEADER *find_parent (ATTACHPTR ** idx, short idxlen, BODY * cur,
if (cur) {
for (i = 0; i < idxlen; i++) {
if (cur) {
for (i = 0; i < idxlen; i++) {
- if (mutt_is_message_type
- (idx[i]->content->type, idx[i]->content->subtype)
+ if (mutt_is_message_type(idx[i]->content)
&& is_parent (i, idx, idxlen, cur))
parent = idx[i]->content->hdr;
if (idx[i]->content == cur)
&& is_parent (i, idx, idxlen, cur))
parent = idx[i]->content->hdr;
if (idx[i]->content == cur)
@@
-296,7
+295,7
@@
static void include_header (int quote, FILE * ifp,
HEADER * hdr, FILE * ofp, char *_prefix)
{
int chflags = CH_DECODE;
HEADER * hdr, FILE * ofp, char *_prefix)
{
int chflags = CH_DECODE;
- char prefix[S
HORT_S
TRING];
+ char prefix[STRING];
if (option (OPTWEED))
chflags |= CH_WEED | CH_REORDER;
if (option (OPTWEED))
chflags |= CH_WEED | CH_REORDER;
@@
-442,7
+441,7
@@
static void attach_forward_bodies (FILE * fp, HEADER * hdr,
tmphdr->env = envelope_new();
mutt_make_forward_subject (tmphdr->env, Context, parent);
tmphdr->env = envelope_new();
mutt_make_forward_subject (tmphdr->env, Context, parent);
- tmpfp = m_tempfile(tmpbody, sizeof(tmpbody), NONULL(
Te
mpdir), NULL);
+ tmpfp = m_tempfile(tmpbody, sizeof(tmpbody), NONULL(
MCore.t
mpdir), NULL);
if (!tmpfp) {
mutt_error(_("Could not create temporary file"));
return;
if (!tmpfp) {
mutt_error(_("Could not create temporary file"));
return;
@@
-604,7
+603,7
@@
static void attach_forward_msgs (FILE * fp, HEADER * hdr __attribute__ ((unused)
/* no MIME encapsulation */
/* no MIME encapsulation */
- tmpfp = m_tempfile(tmpbody, sizeof(tmpbody), NONULL(
Te
mpdir), NULL);
+ tmpfp = m_tempfile(tmpbody, sizeof(tmpbody), NONULL(
MCore.t
mpdir), NULL);
if (!tmpfp) {
mutt_error(_("Could not create temporary file"));
header_delete(&tmphdr);
if (!tmpfp) {
mutt_error(_("Could not create temporary file"));
header_delete(&tmphdr);
@@
-796,7
+795,6
@@
static void attach_include_reply (FILE * fp, FILE * tmpfp, HEADER * cur,
}
_mutt_copy_message (tmpfp, fp, cur, cur->content, cmflags, chflags);
}
_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,
}
void mutt_attach_reply (FILE * fp, HEADER * hdr,
@@
-813,7
+811,7
@@
void mutt_attach_reply (FILE * fp, HEADER * hdr,
char tmpbody[_POSIX_PATH_MAX];
FILE *tmpfp;
char tmpbody[_POSIX_PATH_MAX];
FILE *tmpfp;
- char prefix[S
HORT_S
TRING];
+ char prefix[STRING];
int rc;
#ifdef USE_NNTP
int rc;
#ifdef USE_NNTP
@@
-852,7
+850,7
@@
void mutt_attach_reply (FILE * fp, HEADER * hdr,
return;
}
return;
}
- tmpfp = m_tempfile(tmpbody, sizeof(tmpbody), NONULL(
Te
mpdir), NULL);
+ tmpfp = m_tempfile(tmpbody, sizeof(tmpbody), NONULL(
MCore.t
mpdir), NULL);
if (!tmpfp) {
mutt_error(_("Could not create temporary file"));
header_delete(&tmphdr);
if (!tmpfp) {
mutt_error(_("Could not create temporary file"));
header_delete(&tmphdr);
@@
-908,8
+906,6
@@
void mutt_attach_reply (FILE * fp, HEADER * hdr,
}
}
}
}
- mutt_make_post_indent (Context, parent, tmpfp);
-
if (mime_reply_any && !cur &&
copy_problematic_attachments (fp, &tmphdr->content, idx, idxlen,
0) == NULL) {
if (mime_reply_any && !cur &&
copy_problematic_attachments (fp, &tmphdr->content, idx, idxlen,
0) == NULL) {