#include <lib-lib/macros.h>
#include <lib-lib/ascii.h>
+#include <lib-mime/mime.h>
+
#include "mutt.h"
#include "enter.h"
#include "recvattach.h"
#include "mutt_curses.h"
#include "mutt_menu.h"
-#include "mime.h"
#include "sort.h"
#include "copy.h"
#include "mx.h"
#include <sys/types.h>
#include <utime.h>
-extern char *ReleaseDate;
-
/* The folder the user last saved to. Used by ci_save_message() */
static char LastSaveFolder[_POSIX_PATH_MAX] = "";
{
char prompt[SHORT_STRING];
char buf[HUGE_STRING] = { 0 };
- ADDRESS *adr = NULL;
+ address_t *adr = NULL;
char *err = NULL;
int rc;
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;
}
}
if (query_quadoption (OPT_BOUNCE, prompt) != M_YES) {
- rfc822_free_address (&adr);
+ address_delete (&adr);
CLEARLINE (LINES - 1);
mutt_message (h ? _("Message not bounced.") : _("Messages not bounced."));
return;
CLEARLINE (LINES - 1);
rc = mutt_bounce_message (NULL, h, adr);
- rfc822_free_address (&adr);
+ address_delete (&adr);
/* If no error, or background, display message. */
if ((rc == 0) || (rc == S_BKG))
mutt_message (h ? _("Message bounced.") : _("Messages bounced."));
{
const char *pfx = NULL;
char buf[SHORT_STRING];
- ADDRESS *adr = NULL;
+ address_t *adr = NULL;
adr = mutt_get_address(env, &pfx);
for (p = b->parameter; p; p = p->next) {
l = m_strlen(buf);
- rfc822_cat (tmp, sizeof (tmp), p->value, MimeSpecials);
+ rfc822_strcpy(tmp, sizeof(tmp), p->value, MimeSpecials);
snprintf (buf + l, sizeof (buf) - l, "; %s=%s", p->attribute, tmp);
}
}