X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=gnupgparse.c;h=4d2d72d145ed79d36264eb4dff30275b4937eb14;hp=ce4d92efe2b86ddf63523c0152284b43d3be36ce;hb=7f7a0be369840b290248e5b0302beb447fa1b3cd;hpb=617e7d83d14e14e6a520a48e75437211b16c8834

diff --git a/gnupgparse.c b/gnupgparse.c
index ce4d92e..4d2d72d 100644
--- a/gnupgparse.c
+++ b/gnupgparse.c
@@ -34,6 +34,7 @@
 #include <ctype.h>
 
 #include <lib-lib/mem.h>
+#include <lib-lib/str.h>
 
 #include "mutt.h"
 #include "pgp.h"
@@ -42,7 +43,6 @@
 /* for hexval */
 #include "mime.h"
 
-#include "lib/str.h"
 #include "lib/debug.h"
 
 /****************
@@ -97,7 +97,7 @@ static void fix_uid (char *uid)
         memcpy (uid, buf, ob - buf);
         uid[ob - buf] = '\0';
       }
-      else if (ob - buf == n && (buf[n] = 0, str_len (buf) < n))
+      else if (ob - buf == n && (buf[n] = 0, m_strlen(buf) < n))
         memcpy (uid, buf, n);
     }
     p_delete(&buf);
@@ -249,7 +249,7 @@ static pgp_key_t parse_pub_line (char *buf, int *is_subkey, pgp_key_t k)
 
         uid = p_new(pgp_uid_t, 1);
         fix_uid (p);
-        uid->addr = str_dup (p);
+        uid->addr = m_strdup(p);
         uid->trust = trust;
         uid->flags |= flags;
         uid->parent = k;