X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fmhbuildsbr.c;h=ec2c195a2c6a7ed85b05beb96e5718e24ac95531;hb=bfad64befb4d6696fdfb63b119666eec4bac6fb3;hp=00a940834a0ed2bff52b655619adac3ed5b48b0b;hpb=3dccb685fb1b879e8910e8732e748b22e7ff8dc7;p=mmh

diff --git a/uip/mhbuildsbr.c b/uip/mhbuildsbr.c
index 00a9408..ec2c195 100644
--- a/uip/mhbuildsbr.c
+++ b/uip/mhbuildsbr.c
@@ -895,20 +895,19 @@ use_forw:
 static void
 set_id (CT ct, int top)
 {
-    char msgid[BUFSIZ];
+    char contentid[BUFSIZ];
     static int partno;
     static time_t clock = 0;
     static char *msgfmt;
 
     if (clock == 0) {
 	time (&clock);
-	snprintf (msgid, sizeof(msgid), "<%d.%ld.%%d@%s>\n",
-		(int) getpid(), (long) clock, LocalName(1));
+	snprintf (contentid, sizeof(contentid), "%s\n", message_id (clock, 1));
 	partno = 0;
-	msgfmt = getcpy(msgid);
+	msgfmt = getcpy(contentid);
     }
-    snprintf (msgid, sizeof(msgid), msgfmt, top ? 0 : ++partno);
-    ct->c_id = getcpy (msgid);
+    snprintf (contentid, sizeof(contentid), msgfmt, top ? 0 : ++partno);
+    ct->c_id = getcpy (contentid);
 }
 
 
@@ -1359,12 +1358,11 @@ scan_content (CT ct)
 		continue;
 
 	    if (contains8bit) {
-		t->tx_charset = CHARSET_UNKNOWN;
 		*ap = concat ("charset=", write_charset_8bit(), NULL);
 	    } else {
-		t->tx_charset = CHARSET_USASCII;
 		*ap = add ("charset=us-ascii", NULL);
 	    }
+	    t->tx_charset = CHARSET_SPECIFIED;
 
 	    cp = strchr(*ap++, '=');
 	    *ap = NULL;
@@ -1551,11 +1549,6 @@ skip_headers:
     switch (ct->c_encoding) {
     case CE_7BIT:
 	/* Nothing to output */
-#if 0
-	np = add (ENCODING_FIELD, NULL);
-	vp = concat (" ", "7bit", "\n", NULL);
-	add_header (ct, np, vp);
-#endif
 	break;
 
     case CE_8BIT: