X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=pgpinvoke.c;h=2fb891767dc85778eeb00e78abb2e2699b47be9e;hp=04096fd98e90214eb422d4d1bb7e065302b6631f;hb=c6b9d35ed9361e4defab9762a7480d5126405ae9;hpb=9a1efcc01ddeca4106847f8eb28a704aca2dcf0b diff --git a/pgpinvoke.c b/pgpinvoke.c index 04096fd..2fb8917 100644 --- a/pgpinvoke.c +++ b/pgpinvoke.c @@ -26,7 +26,9 @@ #include #include +#include #include +#include #include "mutt.h" #include "mutt_curses.h" @@ -34,7 +36,6 @@ #include "pgp.h" #include "rfc822.h" -#include "lib/str.h" #include "lib/debug.h" /* @@ -160,7 +161,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; @@ -254,7 +255,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; @@ -277,7 +278,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;