From: markus schnalke <meillo@marmaro.de>
Date: Tue, 27 Mar 2012 12:20:24 +0000 (+0200)
Subject: Fixed `mhbuild -check': use the correct file.
X-Git-Tag: mmh-thesis-end~140
X-Git-Url: http://git.marmaro.de/?a=commitdiff_plain;h=651d89ca77b0c62dec629b029ef8e25d0df1d4cb;p=mmh

Fixed `mhbuild -check': use the correct file.
mhbuild -check would always fail because it tried to build the digest
for the decoded contents file (cefile), which can be null. If it is, use
the contents file itself.

Pulled in from nmh. Thanks to David Levine.
---

diff --git a/uip/mhbuild.c b/uip/mhbuild.c
index 739aa462..5f29d0e6 100644
--- a/uip/mhbuild.c
+++ b/uip/mhbuild.c
@@ -2008,10 +2008,11 @@ calculate_digest(CT ct, int asciiP)
 	FILE *in;
 	MD5_CTX mdContext;
 	CE ce = ct->c_cefile;
+	char *infilename = ce->ce_file ? ce->ce_file : ct->c_file;
 
 	/* open content */
-	if ((in = fopen(ce->ce_file, "r")) == NULL)
-		adios(ce->ce_file, "unable to open for reading");
+	if ((in = fopen(infilename, "r")) == NULL)
+		adios (infilename, "unable to open for reading");
 
 	/* Initialize md5 context */
 	MD5Init(&mdContext);