fclose -> m_fclose

[apps/madmutt.git] / lib-crypt / crypt.c

diff --git a/lib-crypt/crypt.c b/lib-crypt/crypt.c
index f677789..dd2eb02 100644 (file)
--- a/lib-crypt/crypt.c
+++ b/lib-crypt/crypt.c
@@ -32,6 +32,8 @@
 #include "crypt.h"
 #include "pgp.h"
 
+static int crypt_write_signed (BODY *, STATE *, FILE *);
+
 /* print the current time to avoid spoofing of the signature output */
 void crypt_current_time (STATE * s, const char *app_name)
 {
@@ -120,10 +122,8 @@ int mutt_protect (HEADER * msg, char *keylist)
     }
 
     /* otherwise inline won't work...ask for revert */
-    if ((i =
-         query_quadoption (OPT_PGPMIMEAUTO,
-                           _
-                           ("Message can't be sent inline.  Revert to using PGP/MIME?")))
+    if ((i = query_quadoption(OPT_PGPMIMEAUTO,
+        _("Message can't be sent inline.  Revert to using PGP/MIME?")))
         != M_YES) {
       mutt_error _("Mail not sent.");
 
@@ -265,18 +265,12 @@ int crypt_query (BODY * m)
 }
 
 
-int crypt_write_signed (BODY * a, STATE * s, const char *tempfile)
+static int crypt_write_signed (BODY * a, STATE * s, FILE *fp)
 {
-  FILE *fp;
   int c;
   short hadcr;
   size_t bytes;
 
-  if (!(fp = safe_fopen (tempfile, "w"))) {
-    mutt_perror (tempfile);
-    return -1;
-  }
-
   fseeko (s->fpin, a->hdr_offset, 0);
   bytes = a->length + a->offset - a->hdr_offset;
   hadcr = 0;
@@ -298,7 +292,6 @@ int crypt_write_signed (BODY * a, STATE * s, const char *tempfile)
     fputc (c, fp);
 
   }
-  fclose (fp);
 
   return 0;
 }
@@ -341,9 +334,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;
   }
 
@@ -356,7 +349,7 @@ void crypt_extract_keys_from_messages (HEADER * h)
         if (Context->hdrs[Context->v2r[i]]->security & ENCRYPT &&
             !crypt_valid_passphrase (Context->hdrs[Context->v2r[i]]->
                                      security)) {
-          fclose (fpout);
+          m_fclose(&fpout);
           break;
         }
 
@@ -427,7 +420,7 @@ void crypt_extract_keys_from_messages (HEADER * h)
     }
   }
 
-  fclose (fpout);
+  m_fclose(&fpout);
   if (isendwin ())
     mutt_any_key_to_continue (NULL);
 
@@ -489,6 +482,7 @@ static void crypt_fetch_signatures (BODY ***signatures, BODY * a, int *n)
 int mutt_signed_handler (BODY * a, STATE * s)
 {
   char tempfile[_POSIX_PATH_MAX];
+  FILE * tempfp;
   char *protocol;
   int protocol_major = TYPEOTHER;
   char *protocol_minor = NULL;
@@ -549,31 +543,36 @@ int mutt_signed_handler (BODY * a, STATE * s)
     crypt_fetch_signatures (&signatures, a->next, &sigcnt);
 
     if (sigcnt) {
-      mutt_mktemp (tempfile);
-      if (crypt_write_signed (a, s, tempfile) == 0) {
-        for (i = 0; i < sigcnt; i++) {
-          if (signatures[i]->type == TYPEAPPLICATION
-              && !m_strcasecmp(signatures[i]->subtype, "pgp-signature")) {
-            if (crypt_pgp_verify_one (signatures[i], s, tempfile) != 0)
-              goodsig = 0;
-
-            continue;
-          }
-
-          if (signatures[i]->type == TYPEAPPLICATION
-          && (!m_strcasecmp(signatures[i]->subtype, "x-pkcs7-signature")
-               || !m_strcasecmp(signatures[i]->subtype, "pkcs7-signature")))
-          {
-            if (crypt_smime_verify_one (signatures[i], s, tempfile) != 0)
-              goodsig = 0;
-
-            continue;
-          }
-
-          state_printf (s, _("[-- Warning: "
-                             "We can't verify %s/%s signatures. --]\n\n"),
-                        TYPE (signatures[i]), signatures[i]->subtype);
+      tempfp = m_tempfile(tempfile, sizeof(tempfile), NONULL(Tempdir), NULL);
+      if (!tempfp) {
+          mutt_error(_("Could not create temporary file"));
+      } else {
+        if (crypt_write_signed (a, s, tempfp) == 0) {
+          for (i = 0; i < sigcnt; i++) {
+            if (signatures[i]->type == TYPEAPPLICATION
+                && !m_strcasecmp(signatures[i]->subtype, "pgp-signature")) {
+              if (crypt_pgp_verify_one (signatures[i], s, tempfile) != 0)
+                goodsig = 0;
+
+              continue;
+            }
+
+            if (signatures[i]->type == TYPEAPPLICATION
+            && (!m_strcasecmp(signatures[i]->subtype, "x-pkcs7-signature")
+                 || !m_strcasecmp(signatures[i]->subtype, "pkcs7-signature")))
+            {
+              if (crypt_smime_verify_one (signatures[i], s, tempfile) != 0)
+                goodsig = 0;
+
+              continue;
+            }
+
+            state_printf (s, _("[-- Warning: "
+                               "We can't verify %s/%s signatures. --]\n\n"),
+                          TYPE (signatures[i]), signatures[i]->subtype);
+         }
         }
+        m_fclose(&tempfp);
       }
 
       mutt_unlink (tempfile);