[PATCH] version.h doesn't depend on Makefile.am

[apps/madmutt.git] / gnupgparse.c

diff --git a/gnupgparse.c b/gnupgparse.c
index ef08bcd..cdce751 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"
 
 /****************
@@ -205,7 +204,7 @@ static pgp_key_t parse_pub_line (char *buf, int *is_subkey, pgp_key_t k)
         debug_print (2, ("key id: %s\n", p));
 
         if (!(*is_subkey && option (OPTPGPIGNORESUB)))
-          str_replace (&k->keyid, p);
+          m_strreplace(&k->keyid, p);
         break;
 
       }
@@ -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';
@@ -311,7 +310,7 @@ pgp_key_t pgp_get_candidates (pgp_ring_t keyring, LIST * hints)
   if ((devnull = open ("/dev/null", O_RDWR)) == -1)
     return NULL;
 
-  str_replace (&_chs, Charset);
+  m_strreplace(&_chs, Charset);
 
   thepid = pgp_invoke_list_keys (NULL, &fp, NULL, -1, -1, devnull,
                                  keyring, hints);