X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=pgpkey.c;h=a4689ab99ba67b2a0af72cdadcea0c19d1a2f670;hp=a0aed7252367182964240b641196b60fb9289fbb;hb=207c707f2c7073a6fbd14124197a559d9d471f65;hpb=ecaab35b973fbceb58b5ed174971c82762cc0199

diff --git a/pgpkey.c b/pgpkey.c
index a0aed72..a4689ab 100644
--- a/pgpkey.c
+++ b/pgpkey.c
@@ -16,6 +16,7 @@
 #include <lib-lib/str.h>
 #include <lib-lib/ascii.h>
 #include <lib-lib/macros.h>
+#include <lib-lib/file.h>
 
 #include "mutt.h"
 #include "enter.h"
@@ -282,10 +283,10 @@ static int _pgp_compare_address (const void *a, const void *b)
   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);
 }
 
@@ -304,11 +305,11 @@ static int _pgp_compare_keyid (const void *a, const void *b)
   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)
@@ -325,7 +326,7 @@ static int _pgp_compare_date (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)
@@ -350,9 +351,9 @@ static int _pgp_compare_trust (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;
 }
 
@@ -411,11 +412,11 @@ static int pgp_id_matches_addr (ADDRESS * addr, ADDRESS * u_addr,
     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;
@@ -646,14 +647,14 @@ pgp_key_t pgp_ask_for_key (char *tag, char *whatfor,
   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;
@@ -932,11 +933,11 @@ pgp_key_t pgp_getkeybystr (char *p, short abilities, pgp_ring_t keyring)
 
     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;