X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=lib-crypt%2Fpgpinvoke.c;h=a8f0bb8d4b5b3a00c2a6694665961c380177c716;hb=27c3007f2cfb52db5a357eaa2a8313a5ab03c93d;hp=39c10ad4d20c739370e4bbdb6f626153e8667603;hpb=f3cbb9f51357972f6e74244494236a41dc4d84cd;p=apps%2Fmadmutt.git

diff --git a/lib-crypt/pgpinvoke.c b/lib-crypt/pgpinvoke.c
index 39c10ad..a8f0bb8 100644
--- a/lib-crypt/pgpinvoke.c
+++ b/lib-crypt/pgpinvoke.c
@@ -108,11 +108,9 @@ _mutt_fmt_pgp_command(char *dest, ssize_t destlen,
   }
 
   if (optional)
-    mutt_FormatString (dest, destlen, ifstring, _mutt_fmt_pgp_command, data,
-                       0);
+    m_strformat(dest, destlen, ifstring, _mutt_fmt_pgp_command, data, 0);
   else if (flags & M_FORMAT_OPTIONAL)
-    mutt_FormatString (dest, destlen, elsestring, _mutt_fmt_pgp_command, data,
-                       0);
+    m_strformat(dest, destlen, elsestring, _mutt_fmt_pgp_command, data, 0);
 
   return (src);
 }
@@ -121,7 +119,7 @@ static void
 mutt_pgp_command(char *d, ssize_t dlen, struct pgp_command_context *cctx,
                  const char *fmt)
 {
-  mutt_FormatString (d, dlen, NONULL (fmt), _mutt_fmt_pgp_command,
+  m_strformat (d, dlen, NONULL (fmt), _mutt_fmt_pgp_command,
                      (unsigned long) cctx, 0);
 }
 
@@ -231,7 +229,7 @@ pid_t pgp_invoke_traditional (FILE ** pgpin, FILE ** pgpout, FILE ** pgperr,
 
 void pgp_invoke_import (const char *fname)
 {
-  char _fname[_POSIX_PATH_MAX + SHORT_STRING];
+  char _fname[_POSIX_PATH_MAX + STRING];
   char cmd[HUGE_STRING];
   struct pgp_command_context cctx;
 
@@ -263,10 +261,9 @@ void pgp_invoke_getkeys (address_t * addr)
   personal = addr->personal;
   addr->personal = NULL;
 
-  *tmp = '\0';
-  mutt_addrlist_to_local (addr);
-  rfc822_write_address_single (tmp, sizeof (tmp), addr, 0);
-  mutt_quote_filename (buff, sizeof (buff), tmp);
+  mutt_addrlist_to_local(addr);
+  rfc822_addrcpy(tmp, sizeof(tmp), addr, 0);
+  mutt_quote_filename(buff, sizeof(buff), tmp);
 
   addr->personal = personal;