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

diff --git a/gnupgparse.c b/gnupgparse.c
index 4d2d72d..03bab1a 100644
--- 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"
 
 /****************
@@ -87,7 +86,7 @@ static void fix_uid (char *uid)
     char *buf;
     const char *ib;
     char *ob;
-    size_t ibl, obl;
+    ssize_t ibl, obl;
 
     buf = p_new(char, n + 1);
     ib = uid, ibl = d - uid + 1, ob = buf, obl = n;
@@ -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;
@@ -205,29 +204,29 @@ 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;
 
       }
     case 6:                    /* timestamp (1998-02-28) */
       {
         char tstr[11];
-        struct tm time;
+        struct tm st_time;
 
         debug_print (2, ("time stamp: %s\n", p));
 
         if (!p)
           break;
-        time.tm_sec = 0;
-        time.tm_min = 0;
-        time.tm_hour = 12;
-        strncpy (tstr, p, 11);
+        st_time.tm_sec = 0;
+        st_time.tm_min = 0;
+        st_time.tm_hour = 12;
+        m_strcpy(tstr, sizeof(tstr), p);
         tstr[4] = '\0';
-        time.tm_year = atoi (tstr) - 1900;
+        st_time.tm_year = atoi (tstr) - 1900;
         tstr[7] = '\0';
-        time.tm_mon = (atoi (tstr + 5)) - 1;
-        time.tm_mday = atoi (tstr + 8);
-        k->gen_time = mutt_mktime (&time, 0);
+        st_time.tm_mon = (atoi (tstr + 5)) - 1;
+        st_time.tm_mday = atoi (tstr + 8);
+        k->gen_time = mutt_mktime (&st_time, 0);
         break;
       }
     case 7:                    /* valid for n days */
@@ -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);