[bug #4302] errno is not always an extern int

[mmh] / uip / mhbuildsbr.c

diff --git a/uip/mhbuildsbr.c b/uip/mhbuildsbr.c
index 0897551..fb2d451 100644 (file)
--- a/uip/mhbuildsbr.c
+++ b/uip/mhbuildsbr.c
@@ -3,6 +3,10 @@
  * 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.
  */
 
 /*
@@ -19,18 +23,27 @@
 #include <h/md5.h>
 #include <errno.h>
 #include <signal.h>
-#include <zotnet/mts/mts.h>
-#include <zotnet/tws/tws.h>
+#include <h/mts.h>
+#include <h/tws.h>
 #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
 
 
-extern int errno;
-
 extern int debugsw;
 extern int verbosw;
 
@@ -227,8 +240,7 @@ pidcheck (int status)
 
     fflush (stdout);
     fflush (stderr);
-    done (1);
-    /* NOTREACHED */
+    return done (1);
 }
 
 
@@ -2662,7 +2674,7 @@ losing_ftp:
            goto losing_ftp;
 #endif
 
-    if (cachefile[0])
+    if (cachefile[0]) {
        if (caching)
            chmod (cachefile, cachetype ? m_gmprot () : 0444);
        else {
@@ -2676,7 +2688,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 +2706,7 @@ losing_ftp:
            }
            umask (mask);
        }
+    }
 
     fseek (ce->ce_fp, 0L, SEEK_SET);
     *file = ce->ce_file;
@@ -3159,11 +3172,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 */