#endif
#include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/ascii.h>
+#include <lib-lib/macros.h>
+#include <lib-lib/file.h>
+
+#include <lib-mime/mime.h>
#include "mutt.h"
#include "enter.h"
-#include "ascii.h"
#include "recvattach.h"
#include "mutt_curses.h"
#include "mutt_menu.h"
-#include "mime.h"
#include "pgp.h"
#include "pager.h"
#include "sort.h"
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
#include "lib/debug.h"
#include <string.h>
pgp_uid_t **s = (pgp_uid_t **) a;
pgp_uid_t **t = (pgp_uid_t **) b;
- if ((r = str_casecmp ((*s)->addr, (*t)->addr)))
+ if ((r = m_strcasecmp((*s)->addr, (*t)->addr)))
return r > 0;
else
- return (str_casecmp (_pgp_keyid ((*s)->parent),
+ return (m_strcasecmp(_pgp_keyid ((*s)->parent),
_pgp_keyid ((*t)->parent)) > 0);
}
pgp_uid_t **s = (pgp_uid_t **) a;
pgp_uid_t **t = (pgp_uid_t **) b;
- if ((r = str_casecmp (_pgp_keyid ((*s)->parent),
+ if ((r = m_strcasecmp(_pgp_keyid ((*s)->parent),
_pgp_keyid ((*t)->parent))))
return r > 0;
else
- return (str_casecmp ((*s)->addr, (*t)->addr)) > 0;
+ return (m_strcasecmp((*s)->addr, (*t)->addr)) > 0;
}
static int pgp_compare_keyid (const void *a, const void *b)
if ((r = ((*s)->parent->gen_time - (*t)->parent->gen_time)))
return r > 0;
- return (str_casecmp ((*s)->addr, (*t)->addr)) > 0;
+ return (m_strcasecmp((*s)->addr, (*t)->addr)) > 0;
}
static int pgp_compare_date (const void *a, const void *b)
return r < 0;
if ((r = ((*s)->parent->gen_time - (*t)->parent->gen_time)))
return r < 0;
- if ((r = str_casecmp ((*s)->addr, (*t)->addr)))
+ if ((r = m_strcasecmp((*s)->addr, (*t)->addr)))
return r > 0;
- return (str_casecmp (_pgp_keyid ((*s)->parent),
+ return (m_strcasecmp(_pgp_keyid ((*s)->parent),
_pgp_keyid ((*t)->parent))) > 0;
}
#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;
rv |= PGP_KV_STRONGID;
if (addr->mailbox && u_addr->mailbox
- && str_casecmp (addr->mailbox, u_addr->mailbox) == 0)
+ && m_strcasecmp(addr->mailbox, u_addr->mailbox) == 0)
rv |= PGP_KV_ADDR;
if (addr->personal && u_addr->personal
- && str_casecmp (addr->personal, u_addr->personal) == 0)
+ && m_strcasecmp(addr->personal, u_addr->personal) == 0)
rv |= PGP_KV_STRING;
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;
if (i == keymax) {
keymax += 5;
- mem_realloc (&KeyTable, sizeof (pgp_uid_t *) * keymax);
+ p_realloc(&KeyTable, keymax);
}
KeyTable[i++] = a;
if (whatfor) {
for (l = id_defaults; l; l = l->next)
- if (!str_casecmp (whatfor, l->what)) {
- strfcpy (resp, NONULL (l->dflt), sizeof (resp));
+ if (!m_strcasecmp(whatfor, l->what)) {
+ m_strcpy(resp, sizeof(resp), NONULL(l->dflt));
break;
}
}
- FOREVER {
+ for (;;) {
resp[0] = 0;
if (mutt_get_field (tag, resp, sizeof (resp), M_CLEAR) != 0)
return NULL;
l = p_new(struct pgp_cache, 1);
l->next = id_defaults;
id_defaults = l;
- l->what = str_dup (whatfor);
- l->dflt = str_dup (resp);
+ l->what = m_strdup(whatfor);
+ l->dflt = m_strdup(resp);
}
}
fclose (devnull);
att = mutt_new_body ();
- att->filename = str_dup (tempf);
+ att->filename = m_strdup(tempf);
att->unlink = 1;
att->use_disp = 0;
att->type = TYPEAPPLICATION;
- att->subtype = str_dup ("pgp-keys");
+ att->subtype = m_strdup("pgp-keys");
snprintf (buff, sizeof (buff), _("PGP Key %s."), tmp);
- att->description = str_dup (buff);
+ att->description = m_strdup(buff);
mutt_update_encoding (att);
stat (tempf, &sb);
char *scratch;
char *t;
- if ((scratch = str_dup (str)) == NULL)
+ if ((scratch = m_strdup(str)) == NULL)
return hints;
for (t = strtok (scratch, " ,.:\"()<>\n"); t;
t = strtok (NULL, " ,.:\"()<>\n")) {
- if (str_len (t) > 3)
+ if (m_strlen(t) > 3)
hints = mutt_add_list (hints, t);
}
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;
for (a = k->address; a; a = a->next) {
debug_print (5, ("matching \"%s\" against key %s, \"%s\":\n", p, pgp_keyid (k), a->addr));
- if (!*p || str_casecmp (p, pgp_keyid (k)) == 0
- || (!str_ncasecmp (p, "0x", 2)
- && !str_casecmp (p + 2, pgp_keyid (k)))
- || (option (OPTPGPLONGIDS) && !str_ncasecmp (p, "0x", 2)
- && !str_casecmp (p + 2, k->keyid + 8))
+ if (!*p || m_strcasecmp(p, pgp_keyid (k)) == 0
+ || (!m_strncasecmp(p, "0x", 2)
+ && !m_strcasecmp(p + 2, pgp_keyid (k)))
+ || (option (OPTPGPLONGIDS) && !m_strncasecmp(p, "0x", 2)
+ && !m_strcasecmp(p + 2, k->keyid + 8))
|| str_isstr (a->addr, p)) {
debug_print (5, ("match.\n"));
match = 1;