#include <lib-lib/macros.h>
#include <lib-lib/file.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 "pgp.h"
#include "pager.h"
#include "sort.h"
#define PGP_KV_MATCH (PGP_KV_ADDR|PGP_KV_STRING)
-static int pgp_id_matches_addr (ADDRESS * addr, ADDRESS * u_addr,
+static int pgp_id_matches_addr (address_t * addr, address_t * u_addr,
pgp_uid_t * uid)
{
int rv = 0;
return rv;
}
-static pgp_key_t pgp_select_key (pgp_key_t keys, ADDRESS * p, const char *s)
+static pgp_key_t pgp_select_key (pgp_key_t keys, address_t * p, const char *s)
{
int keymax;
pgp_uid_t **KeyTable;
for (l = id_defaults; l; l = l->next)
if (!m_strcasecmp(whatfor, l->what)) {
- strfcpy (resp, NONULL (l->dflt), sizeof (resp));
+ m_strcpy(resp, sizeof(resp), NONULL(l->dflt));
break;
}
}
return NULL;
}
-pgp_key_t pgp_getkeybyaddr (ADDRESS * a, short abilities, pgp_ring_t keyring)
+pgp_key_t pgp_getkeybyaddr (address_t * a, short abilities, pgp_ring_t keyring)
{
- ADDRESS *r, *p;
+ address_t *r, *p;
LIST *hints = NULL;
int weak = 0;
this_key_has_weak = 1;
}
- rfc822_free_address (&r);
+ address_delete (&r);
}
if (match && !this_key_has_strong && this_key_has_invalid)