X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=gnupgparse.c;h=c0ed056fea66946a2a9b381f94359af8400abaa2;hp=257220f95a3c7cd104d3926a0e8c96b5ba34f61b;hb=fe23f004535336d4d6103eada14a59173c212edb;hpb=0f44dc85fc1280372ffab911d701e703d803fb4b

diff --git a/gnupgparse.c b/gnupgparse.c
index 257220f..c0ed056 100644
--- a/gnupgparse.c
+++ b/gnupgparse.c
@@ -42,6 +42,7 @@
 
 #include "lib/mem.h"
 #include "lib/str.h"
+#include "lib/debug.h"
 
 /****************
  * Read the GNUPG keys.  For now we read the complete keyring by
@@ -95,7 +96,7 @@ static void fix_uid (char *uid)
         memcpy (uid, buf, ob - buf);
         uid[ob - buf] = '\0';
       }
-      else if (ob - buf == n && (buf[n] = 0, safe_strlen (buf) < n))
+      else if (ob - buf == n && (buf[n] = 0, mutt_strlen (buf) < n))
         memcpy (uid, buf, n);
     }
     FREE (&buf);
@@ -115,7 +116,7 @@ static pgp_key_t parse_pub_line (char *buf, int *is_subkey, pgp_key_t k)
   if (!*buf)
     return NULL;
 
-  dprint (2, (debugfile, "parse_pub_line: buf = `%s'\n", buf));
+  debug_print (2, ("buf = `%s'\n", buf));
 
   for (p = buf; p; p = pend) {
     if ((pend = strchr (p, ':')))
@@ -127,15 +128,15 @@ static pgp_key_t parse_pub_line (char *buf, int *is_subkey, pgp_key_t k)
     switch (field) {
     case 1:                    /* record type */
       {
-        dprint (2, (debugfile, "record type: %s\n", p));
+        debug_print (2, ("record type: %s\n", p));
 
-        if (!safe_strcmp (p, "pub"));
-        else if (!safe_strcmp (p, "sub"))
+        if (!mutt_strcmp (p, "pub"));
+        else if (!mutt_strcmp (p, "sub"))
           *is_subkey = 1;
-        else if (!safe_strcmp (p, "sec"));
-        else if (!safe_strcmp (p, "ssb"))
+        else if (!mutt_strcmp (p, "sec"));
+        else if (!mutt_strcmp (p, "ssb"))
           *is_subkey = 1;
-        else if (!safe_strcmp (p, "uid"))
+        else if (!mutt_strcmp (p, "uid"))
           is_uid = 1;
         else
           return NULL;
@@ -147,7 +148,7 @@ static pgp_key_t parse_pub_line (char *buf, int *is_subkey, pgp_key_t k)
       }
     case 2:                    /* trust info */
       {
-        dprint (2, (debugfile, "trust info: %s\n", p));
+        debug_print (2, ("trust info: %s\n", p));
 
         switch (*p) {           /* look only at the first letter */
         case 'e':
@@ -181,7 +182,7 @@ static pgp_key_t parse_pub_line (char *buf, int *is_subkey, pgp_key_t k)
     case 3:                    /* key length  */
       {
 
-        dprint (2, (debugfile, "key len: %s\n", p));
+        debug_print (2, ("key len: %s\n", p));
 
         if (!(*is_subkey && option (OPTPGPIGNORESUB)))
           k->keylen = atoi (p); /* fixme: add validation checks */
@@ -190,7 +191,7 @@ static pgp_key_t parse_pub_line (char *buf, int *is_subkey, pgp_key_t k)
     case 4:                    /* pubkey algo */
       {
 
-        dprint (2, (debugfile, "pubkey algorithm: %s\n", p));
+        debug_print (2, ("pubkey algorithm: %s\n", p));
 
         if (!(*is_subkey && option (OPTPGPIGNORESUB))) {
           k->numalg = atoi (p);
@@ -200,7 +201,7 @@ static pgp_key_t parse_pub_line (char *buf, int *is_subkey, pgp_key_t k)
       }
     case 5:                    /* 16 hex digits with the long keyid. */
       {
-        dprint (2, (debugfile, "key id: %s\n", p));
+        debug_print (2, ("key id: %s\n", p));
 
         if (!(*is_subkey && option (OPTPGPIGNORESUB)))
           str_replace (&k->keyid, p);
@@ -212,7 +213,7 @@ static pgp_key_t parse_pub_line (char *buf, int *is_subkey, pgp_key_t k)
         char tstr[11];
         struct tm time;
 
-        dprint (2, (debugfile, "time stamp: %s\n", p));
+        debug_print (2, ("time stamp: %s\n", p));
 
         if (!p)
           break;
@@ -243,7 +244,7 @@ static pgp_key_t parse_pub_line (char *buf, int *is_subkey, pgp_key_t k)
         if (!is_uid && (*is_subkey && option (OPTPGPIGNORESUB)))
           break;
 
-        dprint (2, (debugfile, "user ID: %s\n", p));
+        debug_print (2, ("user ID: %s\n", p));
 
         uid = safe_calloc (sizeof (pgp_uid_t), 1);
         fix_uid (p);
@@ -264,7 +265,7 @@ static pgp_key_t parse_pub_line (char *buf, int *is_subkey, pgp_key_t k)
     case 11:                   /* signature class  */
       break;
     case 12:                   /* key capabilities */
-      dprint (2, (debugfile, "capabilities info: %s\n", p));
+      debug_print (2, ("capabilities info: %s\n", p));
 
       while (*p) {
         switch (*p++) {