X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/d92ca17b1bbd3b17be48f48432ddc9a7ed1faf27..f345b9b480296b4b6a8469d6221752893c5d1420:/uip/mhparse.c

diff --git a/uip/mhparse.c b/uip/mhparse.c
index 7c8f07dc..ca5558ae 100644
--- a/uip/mhparse.c
+++ b/uip/mhparse.c
@@ -1101,8 +1101,9 @@ InitMultiPart (CT ct)
 
 	admonish (NULL,
 		  "\"%s/%s\" type in message %s must be encoded in\n"
-		  "7bit, 8bit, or binary, per RFC 2045 (6.4).  One workaround "
-		  "is to\nmanually edit the file and change the \"%s\"\n"
+		  "7bit, 8bit, or binary, per RFC 2045 (6.4).  "
+                  "mhfixmsg -fixcte can fix it, or\n"
+                  "manually edit the file and change the \"%s\"\n"
 		  "Content-Transfer-Encoding to one of those.  For now",
 		  ci->ci_type, ci->ci_subtype, ct->c_file, bp);
 	free (cte);
@@ -2582,7 +2583,7 @@ openFTP (CT ct, char **file)
     /*
      * Now, check the answer
      */
-    if (!getanswer (buffer))
+    if (!read_yes_or_no_if_tty (buffer))
 	return NOTOK;
 
     if (e->eb_flags) {
@@ -2769,7 +2770,7 @@ openMail (CT ct, char **file)
 		    e->eb_subject ? e->eb_subject : e->eb_body);
 
     /* Now, check answer */
-    if (!getanswer (buffer))
+    if (!read_yes_or_no_if_tty (buffer))
 	return NOTOK;
 
     vecp = 0;
@@ -4333,7 +4334,7 @@ char *get_param_value(PM pm, char replace)
 	    }
 	    if (utf8) {
 		for (++p, --inbytes;
-		     inbytes > 0 && (((unsigned char) *q) & 0xc0) == 0x80;
+		     inbytes > 0 && (((unsigned char) *p) & 0xc0) == 0x80;
 		     ++p, --inbytes)
 		    continue;
 	    } else {