more work in the lib-mime. begin to "rewr^H^Had" the code in rfc2231.c

[apps/madmutt.git] / gnupgparse.c

diff --git a/gnupgparse.c b/gnupgparse.c
index 4d2d72d..b9f00ba 100644 (file)
--- a/gnupgparse.c
+++ b/gnupgparse.c
@@ -36,13 +36,12 @@
 #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/debug.h"
 
 /****************
@@ -131,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;
@@ -221,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';