X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/ce4e75e99c095abfcfd799df10a9b7f349c21c4a..eb789b05381c7f2a2cca0f9d7cd028309e970345:/uip/mhbuildsbr.c

diff --git a/uip/mhbuildsbr.c b/uip/mhbuildsbr.c
index 4a2c70c7..653c5b3f 100644
--- a/uip/mhbuildsbr.c
+++ b/uip/mhbuildsbr.c
@@ -36,13 +36,10 @@
 extern int debugsw;
 extern int verbosw;
 
-extern int ebcdicsw;
 extern int listsw;
 extern int rfc934sw;
 extern int contentidsw;
 
-extern int endian;	/* mhmisc.c */
-
 /* cache policies */
 extern int rcachesw;	/* mhcachesbr.c */
 extern int wcachesw;	/* mhcachesbr.c */
@@ -897,59 +894,22 @@ 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);
 }
 
 
-static char ebcdicsafe[0x100] = {
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01,
-    0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
-    0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
-    0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
-    0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
-    0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
-    0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
-    0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01,
-    0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
-    0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
-    0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
-    0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-};
-
-
 /*
  * Fill out, or expand the various contents in the composition
  * draft.  Read-in any necessary files.  Parse and execute any
@@ -1193,7 +1153,6 @@ scan_content (CT ct)
     int checklinelen = 0, linelen = 0;	  /* check for long lines                       */
     int checkboundary = 0, boundaryclash = 0; /* check if clashes with multipart boundary   */
     int checklinespace = 0, linespace = 0;  /* check if any line ends with space          */
-    int checkebcdic = 0, ebcdicunsafe = 0;  /* check if contains ebcdic unsafe characters */
     unsigned char *cp = NULL, buffer[BUFSIZ];
     struct text *t = NULL;
     FILE *in = NULL;
@@ -1234,11 +1193,9 @@ scan_content (CT ct)
 	check8bit = 1;
 	checkboundary = 1;
 	if (ct->c_subtype == TEXT_PLAIN) {
-	    checkebcdic = 0;
 	    checklinelen = 0;
 	    checklinespace = 0;
 	} else {
-	    checkebcdic = ebcdicsw;
 	    checklinelen = 1;
 	    checklinespace = 1;
 	}
@@ -1246,7 +1203,6 @@ scan_content (CT ct)
 
     case CT_APPLICATION:
 	check8bit = 1;
-	checkebcdic = ebcdicsw;
 	checklinelen = 1;
 	checklinespace = 1;
 	checkboundary = 1;
@@ -1254,7 +1210,6 @@ scan_content (CT ct)
 
     case CT_MESSAGE:
 	check8bit = 0;
-	checkebcdic = 0;
 	checklinelen = 0;
 	checklinespace = 0;
 
@@ -1273,7 +1228,6 @@ scan_content (CT ct)
 	 * since we are forcing use of base64.
 	 */
 	check8bit = 0;
-	checkebcdic = 0;
 	checklinelen = 0;
 	checklinespace = 0;
 	checkboundary = 0;
@@ -1298,14 +1252,6 @@ scan_content (CT ct)
 			contains8bit = 1;
 			check8bit = 0;	/* no need to keep checking */
 		    }
-		    /*
-		     * Check if character is ebcdic-safe.  We only check
-		     * this if also checking for 8bit data.
-		     */
-		    if (checkebcdic && !ebcdicsafe[*cp & 0xff]) {
-			ebcdicunsafe = 1;
-			checkebcdic = 0; /* no need to keep checking */
-		    }
 		}
 	    }
 
@@ -1361,12 +1307,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;
@@ -1374,7 +1319,7 @@ scan_content (CT ct)
 	    *ep = cp;
 	}
 
-	if (contains8bit || ebcdicunsafe || linelen || linespace || checksw)
+	if (contains8bit || linelen || linespace || checksw)
 	    ct->c_encoding = CE_QUOTED;
 	else
 	    ct->c_encoding = CE_7BIT;
@@ -1382,7 +1327,7 @@ scan_content (CT ct)
 
     case CT_APPLICATION:
 	/* For application type, use base64, except when postscript */
-	if (contains8bit || ebcdicunsafe || linelen || linespace || checksw)
+	if (contains8bit || linelen || linespace || checksw)
 	    ct->c_encoding = (ct->c_subtype == APPLICATION_POSTSCRIPT)
 		? CE_QUOTED : CE_BASE64;
 	else
@@ -1553,11 +1498,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: