X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fmhbuildsbr.c;h=fd6a974724f9bbd1f01d7505cf4f9ec3c590e43e;hb=025bb212470ef2945c9b7f57cb7fbfceb3e04e2c;hp=d95eee5856188fe7bcccf70ffa55a55ebe1c8012;hpb=2f689a1cb907a5de04e6d39ffd217a69af3216c7;p=mmh

diff --git a/uip/mhbuildsbr.c b/uip/mhbuildsbr.c
index d95eee5..fd6a974 100644
--- a/uip/mhbuildsbr.c
+++ b/uip/mhbuildsbr.c
@@ -2,8 +2,6 @@
 /*
  * mhbuildsbr.c -- routines to expand/translate MIME composition files
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
@@ -29,20 +27,10 @@
 #include <h/mhparse.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>
 
 
 extern int debugsw;
@@ -71,15 +59,11 @@ static char prefix[] = "----- =_aaaaaaaaaa";
 
 
 /* mhmisc.c */
-int make_intermediates (char *);
 void content_error (char *, CT, char *, ...);
 
 /* mhcachesbr.c */
 int find_cache (CT, int, int *, char *, char *, int);
 
-/* ftpsbr.c */
-int ftp_get (char *, char *, char *, char *, char *, char *, int, int);
-
 /* mhfree.c */
 void free_content (CT);
 void free_ctinfo (CT);
@@ -874,7 +858,7 @@ set_id (CT ct, int top)
     if (clock == 0) {
 	time (&clock);
 	snprintf (msgid, sizeof(msgid), "<%d.%ld.%%d@%s>\n",
-		(int) getpid(), (long) clock, LocalName());
+		(int) getpid(), (long) clock, LocalName(1));
 	partno = 0;
 	msgfmt = getcpy(msgid);
     }
@@ -1618,13 +1602,14 @@ calculate_digest (CT ct, int asciiP)
     unsigned char *dp;
     unsigned char digest[16];
     unsigned char outbuf[25];
-    FILE *in;
     MD5_CTX mdContext;
     CE ce = ct->c_cefile;
+    char *infilename = ce->ce_file ? ce->ce_file : ct->c_file;
+    FILE *in;
 
     /* 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);