File mailx-12.1-mime.dif of Package mailx

Overview Repositories Revisions Requests Users Attributes Meta

File mailx-12.1-mime.dif of Package mailx (Revision 3efe846f72bc2830743a316330606d1f)

Currently displaying revision 3efe846f72bc2830743a316330606d1f , Show latest

--- mime.c
+++ mime.c	2006-07-20 13:42:19.000000000 +0200
@@ -758,7 +758,7 @@ mime_isclean(FILE *f)
 		} else if (c == '\0') {
 			isclean |= MIME_HASNUL;
 			break;
-		} else if ((c < 040 && (c != '\t' && c != '\f')) || c == 0177) {
+		} else if ((c < 040 && (c != '\t' && c != '\f' && c != '\b')) || c == 0177) {
 			isclean |= MIME_CTRLCHAR;
 		}
 	} while (c != EOF);
@@ -825,6 +825,8 @@ get_mime_convert(FILE *fp, char **conten
 			 * ^I or ^L in text/plain bodies. However, some
 			 * obscure character sets actually contain these
 			 * characters, so the content type can be set.
+			 * Beside ^I or ^L from RFC 2046 we accept also
+			 * backspace ^H often used in enhanced text.
 			 */
 			if ((*contenttype = value("contenttype-cntrl")) == NULL)
 				*contenttype = "application/octet-stream";
--- sendout.c
+++ sendout.c	2006-09-27 12:22:06.000000000 +0200
@@ -433,7 +433,7 @@ infix(struct header *hp, FILE *fi, int d
 		iconvd = (iconv_t)-1;
 	}
 	if ((isclean & (MIME_HASNUL|MIME_CTRLCHAR)) == 0 &&
-			isclean & MIME_HIGHBIT &&
+			isclean & MIME_HIGHBIT && ascncasecmp(tcs, "ANSI_X3.4", 9) &&
 			charset != NULL && asccasecmp(charset, tcs)) {
 		if (iconvd != (iconv_t)-1)
 			iconv_close(iconvd);
@@ -1128,8 +1128,9 @@ puthead(struct header *hp, FILE *fo, enu
 				return 1;
 		if ((addr = hp->h_organization) != NULL ||
 				(addr = value("ORGANIZATION")) != NULL) {
+			size_t len = strlen(addr);
 			fwrite("Organization: ", sizeof (char), 14, fo);
-			if (mime_write(addr, sizeof *addr, strlen(addr), fo,
+			if (len && mime_write(addr, sizeof *addr, len, fo,
 					action == SEND_TODISP ?
 					CONV_NONE:CONV_TOHDR,
 					action == SEND_TODISP ?
@@ -1174,9 +1175,10 @@ puthead(struct header *hp, FILE *fo, enu
 	if (hp->h_subject != NULL && w & GSUBJECT) {
 		fwrite("Subject: ", sizeof (char), 9, fo);
 		if (ascncasecmp(hp->h_subject, "re: ", 4) == 0) {
+			size_t len = strlen(hp->h_subject + 4);
 			fwrite("Re: ", sizeof (char), 4, fo);
-			if (mime_write(hp->h_subject + 4, sizeof *hp->h_subject,
-					strlen(hp->h_subject + 4),
+			if (len && mime_write(hp->h_subject + 4,
+					sizeof *hp->h_subject, len,
 					fo, action == SEND_TODISP ?
 					CONV_NONE:CONV_TOHDR,
 					action == SEND_TODISP ?
@@ -1184,8 +1186,9 @@ puthead(struct header *hp, FILE *fo, enu
 					NULL, (size_t)0) == 0)
 				return 1;
 		} else if (*hp->h_subject) {
-			if (mime_write(hp->h_subject, sizeof *hp->h_subject,
-					strlen(hp->h_subject),
+			size_t len = strlen(hp->h_subject);
+			if (len && mime_write(hp->h_subject,
+					sizeof *hp->h_subject, len,
 					fo, action == SEND_TODISP ?
 					CONV_NONE:CONV_TOHDR,
 					action == SEND_TODISP ?

Places

File mailx-12.1-mime.dif of Package mailx (Revision 3efe846f72bc2830743a316330606d1f)

Places