X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=crypt-gpgme.c;h=e920128ccd5b82212c23e6c76a32a5e4261c59de;hp=2a370b0e190f19bdca69c6f3fdc046508fcd2fd5;hb=91d0c04349c9345f0ee29a61cc18dfc144b60edc;hpb=9274cbe8e6410ddb95ddc667faa678a29da85420 diff --git a/crypt-gpgme.c b/crypt-gpgme.c index 2a370b0..e920128 100644 --- a/crypt-gpgme.c +++ b/crypt-gpgme.c @@ -22,6 +22,7 @@ #include #include #include +#include #include "mutt.h" #include "mutt_crypt.h" @@ -298,11 +299,11 @@ static int crypt_id_matches_addr (ADDRESS * addr, ADDRESS * u_addr, rv |= CRYPT_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 |= CRYPT_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 |= CRYPT_KV_STRING; return rv; @@ -686,8 +687,7 @@ static int get_micalg (gpgme_ctx_t ctx, char *buf, size_t buflen) if (result) { algorithm_name = gpgme_hash_algo_name (result->signatures->hash_algo); if (algorithm_name) { - strncpy (buf, algorithm_name, buflen - 1); - buf[buflen - 1] = 0; + m_strcpy(buf, buflen, algorithm_name); } } @@ -1006,7 +1006,7 @@ static int show_sig_summary (unsigned long sum, state_attach_puts (": ", s); if (t0) state_attach_puts (t0, s); - if (t1 && !(t0 && !str_cmp (t0, t1))) { + if (t1 && !(t0 && !m_strcmp(t0, t1))) { if (t0) state_attach_puts (",", s); state_attach_puts (t1, s); @@ -1659,10 +1659,10 @@ static int pgp_check_traditional_one_body (FILE * fp, BODY * b, } while (fgets (buf, sizeof (buf), tfp)) { - if (!str_ncmp ("-----BEGIN PGP ", buf, 15)) { - if (!str_cmp ("MESSAGE-----\n", buf + 15)) + if (!m_strncmp("-----BEGIN PGP ", buf, 15)) { + if (!m_strcmp("MESSAGE-----\n", buf + 15)) enc = 1; - else if (!str_cmp ("SIGNED MESSAGE-----\n", buf + 15)) + else if (!m_strcmp("SIGNED MESSAGE-----\n", buf + 15)) sgn = 1; } } @@ -1741,7 +1741,7 @@ static void copy_clearsigned (gpgme_data_t data, STATE * s, char *charset) continue; } - if (!str_cmp (buf, "-----BEGIN PGP SIGNATURE-----\n")) + if (!m_strcmp(buf, "-----BEGIN PGP SIGNATURE-----\n")) break; if (armor_header) { @@ -1789,7 +1789,7 @@ int pgp_gpgme_application_handler (BODY * m, STATE * s) but we know that this may only be text thus we assume Latin-1 here. */ if (!mutt_get_body_charset (body_charset, sizeof (body_charset), m)) - strfcpy (body_charset, "iso-8859-1", sizeof body_charset); + m_strcpy(body_charset, sizeof(body_charset), "iso-8859-1"); fseeko (s->fpin, m->offset, 0); last_pos = m->offset; @@ -1802,18 +1802,18 @@ int pgp_gpgme_application_handler (BODY * m, STATE * s) bytes -= (offset - last_pos); /* don't rely on m_strlen(buf) */ last_pos = offset; - if (!str_ncmp ("-----BEGIN PGP ", buf, 15)) { + if (!m_strncmp("-----BEGIN PGP ", buf, 15)) { clearsign = 0; start_pos = last_pos; - if (!str_cmp ("MESSAGE-----\n", buf + 15)) + if (!m_strcmp("MESSAGE-----\n", buf + 15)) needpass = 1; - else if (!str_cmp ("SIGNED MESSAGE-----\n", buf + 15)) { + else if (!m_strcmp("SIGNED MESSAGE-----\n", buf + 15)) { clearsign = 1; needpass = 0; } else if (!option (OPTDONTHANDLEPGPKEYS) && - !str_cmp ("PUBLIC KEY BLOCK-----\n", buf + 15)) { + !m_strcmp("PUBLIC KEY BLOCK-----\n", buf + 15)) { needpass = 0; pgp_keyblock = 1; } @@ -1837,10 +1837,10 @@ int pgp_gpgme_application_handler (BODY * m, STATE * s) gpgme_data_write (armored_data, buf, m_strlen(buf)); - if ((needpass && !str_cmp ("-----END PGP MESSAGE-----\n", buf)) + if ((needpass && !m_strcmp("-----END PGP MESSAGE-----\n", buf)) || (!needpass - && (!str_cmp ("-----END PGP SIGNATURE-----\n", buf) - || !str_cmp ("-----END PGP PUBLIC KEY BLOCK-----\n", + && (!m_strcmp("-----END PGP SIGNATURE-----\n", buf) + || !m_strcmp("-----END PGP PUBLIC KEY BLOCK-----\n", buf)))) break; } @@ -2370,10 +2370,10 @@ static int _crypt_compare_address (const void *a, const void *b) crypt_key_t **t = (crypt_key_t **) b; int r; - if ((r = str_casecmp ((*s)->uid, (*t)->uid))) + if ((r = m_strcasecmp((*s)->uid, (*t)->uid))) return r > 0; else - return str_casecmp (crypt_keyid (*s), crypt_keyid (*t)) > 0; + return m_strcasecmp(crypt_keyid (*s), crypt_keyid (*t)) > 0; } static int crypt_compare_address (const void *a, const void *b) @@ -2390,10 +2390,10 @@ static int _crypt_compare_keyid (const void *a, const void *b) crypt_key_t **t = (crypt_key_t **) b; int r; - if ((r = str_casecmp (crypt_keyid (*s), crypt_keyid (*t)))) + if ((r = m_strcasecmp(crypt_keyid (*s), crypt_keyid (*t)))) return r > 0; else - return str_casecmp ((*s)->uid, (*t)->uid) > 0; + return m_strcasecmp((*s)->uid, (*t)->uid) > 0; } static int crypt_compare_keyid (const void *a, const void *b) @@ -2419,7 +2419,7 @@ static int _crypt_compare_date (const void *a, const void *b) if (ts < tt) return 0; - return str_casecmp ((*s)->uid, (*t)->uid) > 0; + return m_strcasecmp((*s)->uid, (*t)->uid) > 0; } static int crypt_compare_date (const void *a, const void *b) @@ -2464,9 +2464,9 @@ static int _crypt_compare_trust (const void *a, const void *b) if (ts < tt) return 0; - if ((r = str_casecmp ((*s)->uid, (*t)->uid))) + if ((r = m_strcasecmp((*s)->uid, (*t)->uid))) return r > 0; - return (str_casecmp (crypt_keyid ((*s)), crypt_keyid ((*t)))) > 0; + return (m_strcasecmp(crypt_keyid ((*s)), crypt_keyid ((*t)))) > 0; } static int crypt_compare_trust (const void *a, const void *b) @@ -2482,7 +2482,7 @@ static int print_dn_part (FILE * fp, struct dn_array_s *dn, const char *key) int any = 0; for (; dn->key; dn++) { - if (!str_cmp (dn->key, key)) { + if (!m_strcmp(dn->key, key)) { if (any) fputs (" + ", fp); print_utf8 (fp, dn->value, m_strlen(dn->value)); @@ -2508,7 +2508,7 @@ static void print_dn_parts (FILE * fp, struct dn_array_s *dn) /* now print the rest without any specific ordering */ for (; dn->key; dn++) { for (i = 0; stdpart[i]; i++) { - if (!str_cmp (dn->key, stdpart[i])) + if (!m_strcmp(dn->key, stdpart[i])) break; } if (!stdpart[i]) { @@ -2981,7 +2981,7 @@ static void verify_key (crypt_key_t * key) k = key->kobj; gpgme_key_ref (k); - while ((s = k->chain_id) && k->subkeys && str_cmp (s, k->subkeys->fpr)) { + while ((s = k->chain_id) && k->subkeys && m_strcmp(s, k->subkeys->fpr)) { putc ('\n', fp); err = gpgme_op_keylist_start (listctx, s, 0); gpgme_key_release (k); @@ -3221,7 +3221,7 @@ static LIST *crypt_add_string_to_hints (LIST * hints, const char *str) for (t = strtok (scratch, " ,.:\"()<>\n"); t; t = strtok (NULL, " ,.:\"()<>\n")) { if (m_strlen(t) > 3) - hints = mutt_add_list (hints, t); + hints = mutt_add_list(hints, t); } p_delete(&scratch); @@ -3569,12 +3569,12 @@ static crypt_key_t *crypt_getkeybystr (char *p, short abilities, match = 0; debug_print (5, ("matching \"%s\" against " "key %s, \"%s\":\n", p, crypt_keyid (k), k->uid)); - if (!*p || !str_casecmp (p, crypt_keyid (k)) - || (!str_ncasecmp (p, "0x", 2) - && !str_casecmp (p + 2, crypt_keyid (k))) + if (!*p || !m_strcasecmp(p, crypt_keyid (k)) + || (!m_strncasecmp(p, "0x", 2) + && !m_strcasecmp(p + 2, crypt_keyid (k))) || (option (OPTPGPLONGIDS) - && !str_ncasecmp (p, "0x", 2) - && !str_casecmp (p + 2, crypt_keyid (k) + 8)) + && !m_strncasecmp(p, "0x", 2) + && !m_strcasecmp(p + 2, crypt_keyid (k) + 8)) || str_isstr (k->uid, p)) { crypt_key_t *tmp; @@ -3621,8 +3621,8 @@ static crypt_key_t *crypt_ask_for_key (char *tag, 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; } }