Fixed `mhbuild -check': use the correct file.

[mmh] / uip / mhbuild.c

diff --git a/uip/mhbuild.c b/uip/mhbuild.c
index 3ed31f9..5f29d0e 100644 (file)
--- a/uip/mhbuild.c
+++ b/uip/mhbuild.c
@@ -25,20 +25,10 @@
 #include <h/mhcachesbr.h>
 #include <h/utils.h>
 
-#ifdef TIME_WITH_SYS_TIME
+#ifdef HAVE_SYS_TIME_H
 # include <sys/time.h>
-# include <time.h>
-#else
-# ifdef TM_IN_SYS_TIME
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
-#endif
-
-#ifdef HAVE_SYS_WAIT_H
-# include <sys/wait.h>
 #endif
+#include <time.h>
 
 static struct swit switches[] = {
 #define CHECKSW  0
@@ -2018,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);