projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use m_tempfile instead of mutt_mktemp (again and again)
[apps/madmutt.git]
/
lib-crypt
/
pgp.c
diff --git
a/lib-crypt/pgp.c
b/lib-crypt/pgp.c
index
23df747
..
85725d7
100644
(file)
--- a/
lib-crypt/pgp.c
+++ b/
lib-crypt/pgp.c
@@
-304,7
+304,7
@@
int pgp_application_pgp_handler (BODY * m, STATE * s)
if ((thepid = pgp_invoke_decode (&pgpin, NULL, &pgperr, -1,
fileno (pgpout), -1, tmpfname,
needpass)) == -1) {
if ((thepid = pgp_invoke_decode (&pgpin, NULL, &pgperr, -1,
fileno (pgpout), -1, tmpfname,
needpass)) == -1) {
-
safe_fclose
(&pgpout);
+
m_fclose
(&pgpout);
maybe_goodsig = 0;
pgpin = NULL;
pgperr = NULL;
maybe_goodsig = 0;
pgpin = NULL;
pgperr = NULL;
@@
-322,14
+322,14
@@
int pgp_application_pgp_handler (BODY * m, STATE * s)
fprintf (pgpin, "%s\n", PgpPass);
}
fprintf (pgpin, "%s\n", PgpPass);
}
-
safe_fclose
(&pgpin);
+
m_fclose
(&pgpin);
if (s->flags & M_DISPLAY) {
crypt_current_time (s, "PGP");
rc = pgp_copy_checksig (pgperr, s->fpout);
}
if (s->flags & M_DISPLAY) {
crypt_current_time (s, "PGP");
rc = pgp_copy_checksig (pgperr, s->fpout);
}
-
safe_fclose
(&pgperr);
+
m_fclose
(&pgperr);
rv = mutt_wait_filter (thepid);
if (s->flags & M_DISPLAY) {
rv = mutt_wait_filter (thepid);
if (s->flags & M_DISPLAY) {
@@
-430,11
+430,11
@@
out:
m->goodsig = (maybe_goodsig && have_any_sigs);
if (tmpfp) {
m->goodsig = (maybe_goodsig && have_any_sigs);
if (tmpfp) {
-
safe_fclose
(&tmpfp);
+
m_fclose
(&tmpfp);
mutt_unlink (tmpfname);
}
if (pgpout) {
mutt_unlink (tmpfname);
}
if (pgpout) {
-
safe_fclose
(&pgpout);
+
m_fclose
(&pgpout);
mutt_unlink (outfile);
}
mutt_unlink (outfile);
}
@@
-486,7
+486,7
@@
static int pgp_check_traditional_one_body (FILE * fp, BODY * b,
key = 1;
}
}
key = 1;
}
}
-
safe_fclose
(&tfp);
+
m_fclose
(&tfp);
unlink (tempfile);
if (!enc && !sgn && !key)
unlink (tempfile);
if (!enc && !sgn && !key)
@@
-563,7
+563,7
@@
int pgp_verify_one (BODY * sigbdy, STATE * s, const char *tempfile)
badsig = 0;
badsig = 0;
-
safe_fclose
(&pgpout);
+
m_fclose
(&pgpout);
fflush (pgperr);
rewind (pgperr);
fflush (pgperr);
rewind (pgperr);
@@
-574,7
+574,7
@@
int pgp_verify_one (BODY * sigbdy, STATE * s, const char *tempfile)
badsig = -1;
}
badsig = -1;
}
-
safe_fclose
(&pgperr);
+
m_fclose
(&pgperr);
state_attach_puts (_("[-- End of PGP output --]\n\n"), s);
state_attach_puts (_("[-- End of PGP output --]\n\n"), s);
@@
-1290,7
+1290,7
@@
BODY *pgp_traditional_encryptsign (BODY * a, int flags, char *keylist)
send_charset = "us-ascii";
mutt_copy_stream (fp, pgpin);
}
send_charset = "us-ascii";
mutt_copy_stream (fp, pgpin);
}
-
safe_fclose
(&fp);
+
m_fclose
(&fp);
fclose (pgpin);
pgpout = m_tempfile(pgpoutfile, sizeof(pgpoutfile), NONULL(Tempdir), NULL);
fclose (pgpin);
pgpout = m_tempfile(pgpoutfile, sizeof(pgpoutfile), NONULL(Tempdir), NULL);