projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
allow the [cd]tor to take $L as an arcument as well
[apps/madmutt.git]
/
recvcmd.c
diff --git
a/recvcmd.c
b/recvcmd.c
index
cf0aa4f
..
4ab7a87
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,7
+153,7
@@
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)
/*
#define extra_space (15+7+2)
/*
@@
-163,7
+163,7
@@
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 (m
utt_strwidth
(prompt) > COLS - extra_space) {
+ 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);
@@
-239,8
+239,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
+277,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
+294,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;
@@
-329,8
+327,7
@@
static int mutt_copy_body (FILE * fp, BODY ** tgt, BODY * src)
if (src->filename) {
use_disp = 1;
m_strcpy(tmp, sizeof(tmp), src->filename);
if (src->filename) {
use_disp = 1;
m_strcpy(tmp, sizeof(tmp), src->filename);
- }
- else {
+ } else {
use_disp = 0;
tmp[0] = '\0';
}
use_disp = 0;
tmp[0] = '\0';
}
@@
-443,9
+440,9
@@
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);
-
mutt_mktemp (tmpbody
);
- if (
(tmpfp = safe_fopen (tmpbody, "w")) == NULL
) {
- mutt_error
(_("Can't open temporary file %s."), tmpbody
);
+
tmpfp = m_tempfile(tmpbody, sizeof(tmpbody), NONULL(MCore.tmpdir), NULL
);
+ if (
!tmpfp
) {
+ mutt_error
(_("Could not create temporary file")
);
return;
}
return;
}
@@
-543,21
+540,15
@@
static void attach_forward_bodies (FILE * fp, HEADER * hdr,
}
mutt_forward_trailer (tmpfp);
}
mutt_forward_trailer (tmpfp);
-
- fclose (tmpfp);
- tmpfp = NULL;
+ m_fclose(&tmpfp);
/* now that we have the template, send it. */
ci_send_message (flags, tmphdr, tmpbody, NULL, parent);
return;
bail:
/* now that we have the template, send it. */
ci_send_message (flags, tmphdr, tmpbody, NULL, parent);
return;
bail:
-
- if (tmpfp) {
- fclose (tmpfp);
- mutt_unlink (tmpbody);
- }
-
+ m_fclose(&tmpfp);
+ mutt_unlink(tmpbody);
header_delete(&tmphdr);
}
header_delete(&tmphdr);
}
@@
-611,9
+602,9
@@
static void attach_forward_msgs (FILE * fp, HEADER * hdr __attribute__ ((unused)
/* no MIME encapsulation */
/* no MIME encapsulation */
-
mutt_mktemp (tmpbody
);
- if (!
(tmpfp = safe_fopen (tmpbody, "w"))
) {
- mutt_error
(_("Can't create %s."), tmpbody
);
+
tmpfp = m_tempfile(tmpbody, sizeof(tmpbody), NONULL(MCore.tmpdir), NULL
);
+ if (!
tmpfp
) {
+ mutt_error
(_("Could not create temporary file")
);
header_delete(&tmphdr);
return;
}
header_delete(&tmphdr);
return;
}
@@
-651,7
+642,7
@@
static void attach_forward_msgs (FILE * fp, HEADER * hdr __attribute__ ((unused)
}
}
}
}
}
}
-
fclose (
tmpfp);
+
m_fclose(&
tmpfp);
}
else if (rc == M_YES) { /* do MIME encapsulation - we don't need to do much here */
last = &tmphdr->content;
}
else if (rc == M_YES) { /* do MIME encapsulation - we don't need to do much here */
last = &tmphdr->content;
@@
-820,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
@@
-859,9
+850,9
@@
void mutt_attach_reply (FILE * fp, HEADER * hdr,
return;
}
return;
}
-
mutt_mktemp (tmpbody
);
- if (
(tmpfp = safe_fopen (tmpbody, "w")) == NULL
) {
- mutt_error
(_("Can't create %s."), tmpbody
);
+
tmpfp = m_tempfile(tmpbody, sizeof(tmpbody), NONULL(MCore.tmpdir), NULL
);
+ if (
!tmpfp
) {
+ mutt_error
(_("Could not create temporary file")
);
header_delete(&tmphdr);
return;
}
header_delete(&tmphdr);
return;
}
@@
-921,12
+912,12
@@
void mutt_attach_reply (FILE * fp, HEADER * hdr,
copy_problematic_attachments (fp, &tmphdr->content, idx, idxlen,
0) == NULL) {
header_delete(&tmphdr);
copy_problematic_attachments (fp, &tmphdr->content, idx, idxlen,
0) == NULL) {
header_delete(&tmphdr);
-
fclose (
tmpfp);
+
m_fclose(&
tmpfp);
return;
}
}
return;
}
}
-
fclose (
tmpfp);
+
m_fclose(&
tmpfp);
if (ci_send_message (flags, tmphdr, tmpbody, NULL, parent) == 0)
mutt_set_flag (Context, hdr, M_REPLIED, 1);
if (ci_send_message (flags, tmphdr, tmpbody, NULL, parent) == 0)
mutt_set_flag (Context, hdr, M_REPLIED, 1);