projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
oopsie, small fixes.
[apps/madmutt.git]
/
recvcmd.c
diff --git
a/recvcmd.c
b/recvcmd.c
index
7cd9a16
..
79f42d0
100644
(file)
--- a/
recvcmd.c
+++ b/
recvcmd.c
@@
-17,15
+17,17
@@
#include <lib-lib/file.h>
#include <lib-lib/mapping.h>
#include <lib-lib/file.h>
#include <lib-lib/mapping.h>
+#include <lib-mime/mime.h>
+
+#include <lib-ui/curses.h>
+#include <lib-ui/enter.h>
+#include <lib-ui/menu.h>
+
#include "mutt.h"
#include "mutt.h"
-#include "
enter
.h"
+#include "
alias
.h"
#include "state.h"
#include "handler.h"
#include "recvattach.h"
#include "state.h"
#include "handler.h"
#include "recvattach.h"
-#include "mutt_curses.h"
-#include "mutt_menu.h"
-#include "rfc1524.h"
-#include "mime.h"
#include "attach.h"
#include "mx.h"
#include "copy.h"
#include "attach.h"
#include "mx.h"
#include "copy.h"
@@
-118,14
+120,14
@@
static short count_tagged_children (ATTACHPTR ** idx, short idxlen, short i)
**
**/
**
**/
-void mutt_attach_bounce (FILE * fp, HEADER * hdr,
+void mutt_attach_bounce (FILE * fp, HEADER * hdr
__attribute__ ((unused))
,
ATTACHPTR ** idx, short idxlen, BODY * cur)
{
short i;
char prompt[STRING];
char buf[HUGE_STRING];
ATTACHPTR ** idx, short idxlen, BODY * cur)
{
short i;
char prompt[STRING];
char buf[HUGE_STRING];
- char *err = NULL;
-
ADDRESS
*adr = NULL;
+ c
onst c
har *err = NULL;
+
address_t
*adr = NULL;
int ret = 0;
int p = 0;
int ret = 0;
int p = 0;
@@
-156,7
+158,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_list_wipe
(&adr);
return;
}
return;
}
@@
-181,7
+183,7
@@
void mutt_attach_bounce (FILE * fp, HEADER * hdr,
}
if (query_quadoption (OPT_BOUNCE, prompt) != M_YES) {
}
if (query_quadoption (OPT_BOUNCE, prompt) != M_YES) {
-
rfc822_free_address
(&adr);
+
address_list_wipe
(&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;
@@
-215,7
+217,7
@@
void mutt_attach_bounce (FILE * fp, HEADER * hdr,
**
**/
**
**/
-void mutt_attach_resend (FILE * fp, HEADER * hdr, ATTACHPTR ** idx,
+void mutt_attach_resend (FILE * fp, HEADER * hdr
__attribute__ ((unused))
, ATTACHPTR ** idx,
short idxlen, BODY * cur)
{
short i;
short idxlen, BODY * cur)
{
short i;
@@
-387,8
+389,8
@@
static void attach_forward_bodies (FILE * fp, HEADER * hdr,
parent = hdr;
parent = hdr;
- tmphdr =
mutt_new_header
();
- tmphdr->env =
mutt_new_envelope
();
+ tmphdr =
header_new
();
+ tmphdr->env =
envelope_new
();
mutt_make_forward_subject (tmphdr->env, Context, parent);
mutt_mktemp (tmpbody);
mutt_make_forward_subject (tmphdr->env, Context, parent);
mutt_mktemp (tmpbody);
@@
-506,7
+508,7
@@
bail:
mutt_unlink (tmpbody);
}
mutt_unlink (tmpbody);
}
-
mutt_free_header
(&tmphdr);
+
header_delete
(&tmphdr);
}
}
@@
-521,7
+523,7
@@
bail:
* the attachment index.
*/
* the attachment index.
*/
-static void attach_forward_msgs (FILE * fp, HEADER * hdr,
+static void attach_forward_msgs (FILE * fp, HEADER * hdr
__attribute__ ((unused))
,
ATTACHPTR ** idx, short idxlen, BODY * cur,
int flags)
{
ATTACHPTR ** idx, short idxlen, BODY * cur,
int flags)
{
@@
-547,8
+549,8
@@
static void attach_forward_msgs (FILE * fp, HEADER * hdr,
}
}
}
}
- tmphdr =
mutt_new_header
();
- tmphdr->env =
mutt_new_envelope
();
+ tmphdr =
header_new
();
+ tmphdr->env =
envelope_new
();
mutt_make_forward_subject (tmphdr->env, Context, curhdr);
mutt_make_forward_subject (tmphdr->env, Context, curhdr);
@@
-562,7
+564,7
@@
static void attach_forward_msgs (FILE * fp, HEADER * hdr,
mutt_mktemp (tmpbody);
if (!(tmpfp = safe_fopen (tmpbody, "w"))) {
mutt_error (_("Can't create %s."), tmpbody);
mutt_mktemp (tmpbody);
if (!(tmpfp = safe_fopen (tmpbody, "w"))) {
mutt_error (_("Can't create %s."), tmpbody);
-
mutt_free_header
(&tmphdr);
+
header_delete
(&tmphdr);
return;
}
return;
}
@@
-614,7
+616,7
@@
static void attach_forward_msgs (FILE * fp, HEADER * hdr,
}
}
else
}
}
else
-
mutt_free_header
(&tmphdr);
+
header_delete
(&tmphdr);
ci_send_message (flags, tmphdr, *tmpbody ? tmpbody : NULL, NULL, curhdr);
ci_send_message (flags, tmphdr, *tmpbody ? tmpbody : NULL, NULL, curhdr);
@@
-721,7
+723,7
@@
attach_reply_envelope_defaults (ENVELOPE * env, ATTACHPTR ** idx,
if (parent)
mutt_add_to_reference_headers (env, curenv, NULL, NULL);
else {
if (parent)
mutt_add_to_reference_headers (env, curenv, NULL, NULL);
else {
-
LIST
**p = NULL, **q = NULL;
+
string_list_t
**p = NULL, **q = NULL;
for (i = 0; i < idxlen; i++) {
if (idx[i]->content->tagged)
for (i = 0; i < idxlen; i++) {
if (idx[i]->content->tagged)
@@
-737,7
+739,7
@@
attach_reply_envelope_defaults (ENVELOPE * env, ATTACHPTR ** idx,
/* This is _very_ similar to send.c's include_reply(). */
static void attach_include_reply (FILE * fp, FILE * tmpfp, HEADER * cur,
/* This is _very_ similar to send.c's include_reply(). */
static void attach_include_reply (FILE * fp, FILE * tmpfp, HEADER * cur,
- int flags)
+ int flags
__attribute__ ((unused))
)
{
int cmflags = M_CM_PREFIX | M_CM_DECODE | M_CM_CHARCONV;
int chflags = CH_DECODE;
{
int cmflags = M_CM_PREFIX | M_CM_DECODE | M_CM_CHARCONV;
int chflags = CH_DECODE;
@@
-799,21
+801,21
@@
void mutt_attach_reply (FILE * fp, HEADER * hdr,
else if (nattach == 1)
mime_reply_any = 1;
else if (nattach == 1)
mime_reply_any = 1;
- tmphdr =
mutt_new_header
();
- tmphdr->env =
mutt_new_envelope
();
+ tmphdr =
header_new
();
+ tmphdr->env =
envelope_new
();
if (attach_reply_envelope_defaults (tmphdr->env, idx, idxlen,
parent ? parent : (cur ? cur->
hdr : NULL),
flags) == -1) {
if (attach_reply_envelope_defaults (tmphdr->env, idx, idxlen,
parent ? parent : (cur ? cur->
hdr : NULL),
flags) == -1) {
-
mutt_free_header
(&tmphdr);
+
header_delete
(&tmphdr);
return;
}
mutt_mktemp (tmpbody);
if ((tmpfp = safe_fopen (tmpbody, "w")) == NULL) {
mutt_error (_("Can't create %s."), tmpbody);
return;
}
mutt_mktemp (tmpbody);
if ((tmpfp = safe_fopen (tmpbody, "w")) == NULL) {
mutt_error (_("Can't create %s."), tmpbody);
-
mutt_free_header
(&tmphdr);
+
header_delete
(&tmphdr);
return;
}
return;
}
@@
-871,7
+873,7
@@
void mutt_attach_reply (FILE * fp, HEADER * hdr,
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) {
-
mutt_free_header
(&tmphdr);
+
header_delete
(&tmphdr);
fclose (tmpfp);
return;
}
fclose (tmpfp);
return;
}