fclose -> m_fclose

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

diff --git a/lib-crypt/pgp.c b/lib-crypt/pgp.c
index 85725d7..ea63f2c 100644 (file)
--- a/lib-crypt/pgp.c
+++ b/lib-crypt/pgp.c
@@ -545,7 +545,7 @@ int pgp_verify_one (BODY * sigbdy, STATE * s, const char *tempfile)
 
   fseeko (s->fpin, sigbdy->offset, 0);
   mutt_copy_bytes (s->fpin, fp, sigbdy->length);
-  fclose (fp);
+  m_fclose(&fp);
 
   pgperr = m_tempfile(pgperrfile, sizeof(pgperrfile), NONULL(Tempdir), NULL);
   if (pgperr == NULL) {
@@ -606,7 +606,7 @@ static void pgp_extract_keys_from_attachment (FILE * fp, BODY * top)
 
   mutt_body_handler (top, &s);
 
-  fclose (tempfp);
+  m_fclose(&tempfp);
 
   pgp_invoke_import (tempfname);
   mutt_any_key_to_continue (NULL);
@@ -656,9 +656,9 @@ BODY *pgp_decrypt_part (BODY * a, STATE * s, FILE * fpout, BODY * p)
   unlink (pgperrfile);
 
   pgptmp = m_tempfile(pgptmpfile, sizeof(pgptmpfile), NONULL(Tempdir), NULL);
-  if (pgptmp == NULL) {
+  if (!pgptmp == NULL) {
     mutt_perror (pgptmpfile);
-    fclose (pgperr);
+    m_fclose(&pgperr);
     return NULL;
   }
 
@@ -668,11 +668,11 @@ BODY *pgp_decrypt_part (BODY * a, STATE * s, FILE * fpout, BODY * p)
 
   fseeko (s->fpin, a->offset, 0);
   mutt_copy_bytes (s->fpin, pgptmp, a->length);
-  fclose (pgptmp);
+  m_fclose(&pgptmp);
 
   if ((thepid = pgp_invoke_decrypt (&pgpin, &pgpout, NULL, -1, -1,
                                     fileno (pgperr), pgptmpfile)) == -1) {
-    fclose (pgperr);
+    m_fclose(&pgperr);
     unlink (pgptmpfile);
     if (s->flags & M_DISPLAY)
       state_attach_puts (_
@@ -687,7 +687,7 @@ BODY *pgp_decrypt_part (BODY * a, STATE * s, FILE * fpout, BODY * p)
   if (!pgp_use_gpg_agent ())
     fputs (PgpPass, pgpin);
   fputc ('\n', pgpin);
-  fclose (pgpin);
+  m_fclose(&pgpin);
 
   /* Read the output from PGP, and make sure to change CRLF to LF, otherwise
    * read_mime_header has a hard time parsing the message.
@@ -699,7 +699,7 @@ BODY *pgp_decrypt_part (BODY * a, STATE * s, FILE * fpout, BODY * p)
     fputs (buf, fpout);
   }
 
-  fclose (pgpout);
+  m_fclose(&pgpout);
   rv = mutt_wait_filter (thepid);
   mutt_unlink (pgptmpfile);
 
@@ -712,7 +712,7 @@ BODY *pgp_decrypt_part (BODY * a, STATE * s, FILE * fpout, BODY * p)
       p->goodsig = 0;
     state_attach_puts (_("[-- End of PGP output --]\n\n"), s);
   }
-  fclose (pgperr);
+  m_fclose(&pgperr);
 
   fflush (fpout);
   rewind (fpout);
@@ -844,7 +844,7 @@ int pgp_encrypted_handler (BODY * a, STATE * s)
     rc = -1;
   }
 
-  fclose (fpout);
+  m_fclose(&fpout);
   mutt_unlink (tempfile);
 
   return (rc);
@@ -875,7 +875,7 @@ BODY *pgp_sign_message (BODY * a)
   sfp = m_tempfile(signedfile, sizeof(signedfile), NONULL(Tempdir), NULL);
   if (sfp == NULL) {
     mutt_perror (signedfile);
-    fclose (fp);
+    m_fclose(&fp);
     unlink (sigfile);
     return NULL;
   }
@@ -883,13 +883,13 @@ BODY *pgp_sign_message (BODY * a)
   mutt_write_mime_header (a, sfp);
   fputc ('\n', sfp);
   mutt_write_mime_body (a, sfp);
-  fclose (sfp);
+  m_fclose(&sfp);
 
   if ((thepid = pgp_invoke_sign (&pgpin, &pgpout, &pgperr,
                                  -1, -1, -1, signedfile)) == -1) {
     mutt_perror (_("Can't open PGP subprocess!"));
 
-    fclose (fp);
+    m_fclose(&fp);
     unlink (sigfile);
     unlink (signedfile);
     return NULL;
@@ -898,7 +898,7 @@ BODY *pgp_sign_message (BODY * a)
   if (!pgp_use_gpg_agent ())
     fputs (PgpPass, pgpin);
   fputc ('\n', pgpin);
-  fclose (pgpin);
+  m_fclose(&pgpin);
 
   /*
    * Read back the PGP signature.  Also, change MESSAGE=>SIGNATURE as
@@ -924,11 +924,11 @@ BODY *pgp_sign_message (BODY * a)
   if (mutt_wait_filter (thepid) && option (OPTPGPCHECKEXIT))
     empty = 1;
 
-  fclose (pgperr);
-  fclose (pgpout);
+  m_fclose(&pgperr);
+  m_fclose(&pgpout);
   unlink (signedfile);
 
-  if (fclose (fp) != 0) {
+  if (m_fclose(&fp) != 0) {
     mutt_perror ("fclose");
     unlink (sigfile);
     return (NULL);
@@ -1122,7 +1122,7 @@ BODY *pgp_encrypt_message (BODY * a, char *keylist, int sign)
   pgperr = m_tempfile(pgperrfile, sizeof(pgperrfile), NONULL(Tempdir), NULL);
   if (pgperr == NULL) {
     mutt_perror (pgperrfile);
-    fclose (fpout);
+    m_fclose(&fpout);
     unlink (tempfile);
     return NULL;
   }
@@ -1131,9 +1131,9 @@ BODY *pgp_encrypt_message (BODY * a, char *keylist, int sign)
   fptmp = m_tempfile(pgpinfile, sizeof(pgpinfile), NONULL(Tempdir), NULL);
   if (fptmp == NULL) {
     mutt_perror (pgpinfile);
-    fclose (fpout);
+    m_fclose(&fpout);
     unlink (tempfile);
-    fclose (pgperr);
+    m_fclose(&pgperr);
     unlink (pgperrfile);
     return NULL;
   }
@@ -1144,12 +1144,12 @@ BODY *pgp_encrypt_message (BODY * a, char *keylist, int sign)
   mutt_write_mime_header (a, fptmp);
   fputc ('\n', fptmp);
   mutt_write_mime_body (a, fptmp);
-  fclose (fptmp);
+  m_fclose(&fptmp);
 
   if ((thepid = pgp_invoke_encrypt (&pgpin, NULL, NULL, -1,
                                     fileno (fpout), fileno (pgperr),
                                     pgpinfile, keylist, sign)) == -1) {
-    fclose (pgperr);
+    m_fclose(&pgperr);
     unlink (pgpinfile);
     return (NULL);
   }
@@ -1159,7 +1159,7 @@ BODY *pgp_encrypt_message (BODY * a, char *keylist, int sign)
       fputs (PgpPass, pgpin);
     fputc ('\n', pgpin);
   }
-  fclose (pgpin);
+  m_fclose(&pgpin);
 
   if (mutt_wait_filter (thepid) && option (OPTPGPCHECKEXIT))
     empty = 1;
@@ -1170,7 +1170,7 @@ BODY *pgp_encrypt_message (BODY * a, char *keylist, int sign)
   rewind (fpout);
   if (!empty)
     empty = (fgetc (fpout) == EOF);
-  fclose (fpout);
+  m_fclose(&fpout);
 
   fflush (pgperr);
   rewind (pgperr);
@@ -1178,7 +1178,7 @@ BODY *pgp_encrypt_message (BODY * a, char *keylist, int sign)
     err = 1;
     fputs (buf, stdout);
   }
-  fclose (pgperr);
+  m_fclose(&pgperr);
 
   /* pause if there is any error output from PGP */
   if (err)
@@ -1255,7 +1255,7 @@ BODY *pgp_traditional_encryptsign (BODY * a, int flags, char *keylist)
   pgpin = m_tempfile(pgpinfile, sizeof(pgpinfile), NONULL(Tempdir), NULL);
   if (pgpin == NULL) {
     mutt_perror (pgpinfile);
-    fclose (fp);
+    m_fclose(&fp);
     return NULL;
   }
 
@@ -1291,22 +1291,18 @@ BODY *pgp_traditional_encryptsign (BODY * a, int flags, char *keylist)
     mutt_copy_stream (fp, pgpin);
   }
   m_fclose(&fp);
-  fclose (pgpin);
+  m_fclose(&pgpin);
 
   pgpout = m_tempfile(pgpoutfile, sizeof(pgpoutfile), NONULL(Tempdir), NULL);
   pgperr = m_tempfile(pgperrfile, sizeof(pgperrfile), NONULL(Tempdir), NULL);
   if (pgpout == NULL || pgperr == NULL) {
     mutt_perror (pgpout ? pgperrfile : pgpoutfile);
-    fclose (pgpin);
+    m_fclose(&pgpin);
     unlink (pgpinfile);
-    if (pgpout) {
-      fclose (pgpout);
-      unlink (pgpoutfile);
-    }
-    if (pgperr) {
-      fclose(pgperr);
-      unlink(pgperrfile);
-    }
+    m_fclose(&pgpout);
+    unlink (pgpoutfile);
+    m_fclose(&pgperr);
+    unlink(pgperrfile);
     return NULL;
   }
 
@@ -1317,8 +1313,8 @@ BODY *pgp_traditional_encryptsign (BODY * a, int flags, char *keylist)
                                         pgpinfile, keylist, flags)) == -1) {
     mutt_perror (_("Can't invoke PGP"));
 
-    fclose (pgpout);
-    fclose (pgperr);
+    m_fclose(&pgpout);
+    m_fclose(&pgperr);
     mutt_unlink (pgpinfile);
     unlink (pgpoutfile);
     return NULL;
@@ -1328,7 +1324,7 @@ BODY *pgp_traditional_encryptsign (BODY * a, int flags, char *keylist)
     *PgpPass = 0;
   if (flags & SIGN)
     fprintf (pgpin, "%s\n", PgpPass);
-  fclose (pgpin);
+  m_fclose(&pgpin);
 
   if (mutt_wait_filter (thepid) && option (OPTPGPCHECKEXIT))
     empty = 1;
@@ -1343,7 +1339,7 @@ BODY *pgp_traditional_encryptsign (BODY * a, int flags, char *keylist)
 
   if (!empty)
     empty = (fgetc (pgpout) == EOF);
-  fclose (pgpout);
+  m_fclose(&pgpout);
 
   err = 0;
 
@@ -1352,7 +1348,7 @@ BODY *pgp_traditional_encryptsign (BODY * a, int flags, char *keylist)
     fputs (buff, stdout);
   }
 
-  fclose (pgperr);
+  m_fclose(&pgperr);
 
   if (err)
     mutt_any_key_to_continue (NULL);