X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-crypt%2Fpgpinvoke.c;h=312f59eff0fe5142841c81f7266c70044ba56857;hp=1428e47c6014092dfd85116da2fe0e9dd4872b12;hb=1eeaaac6bdcad962c41bf975a32078cc4a0e578c;hpb=1ee89902de184a640c171ae3285bff6882a791bd

diff --git a/lib-crypt/pgpinvoke.c b/lib-crypt/pgpinvoke.c
index 1428e47..312f59e 100644
--- a/lib-crypt/pgpinvoke.c
+++ b/lib-crypt/pgpinvoke.c
@@ -14,12 +14,9 @@
 #include <lib-lib/lib-lib.h>
 
 #include <lib-sys/unix.h>
-
 #include <lib-mime/mime.h>
-
 #include <lib-ui/curses.h>
 
-#include "mutt.h"
 #include "mutt_idna.h"
 #include "pgp.h"
 
@@ -37,7 +34,7 @@ struct pgp_command_context {
 };
 
 
-const char *
+static const char *
 _mutt_fmt_pgp_command(char *dest, ssize_t destlen,
                       char op, const char *src, const char *prefix,
                       const char *ifstring, const char *elsestring,
@@ -111,19 +108,20 @@ _mutt_fmt_pgp_command(char *dest, ssize_t destlen,
   }
 
   if (optional)
-    mutt_FormatString (dest, destlen, ifstring, _mutt_fmt_pgp_command, data,
+    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,
+    m_strformat (dest, destlen, elsestring, _mutt_fmt_pgp_command, data,
                        0);
 
   return (src);
 }
 
-void mutt_pgp_command (char *d, ssize_t dlen, struct pgp_command_context *cctx,
-                       const char *fmt)
+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);
 }
 
@@ -233,7 +231,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;
 
@@ -265,10 +263,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;
 
@@ -318,7 +315,7 @@ pid_t pgp_invoke_list_keys (FILE ** pgpin, FILE ** pgpout, FILE ** pgperr,
   for (; hints; hints = hints->next) {
     mutt_quote_filename (quoted, sizeof (quoted), (char *) hints->data);
     snprintf (tmpuids, sizeof (tmpuids), "%s %s", uids, quoted);
-    strcpy (uids, tmpuids);     /* __STRCPY_CHECKED__ */
+    m_strcpy(uids, sizeof(uids), tmpuids);
   }
 
   return pgp_invoke (pgpin, pgpout, pgperr, pgpinfd, pgpoutfd, pgperrfd,