X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/9f8f8b1e1d553774865f2c177191c359c3dc652c..52a3727a8e26bc651f3330cb80f11ba627cfaac7:/uip/post.c

diff --git a/uip/post.c b/uip/post.c
index edc17d79..c81f0fcc 100644
--- a/uip/post.c
+++ b/uip/post.c
@@ -262,6 +262,7 @@ static char bccfil[BUFSIZ];
 static char from[BUFSIZ];	/* my network address            */
 static char sender[BUFSIZ];	/* my Sender: header		 */
 static char efrom[BUFSIZ];	/* my Envelope-From: header	 */
+static char fullfrom[BUFSIZ];	/* full contents of From header  */
 static char signature[BUFSIZ];	/* my signature                  */
 static char *filter = NULL;	/* the filter for BCC'ing        */
 static char *subject = NULL;	/* the subject field for BCC'ing */
@@ -557,7 +558,7 @@ main (int argc, char **argv)
     start_headers ();
     if (debug) {
 	verbose++;
-	discard (out = stdout);	/* XXX: reference discard() to help loader */
+	out = stdout;
     } else {
 	if (whomsw) {
 	    if ((out = fopen ("/dev/null", "w")) == NULL)
@@ -578,14 +579,16 @@ main (int argc, char **argv)
     hdrtab = msgstate == NORMAL ? NHeaders : RHeaders;
 
     for (compnum = 1, state = FLD;;) {
-	switch (state = m_getfld (state, name, buf, sizeof(buf), in)) {
+	int bufsz = sizeof buf;
+	switch (state = m_getfld (state, name, buf, &bufsz, in)) {
 	    case FLD: 
 	    case FLDEOF: 
 	    case FLDPLUS: 
 		compnum++;
 		cp = add (buf, NULL);
 		while (state == FLDPLUS) {
-		    state = m_getfld (state, name, buf, sizeof(buf), in);
+		    bufsz = sizeof buf;
+		    state = m_getfld (state, name, buf, &bufsz, in);
 		    cp = add (buf, cp);
 		}
 		putfmt (name, cp, out);
@@ -602,7 +605,8 @@ main (int argc, char **argv)
 		    break;
 		fprintf (out, "\n%s", buf);
 		while (state == BODY) {
-		    state = m_getfld (state, name, buf, sizeof(buf), in);
+		    bufsz = sizeof buf;
+		    state = m_getfld (state, name, buf, &bufsz, in);
 		    fputs (buf, out);
 		}
 		break;
@@ -708,7 +712,21 @@ putfmt (char *name, char *str, FILE *out)
     }
 
     if ((i = get_header (name, hdrtab)) == NOTOK) {
-	fprintf (out, "%s: %s", name, str);
+	if (strncasecmp (name, "nmh-", 4)) {
+	    fprintf (out, "%s: %s", name, str);
+	} else {
+	    /* Filter out all Nmh-* headers, because Norm asked.  They
+	       should never have reached this point.  Warn about any
+	       that are non-empty. */
+	    if (strcmp (str, "\n")) {
+		char *newline = strchr (str, '\n');
+		if (newline) *newline = '\0';
+		if (! whomsw) {
+		    advise (NULL, "ignoring header line -- %s: %s", name, str);
+		}
+	    }
+	}
+
 	return;
     }
 
@@ -839,8 +857,22 @@ putfmt (char *name, char *str, FILE *out)
 		else
 		    if (mp->m_gname)
 			putgrp (namep, mp->m_gname, out, hdr->flags);
-		if (mp->m_ingrp)
+		if (mp->m_ingrp) {
+		    if (sm_mts == MTS_SENDMAIL_PIPE) {
+			/* Catch this before sendmail chokes with:
+			   "553 List:; syntax illegal for recipient
+			    addresses".
+			   If we wanted to, we could expand out blind
+			   aliases and put them in Bcc:, but then
+			   they'd have the Blind-Carbon-Copy
+			   indication. */
+			adios (NULL,
+			       "blind lists not compatible with"
+			       " sendmail/pipe");
+		    }
+
 		    grp++;
+		}
 		if (putadr (namep, qp, mp, out, hdr->flags))
 		    msgflags |= (hdr->set & (MVIS | MINV));
 		else
@@ -900,6 +932,23 @@ putfmt (char *name, char *str, FILE *out)
 		mnfree (mp);
 	}
 
+    /*
+     * If this is a From:/Resent-From: header, save the full thing for
+     * later in case we need it for use when constructing a Bcc draft message
+     */
+
+    if ((msgstate == RESENT) ? (hdr->set & MRFM) : (hdr->set & MFRM)) {
+    	strncpy(fullfrom, str, sizeof(fullfrom));
+	fullfrom[sizeof(fullfrom) - 1] = 0;
+	/*
+	 * Strip off any trailing newlines
+	 */
+
+	while (strlen(fullfrom) > 0 && fullfrom[strlen(fullfrom) - 1] == '\n') {
+	    fullfrom[strlen(fullfrom) - 1] = '\0';
+	}
+    }
+
     if (grp > 0 && (hdr->flags & HNGR)) {
 	advise (NULL, "%s: field does not allow groups", name);
 	badmsg++;
@@ -928,6 +977,7 @@ start_headers (void)
     from[0] = '\0';
     efrom[0] = '\0';
     sender[0] = '\0';
+    fullfrom[0] = '\0';
 
     if ((cp = getfullname ()) && *cp) {
 	strncpy (sigbuf, cp, sizeof(sigbuf));
@@ -1279,9 +1329,9 @@ make_bcc_file (int dashstuff)
 
     tfile = m_mktemp2(NULL, "bccs", NULL, &out);
     if (tfile == NULL) adios("bcc", "unable to create temporary file");
-    chmod (bccfil, 0600);
     strncpy (bccfil, tfile, sizeof(bccfil));
 
+    fprintf (out, "From: %s\n", fullfrom);
     fprintf (out, "Date: %s\n", dtime (&tclock, 0));
     if (msgid)
 	fprintf (out, "Message-ID: %s\n", message_id (tclock, 0));