move rfc822.c as well

[apps/madmutt.git] / pgpinvoke.c

diff --git a/pgpinvoke.c b/pgpinvoke.c
index 91d2b00..b24687f 100644 (file)
--- a/pgpinvoke.c
+++ b/pgpinvoke.c
@@ -25,15 +25,19 @@
 #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-mime/mime.h>
+
 #include "mutt.h"
 #include "mutt_curses.h"
 #include "mutt_idna.h"
 #include "pgp.h"
-#include "rfc822.h"
 
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
+#include "lib/debug.h"
 
 /*
  * The actual command line formatter.
@@ -139,7 +143,7 @@ void mutt_pgp_command (char *d, size_t dlen, struct pgp_command_context *cctx,
 {
   mutt_FormatString (d, dlen, NONULL (fmt), _mutt_fmt_pgp_command,
                      (unsigned long) cctx, 0);
-  dprint (2, (debugfile, "mutt_pgp_command: %s\n", d));
+  debug_print (2, ("%s\n", d));
 }
 
 /*
@@ -158,7 +162,7 @@ static pid_t pgp_invoke (FILE ** pgpin, FILE ** pgpout, FILE ** pgperr,
   struct pgp_command_context cctx;
   char cmd[HUGE_STRING];
 
-  memset (&cctx, 0, sizeof (cctx));
+  p_clear(&cctx, 1);
 
   if (!format || !*format)
     return (pid_t) - 1;
@@ -252,7 +256,7 @@ void pgp_invoke_import (const char *fname)
   char cmd[HUGE_STRING];
   struct pgp_command_context cctx;
 
-  memset (&cctx, 0, sizeof (cctx));
+  p_clear(&cctx, 1);
 
   mutt_quote_filename (_fname, sizeof (_fname), fname);
   cctx.fname = _fname;
@@ -275,7 +279,7 @@ void pgp_invoke_getkeys (ADDRESS * addr)
   if (!PgpGetkeysCommand)
     return;
 
-  memset (&cctx, 0, sizeof (cctx));
+  p_clear(&cctx, 1);
 
   personal = addr->personal;
   addr->personal = NULL;