From: Julien Danjou Date: Sat, 25 Nov 2006 17:10:51 +0000 (+0100) Subject: Kill another mktemp X-Git-Url: http://git.madism.org/?a=commitdiff_plain;h=a3570e5059a0cbb884fce42a12be470addb770fa;p=apps%2Fmadmutt.git Kill another mktemp Signed-off-by: Julien Danjou Signed-off-by: Pierre Habouzit --- diff --git a/main.c b/main.c index b3d7e66..9e2ef37 100644 --- a/main.c +++ b/main.c @@ -672,6 +672,7 @@ int main (int argc, char **argv) char buf[LONG_STRING]; char *tempfile = NULL, *infile = NULL; char *bodytext = NULL; + FILE *fout; if (!option (OPTNOCURSES)) mutt_flushinp (); @@ -726,18 +727,16 @@ int main (int argc, char **argv) else fin = NULL; - mutt_mktemp (buf); - tempfile = m_strdup(buf); - if (draftFile) msg->env = mutt_read_rfc822_header (fin, NULL, 1, 0); /* is the following if still needed? */ - if (tempfile) { - FILE *fout; + fout = m_tempfile(buf, sizeof(buf), NONULL(Tempdir), NULL); + tempfile = m_strdup(buf); - if ((fout = safe_fopen (tempfile, "w")) == NULL) { + if (tempfile) { + if (!fout) { if (!option (OPTNOCURSES)) mutt_endwin (NULL); perror (tempfile);