From: Marco Sirabella Date: Fri, 22 Jun 2018 18:27:50 +0000 (-0400) Subject: Remove smimeerrfile from smime_class_build_smime_entity X-Git-Tag: neomutt-20180716~24^2~11 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=72223e9f243fa0afd117174fd6a7a19195dcc73d;p=neomutt Remove smimeerrfile from smime_class_build_smime_entity --- diff --git a/ncrypt/smime.c b/ncrypt/smime.c index 459e517ab..3c1fc5a0c 100644 --- a/ncrypt/smime.c +++ b/ncrypt/smime.c @@ -1387,7 +1387,7 @@ static pid_t smime_invoke_sign(FILE **smimein, FILE **smimeout, FILE **smimeerr, struct Body *smime_class_build_smime_entity(struct Body *a, char *certlist) { char buf[LONG_STRING], certfile[PATH_MAX]; - char tempfile[PATH_MAX], smimeerrfile[PATH_MAX]; + char tempfile[PATH_MAX]; char smimeinfile[PATH_MAX]; char *cert_start, *cert_end; FILE *smimein = NULL; @@ -1402,16 +1402,14 @@ struct Body *smime_class_build_smime_entity(struct Body *a, char *certlist) return NULL; } - mutt_mktemp(smimeerrfile, sizeof(smimeerrfile)); - FILE *smimeerr = mutt_file_fopen(smimeerrfile, "w+"); + FILE *smimeerr = mutt_file_mkstemp(); if (!smimeerr) { - mutt_perror(smimeerrfile); + mutt_perror("mutt_file_mkstemp() failed!"); mutt_file_unlink(tempfile); mutt_file_fclose(&fpout); return NULL; } - mutt_file_unlink(smimeerrfile); mutt_mktemp(smimeinfile, sizeof(smimeinfile)); FILE *fptmp = mutt_file_fopen(smimeinfile, "w+");