X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fmhbuildsbr.c;h=a65736f3c7e234adc22f0cd12658038d2add420b;hb=045b9601403a216c400642229f2b291f85f88f7d;hp=73907ab3f0a30f0ab8de9980f52a2979a1666b3b;hpb=1691e80890e5d8ba258c51c214a3e91880e1db2b;p=mmh

diff --git a/uip/mhbuildsbr.c b/uip/mhbuildsbr.c
index 73907ab..a65736f 100644
--- a/uip/mhbuildsbr.c
+++ b/uip/mhbuildsbr.c
@@ -227,8 +227,7 @@ pidcheck (int status)
 
     fflush (stdout);
     fflush (stderr);
-    done (1);
-    /* NOTREACHED */
+    return done (1);
 }
 
 
@@ -1433,9 +1432,9 @@ InitMessage (CT ct)
     struct k2v *kv;
     CI ci = &ct->c_ctinfo;
 
-    if (ct->c_encoding != CE_7BIT) {
+    if ((ct->c_encoding != CE_7BIT) && (ct->c_encoding != CE_8BIT)) {
 	admonish (NULL,
-		  "\"%s/%s\" type in message %s should be encoded in 7bit",
+		  "\"%s/%s\" type in message %s should be encoded in 7bit or 8bit",
 		  ci->ci_type, ci->ci_subtype, ct->c_file);
 	return NOTOK;
     }
@@ -2662,7 +2661,7 @@ losing_ftp:
 	    goto losing_ftp;
 #endif
 
-    if (cachefile[0])
+    if (cachefile[0]) {
 	if (caching)
 	    chmod (cachefile, cachetype ? m_gmprot () : 0444);
 	else {
@@ -2676,7 +2675,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 +2693,7 @@ losing_ftp:
 	    }
 	    umask (mask);
 	}
+    }
 
     fseek (ce->ce_fp, 0L, SEEK_SET);
     *file = ce->ce_file;
@@ -3159,11 +3159,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 */