X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fmhparse.c;h=86a08b7a7976ef038cca88f4e972909bf276dc76;hp=1839a15ddd544b78a204e254fee8ff2e3668f80e;hb=7736b0a60c15cc20db0ba8c3e0fe8e11d1c78c20;hpb=1691e80890e5d8ba258c51c214a3e91880e1db2b

diff --git a/uip/mhparse.c b/uip/mhparse.c
index 1839a15..86a08b7 100644
--- a/uip/mhparse.c
+++ b/uip/mhparse.c
@@ -205,8 +205,7 @@ pidcheck (int status)
 
     fflush (stdout);
     fflush (stderr);
-    done (1);
-    /* NOTREACHED */
+    return done (1);
 }
 
 
@@ -1194,9 +1193,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;
     }
@@ -2400,7 +2399,7 @@ losing_ftp:
 	    goto losing_ftp;
 #endif
 
-    if (cachefile[0])
+    if (cachefile[0]) {
 	if (caching)
 	    chmod (cachefile, cachetype ? m_gmprot () : 0444);
 	else {
@@ -2414,7 +2413,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);
@@ -2432,6 +2431,7 @@ losing_ftp:
 	    }
 	    umask (mask);
 	}
+    }
 
     fseek (ce->ce_fp, 0L, SEEK_SET);
     *file = ce->ce_file;