X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=lib-crypt%2Fcrypt.c;h=b133addf0b12c1b71a27519df8df7a00889ca43f;hb=7b392ef7b50798f9eb3e7c869e634c5fef0092d1;hp=36fbcda17c0200b33450507d7c7996188ed83042;hpb=230399f9632c37b66c1c117a17e8327eae6b3235;p=apps%2Fmadmutt.git

diff --git a/lib-crypt/crypt.c b/lib-crypt/crypt.c
index 36fbcda..b133add 100644
--- a/lib-crypt/crypt.c
+++ b/lib-crypt/crypt.c
@@ -12,35 +12,20 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <sys/wait.h>
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include <ctype.h>
+#include <lib-lib/lib-lib.h>
 
 #ifdef HAVE_LOCALE_H
 #  include <locale.h>
 #endif
-#ifdef HAVE_SYS_TIME_H
-#  include <sys/time.h>
-#endif
 #ifdef HAVE_SYS_RESOURCE_H
 #  include <sys/resource.h>
 #endif
 
-#include <lib-lib/lib-lib.h>
-
 #include <lib-mime/mime.h>
 
 #include <lib-ui/curses.h>
+#include <lib-mx/mx.h>
 
-#include "mutt.h"
 #include "alias.h"
 #include "handler.h"
 #include "copy.h"
@@ -356,9 +341,9 @@ void crypt_extract_keys_from_messages (HEADER * h)
   address_t *tmp = NULL;
   FILE *fpout;
 
-  mutt_mktemp (tempfname);
-  if (!(fpout = safe_fopen (tempfname, "w"))) {
-    mutt_perror (tempfname);
+  fpout = m_tempfile(tempfname, sizeof(tempfname), NONULL(Tempdir), NULL);
+  if (!fpout) {
+    mutt_error(_("Could not create temporary file"));
     return;
   }