X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/d057cb7218d8e5a6b30f38a863b73b7d562bf9d0..e66e25ec491d0fb3df708000d8494b4d598f0263:/uip/mhbuildsbr.c

diff --git a/uip/mhbuildsbr.c b/uip/mhbuildsbr.c
index 08975511..7e805654 100644
--- a/uip/mhbuildsbr.c
+++ b/uip/mhbuildsbr.c
@@ -24,6 +24,17 @@
 #include <h/mime.h>
 #include <h/mhparse.h>
 
+#ifdef TIME_WITH_SYS_TIME
+# 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
@@ -227,8 +238,7 @@ pidcheck (int status)
 
     fflush (stdout);
     fflush (stderr);
-    done (1);
-    /* NOTREACHED */
+    return done (1);
 }
 
 
@@ -2662,7 +2672,7 @@ losing_ftp:
 	    goto losing_ftp;
 #endif
 
-    if (cachefile[0])
+    if (cachefile[0]) {
 	if (caching)
 	    chmod (cachefile, cachetype ? m_gmprot () : 0444);
 	else {
@@ -2676,7 +2686,7 @@ losing_ftp:
 
 		fseek (gp, 0L, SEEK_SET);
 
-		while ((cc = fread (buffer, sizeof(*buffer), sizeof(buffer), gp))
+		while ((cc= fread (buffer, sizeof(*buffer), sizeof(buffer), gp))
 		           > 0)
 		    fwrite (buffer, sizeof(*buffer), cc, fp);
 		fflush (fp);
@@ -2694,6 +2704,7 @@ losing_ftp:
 	    }
 	    umask (mask);
 	}
+    }
 
     fseek (ce->ce_fp, 0L, SEEK_SET);
     *file = ce->ce_file;
@@ -3159,11 +3170,12 @@ use_forw:
 	/* search the arguments for a folder name */
 	for (ap = arguments; *ap; ap++) {
 	    cp = *ap;
-	    if (*cp == '+' || *cp == '@')
+	    if (*cp == '+' || *cp == '@') {
 		if (folder)
 		    adios (NULL, "only one folder per #forw directive");
 		else
 		    folder = path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF);
+	    }
 	}
 
 	/* else, use the current folder */