X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-crypt%2Fpgpinvoke.c;h=7b0b95ac8037ab35277080e5648726aa91d15581;hp=08f5d321888d62f767c0acc44fd5fa9d0f4dd668;hb=486de69aa30a7bfca3625a1b521411dc7a15c55c;hpb=23e6291cb5d5b4cd2008403d8b628007fd75ff23

diff --git a/lib-crypt/pgpinvoke.c b/lib-crypt/pgpinvoke.c
index 08f5d32..7b0b95a 100644
--- a/lib-crypt/pgpinvoke.c
+++ b/lib-crypt/pgpinvoke.c
@@ -11,32 +11,12 @@
  * is almost entirely format based.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <time.h>
-
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/file.h>
+#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"
 
@@ -54,14 +34,14 @@ 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,
-                      unsigned long data, format_flag flags)
+                      const char *ifstr, const char *elstr,
+                      anytype data, format_flag flags)
 {
   char fmt[16];
-  struct pgp_command_context *cctx = (struct pgp_command_context *) data;
+  struct pgp_command_context *cctx = data.ptr;
   int optional = (flags & M_FORMAT_OPTIONAL);
 
   switch (op) {
@@ -127,21 +107,18 @@ _mutt_fmt_pgp_command(char *dest, ssize_t destlen,
     }
   }
 
-  if (optional)
-    mutt_FormatString (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);
+  if (flags & M_FORMAT_OPTIONAL)
+    m_strformat(dest, destlen, 0, optional ? ifstr : elstr,
+                _mutt_fmt_pgp_command, data, 0);
 
-  return (src);
+  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,
-                     (unsigned long) cctx, 0);
+    m_strformat(d, dlen, 0, fmt, _mutt_fmt_pgp_command, cctx, 0);
 }
 
 /*
@@ -250,7 +227,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;
 
@@ -282,10 +259,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;
 
@@ -335,7 +311,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,