From: Mark Wooding <mdw@distorted.org.uk>
Date: Sun, 22 Jan 2012 13:12:14 +0000 (+0000)
Subject: catcrypt.c: Don't close output file twice.
X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/commitdiff_plain/f0c52873e4c1e3a16bb2d5a086df2526f698e4ac

catcrypt.c: Don't close output file twice.

The C library doesn't like it.  Who knew?
---

diff --git a/catcrypt.c b/catcrypt.c
index 6e4f245..d10739d 100644
--- a/catcrypt.c
+++ b/catcrypt.c
@@ -530,19 +530,18 @@ static int decrypt(int argc, char *argv[])
     if (ferror(rfp) || fclose(rfp))
       die(EXIT_FAILURE, "error unbuffering output: %s", strerror(errno));
   }
-  if (ofp && (fflush(ofp) || ferror(ofp) || fclose(ofp)))
-      die(EXIT_FAILURE, "error writing output: %s", strerror(errno));
 
   e->ops->decdone(e);
   if (verb && ofp != stdout)
     printf("OK decrypted successfully\n");
+  if (ofp && (fflush(ofp) || ferror(ofp) || fclose(ofp)))
+      die(EXIT_FAILURE, "error writing output: %s", strerror(errno));
   freeenc(e);
   GC_DESTROY(c);
   GC_DESTROY(cx);
   GM_DESTROY(m);
   freekem(km);
   if (fp != stdin) fclose(fp);
-  if (of) fclose(ofp);
   key_close(&kf);
   dstr_destroy(&d);
   return (0);