X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fspost.c;h=9b2ffcbc932ba3925180424353dff07486b7f62f;hp=da02d2798391206f2862149d84b9b1c14d775683;hb=10e03b3fba3e01052baf92c963c46a2a5529b4e0;hpb=9fca5fd33b87291cdcb326c7aab6ab9574244289

diff --git a/uip/spost.c b/uip/spost.c
index da02d27..9b2ffcb 100644
--- a/uip/spost.c
+++ b/uip/spost.c
@@ -314,20 +314,25 @@ putfmt(char *name, char *str, FILE *out)
 	char *cp;
 	struct headers *hdr;
 
-	/* remove all leading whitespace (even newlines) */
-	while (*str==' ' || *str=='\t' || *str=='\n') {
+	/* remove leading whitespace */
+	while (*str==' ' || *str=='\t') {
 		str++;
 	}
 
 	if ((i = get_header(name, hdrtab)) == NOTOK) {
-		/* no header we would care for: push it through */
-		fprintf(out, "%s: %s", name, str);
+		/* no header we would care for */
+		if (mh_strcasecmp(name, attach_hdr)!=0 &&
+				mh_strcasecmp(name, sign_hdr)!=0 &&
+				mh_strcasecmp(name, enc_hdr)!=0) {
+			/* push it through */
+			fprintf(out, "%s: %s", name, str);
+		}
 		return;
 	}
 	/* it's one of the interesting headers */
 	hdr = &hdrtab[i];
 
-	if (hdr->flags & HIGN || !*str) {
+	if (hdr->flags & HIGN || strcmp(str, "\n")==0) {
 		return;
 	}
 
@@ -625,11 +630,6 @@ process_bccs(char *origmsg)
 	FILE *out = NULL;
 
 	for (mp=bccs; mp; mp=mp->m_next) {
-		/*
-		** Note: This draft file will be left existing by send(1),
-		** although renamed with backup prefix.
-		** TODO: We should have it removed eventually.
-		*/
 		bccdraft = getcpy(m_mktemp2("/tmp/", invo_name, NULL, &out));
 		fprintf(out, "To: %s\n", mp->m_text);
 		fprintf(out, "Subject: [BCC] %s", subject ? subject : "");
@@ -643,6 +643,5 @@ process_bccs(char *origmsg)
 					mp->m_text);
 			unlink(bccdraft);
 		}
-		/* TODO: unlink renamed bcc draft after send(1) */
 	}
 }