X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=gnupgparse.c;h=b9f00bad4ac8052b050b4b5278a106d34893a222;hp=1166a9128ad8f049cb47464d97834b75af35882f;hb=871a94fc21c9d349bb0fe8851e0f2e3a07527ed5;hpb=b3cb6ed8d36c550a2e589910ce51bbc8352ff57c

diff --git a/gnupgparse.c b/gnupgparse.c
index 1166a91..b9f00ba 100644
--- a/gnupgparse.c
+++ b/gnupgparse.c
@@ -34,16 +34,14 @@
 #include <ctype.h>
 
 #include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+
+#include <lib-mime/mime.h>
 
 #include "mutt.h"
 #include "pgp.h"
 #include "charset.h"
 
-/* for hexval */
-#include "mime.h"
-
-#include "lib/mem.h"
-#include "lib/str.h"
 #include "lib/debug.h"
 
 /****************
@@ -98,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, str_len (buf) < n))
+      else if (ob - buf == n && (buf[n] = 0, m_strlen(buf) < n))
         memcpy (uid, buf, n);
     }
     p_delete(&buf);
@@ -132,13 +130,13 @@ static pgp_key_t parse_pub_line (char *buf, int *is_subkey, pgp_key_t k)
       {
         debug_print (2, ("record type: %s\n", p));
 
-        if (!str_cmp (p, "pub"));
-        else if (!str_cmp (p, "sub"))
+        if (!m_strcmp(p, "pub"));
+        else if (!m_strcmp(p, "sub"))
           *is_subkey = 1;
-        else if (!str_cmp (p, "sec"));
-        else if (!str_cmp (p, "ssb"))
+        else if (!m_strcmp(p, "sec"));
+        else if (!m_strcmp(p, "ssb"))
           *is_subkey = 1;
-        else if (!str_cmp (p, "uid"))
+        else if (!m_strcmp(p, "uid"))
           is_uid = 1;
         else
           return NULL;
@@ -222,7 +220,7 @@ static pgp_key_t parse_pub_line (char *buf, int *is_subkey, pgp_key_t k)
         time.tm_sec = 0;
         time.tm_min = 0;
         time.tm_hour = 12;
-        strncpy (tstr, p, 11);
+        m_strcpy(tstr, sizeof(tstr), p);
         tstr[4] = '\0';
         time.tm_year = atoi (tstr) - 1900;
         tstr[7] = '\0';
@@ -250,7 +248,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;