X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/a2c417d3e1641ba4ab151b7945b90f55176705b1..75e2b025b151dc5191ed586ced39cf68c3aaa3b4:/uip/mhbuild.c

diff --git a/uip/mhbuild.c b/uip/mhbuild.c
index 8684c70f..0ca09e10 100644
--- a/uip/mhbuild.c
+++ b/uip/mhbuild.c
@@ -56,11 +56,11 @@ DEFINE_SWITCH_ENUM(MHBUILD);
 DEFINE_SWITCH_ARRAY(MHBUILD, switches);
 #undef X
 
-/* 8bit is Email Address Internationalization. */
+/* utf-8 is for Email Address Internationalization, using SMTPUTF8. */
 #define MIMEENCODING_SWITCHES \
     X("base64", 0, BASE64SW) \
     X("quoted-printable", 0, QUOTEDPRINTSW) \
-    X("8bit", 0, EIGHTBITSW) \
+    X("utf-8", 0, UTF8SW) \
 
 #define X(sw, minchars, id) id,
 DEFINE_SWITCH_ENUM(MIMEENCODING);
@@ -94,7 +94,6 @@ static int unlink_outfile = 0;
 static void unlink_done (int) NORETURN;
 
 /* mhbuildsbr.c */
-int output_message (CT, char *);
 int output_message_fp (CT, FILE *, char*);
 
 
@@ -114,7 +113,7 @@ main (int argc, char **argv)
     int header_encoding = CE_UNKNOWN;
     size_t n;
 
-    if (nmh_init(argv[0], 1)) { return 1; }
+    if (nmh_init(argv[0], 2)) { return 1; }
 
     done=unlink_done;
 
@@ -246,7 +245,7 @@ main (int argc, char **argv)
 		case QUOTEDPRINTSW:
 		    header_encoding = CE_QUOTED;
 		    break;
-		case EIGHTBITSW:
+		case UTF8SW:
 		    header_encoding = CE_8BIT;
 		    break;
 		default: