X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fspost.c;h=5afa435db665fb4f74ccb78be9c0a94271ce886e;hb=67411b1f95d6ec987b4c732459e1ba8a8ac192c6;hp=e87fcf1c26f80104a9526bc57917bc6253df8915;hpb=714b5c530ece27ea2835a313013f5b770163403c;p=mmh

diff --git a/uip/spost.c b/uip/spost.c
index e87fcf1..5afa435 100644
--- a/uip/spost.c
+++ b/uip/spost.c
@@ -26,48 +26,32 @@ struct swit switches[] = {
 	{ "filter filterfile", 0 },
 #define NFILTSW  1
 	{ "nofilter", 0 },
-#define FRMTSW  2
-	{ "format", 0 },
-#define NFRMTSW  3
-	{ "noformat", 0 },
-#define REMVSW  4
-	{ "remove", 0 },
-#define NREMVSW  5
-	{ "noremove", 0 },
-#define VERBSW  6
+#define VERBSW  2
 	{ "verbose", 0 },
-#define NVERBSW  7
+#define NVERBSW  3
 	{ "noverbose", 0 },
-#define WATCSW  8
+#define WATCSW  4
 	{ "watch", 0 },
-#define NWATCSW  9
+#define NWATCSW  5
 	{ "nowatch", 0 },
-#define BACKSW  10
-	{ "backup", 0 },
-#define NBACKSW  11
-	{ "nobackup", 0 },
-#define ALIASW  12
+#define ALIASW  6
 	{ "alias aliasfile", 0 },
-#define NALIASW  13
+#define NALIASW  7
 	{ "noalias", 0 },
-#define WIDTHSW  14
-	{ "width columns", 0 },
-#define VERSIONSW  15
+#define VERSIONSW  8
 	{ "version", 0 },
-#define HELPSW  16
+#define HELPSW  9
 	{ "help", 0 },
-#define DEBUGSW  17
+#define DEBUGSW  10
 	{ "debug", -5 },
-#define DISTSW  18
+#define DISTSW  11
 	{ "dist", -4 },  /* interface from dist */
-#define PUSHSW  19  /* fork to sendmail then exit */
+#define PUSHSW  12  /* fork to sendmail then exit */
 	{ "push", -4 },
-#define NPUSHSW  20  /* exec sendmail */
+#define NPUSHSW  13  /* exec sendmail */
 	{ "nopush", -6 },
-#define LIBSW  21
+#define LIBSW  14
 	{ "library directory", -7 },
-#define ANNOSW  22
-	{ "idanno number", -6 },
 	{ NULL, 0 }
 };
 
@@ -109,7 +93,7 @@ static struct headers NHeaders[] = {
 	{ "Date", HNOP, MDAT },
 	{ "Subject", HSUB, 0 },
 	{ "To", HADR|HTRY, MVIS },
-	{ "cc", HADR|HTRY, MVIS },
+	{ "Cc", HADR|HTRY, MVIS },
 	{ "Bcc", HADR|HTRY|HBCC|HNIL, MINV },
 	{ "Message-Id", HBAD, 0 },
 	{ "Fcc", HFCC, 0 },
@@ -123,7 +107,7 @@ static struct headers RHeaders[] = {
 	{ "Resent-Date", HNOP, MRDT },
 	{ "Resent-Subject", HSUB, 0 },
 	{ "Resent-To", HADR|HTRY, MVIS },
-	{ "Resent-cc", HADR|HTRY, MVIS },
+	{ "Resent-Cc", HADR|HTRY, MVIS },
 	{ "Resent-Bcc", HADR|HTRY|HBCC, MINV },
 	{ "Resent-Message-Id", HBAD, 0 },
 	{ "Resent-Fcc", HFCC, 0 },
@@ -133,17 +117,12 @@ static struct headers RHeaders[] = {
 };
 
 
-static short fccind = 0;  /* index into fccfold[] */
-
 static int badmsg = 0;  /* message has bad semantics */
 static int verbose = 0;  /* spell it out */
 static int debug = 0;  /* debugging post */
-static int rmflg = 1;  /* remove temporary file when done */
 static int watch = 0;  /* watch the delivery process */
-static int backflg = 0;  /* rename input file as *.bak when done */
 static int pushflg = 0;  /* if going to fork to sendmail */
-static int aliasflg = -1;  /* if going to process aliases */
-static int outputlinelen=72;
+static int aliasflg = 0;  /* if going to process aliases */
 
 static unsigned msgflags = 0;  /* what we've seen */
 
@@ -153,11 +132,10 @@ static enum {
 
 static char tmpfil[] = "/tmp/pstXXXXXX";
 
-static char from[BUFSIZ];  /* my network address */
-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 */
 static char *fccfold[FCCS];  /* foldernames for FCC'ing */
+static short fccind = 0;  /* index into fccfold[] */
 
 static struct headers *hdrtab;  /* table for the message we're doing */
 static FILE *out;  /* output (temp) file */
@@ -170,23 +148,18 @@ extern char *sendmail;
 extern char *getfullname(void);
 extern char *getusername(void);
 
-extern boolean  draft_from_masquerading;  /* defined in mts.c */
-
 /*
 ** static prototypes
 */
 static void putfmt(char *, char *, FILE *);
-static void start_headers(void);
 static void finish_headers(FILE *);
 static int get_header(char *, struct headers *);
 static void putadr(char *, struct mailname *);
 static int putone(char *, int, int);
-static void insert_fcc(struct headers *, unsigned char *);
-static void file(char *);
+static void insert_fcc(char *, unsigned char *);
 static void fcc(char *, char *);
 
 #if 0
-static void die(char *, char *, ...);
 static void make_bcc_file(void);
 #endif
 
@@ -202,121 +175,92 @@ main(int argc, char **argv)
 #ifdef LOCALE
 	setlocale(LC_ALL, "");
 #endif
-	invo_name = r1bindex(argv[0], '/');
+	invo_name = mhbasename(argv[0]);
 
 	/* foil search of user profile/context */
 	if (context_foil(NULL) == -1)
 		done(1);
 
-	mts_init(invo_name);
 	arguments = getarguments(invo_name, argc, argv, 0);
 	argp = arguments;
 
 	while ((cp = *argp++)) {
 		if (*cp == '-') {
 			switch (smatch(++cp, switches)) {
-				case AMBIGSW:
-					ambigsw(cp, switches);
-					done(1);
-				case UNKWNSW:
-					adios(NULL, "-%s unknown", cp);
+			case AMBIGSW:
+				ambigsw(cp, switches);
+				done(1);
+			case UNKWNSW:
+				adios(NULL, "-%s unknown", cp);
+
+			case HELPSW:
+				snprintf(buf, sizeof(buf),
+						"%s [switches] file",
+						invo_name);
+				print_help(buf, switches, 1);
+				done(1);
+			case VERSIONSW:
+				print_version(invo_name);
+				done(1);
+
+			case DEBUGSW:
+				debug++;
+				continue;
 
-				case HELPSW:
-					snprintf(buf, sizeof(buf), "%s [switches] file", invo_name);
-					print_help(buf, switches, 1);
-					done(1);
-				case VERSIONSW:
-					print_version(invo_name);
-					done(1);
+			case DISTSW:
+				msgstate = resent;
+				continue;
 
-				case DEBUGSW:
-					debug++;
-					continue;
-
-				case DISTSW:
-					msgstate = resent;
-					continue;
-
-				case FILTSW:
-					if (!(filter = *argp++) ||
-							*filter == '-')
-						adios(NULL, "missing argument to %s", argp[-2]);
-					continue;
-				case NFILTSW:
-					filter = NULL;
-					continue;
-
-				case REMVSW:
-					rmflg++;
-					continue;
-				case NREMVSW:
-					rmflg = 0;
-					continue;
-
-				case BACKSW:
-					backflg++;
-					continue;
-				case NBACKSW:
-					backflg = 0;
-					continue;
-
-				case VERBSW:
-					verbose++;
-					continue;
-				case NVERBSW:
-					verbose = 0;
-					continue;
-
-				case WATCSW:
-					watch++;
-					continue;
-				case NWATCSW:
-					watch = 0;
-					continue;
-
-				case PUSHSW:
-					pushflg++;
-					continue;
-				case NPUSHSW:
-					pushflg = 0;
-					continue;
-
-				case ALIASW:
-					if (!(cp = *argp++) || *cp == '-')
-						adios(NULL, "missing argument to %s", argp[-2]);
-					if (aliasflg < 0) {
-						/* load default aka's */
-						alias(AliasFile);
-					}
-					aliasflg = 1;
-					if ((state = alias(cp)) != AK_OK)
-						adios(NULL, "aliasing error in file %s - %s", cp, akerror(state) );
-					continue;
-				case NALIASW:
-					aliasflg = 0;
-					continue;
-
-				case WIDTHSW:
-					if (!(cp = *argp++) || *cp == '-')
-						adios(NULL, "missing argument to %s", argp[-2]);
-					outputlinelen = atoi(cp);
-					if (outputlinelen <= 10)
-						outputlinelen = 72;
-					continue;
-
-				case LIBSW:
-					if (!(cp = *argp++) || *cp == '-')
-						adios(NULL, "missing argument to %s", argp[-2]);
-					/* create a minimal context */
-					if (context_foil(cp) == -1)
-						done(1);
-					continue;
-
-				case ANNOSW:
-					/* -idanno switch ignored */
-					if (!(cp = *argp++) || *cp == '-')
-						adios(NULL, "missing argument to %s", argp[-2]);
-					continue;
+			case FILTSW:
+				if (!(filter = *argp++) || *filter == '-')
+					adios(NULL, "missing argument to %s",
+							argp[-2]);
+				continue;
+			case NFILTSW:
+				filter = NULL;
+				continue;
+
+			case VERBSW:
+				verbose++;
+				continue;
+			case NVERBSW:
+				verbose = 0;
+				continue;
+
+			case WATCSW:
+				watch++;
+				continue;
+			case NWATCSW:
+				watch = 0;
+				continue;
+
+			case PUSHSW:
+				pushflg++;
+				continue;
+			case NPUSHSW:
+				pushflg = 0;
+				continue;
+
+			case ALIASW:
+				if (!(cp = *argp++) || *cp == '-')
+					adios(NULL, "missing argument to %s",
+							argp[-2]);
+				aliasflg = 1;
+				if ((state = alias(cp)) != AK_OK)
+					adios(NULL, "aliasing error in file %s - %s", cp, akerror(state));
+				continue;
+			case NALIASW:
+				aliasflg = 0;
+				continue;
+
+			case LIBSW:
+				if (!(cp = *argp++) || *cp == '-')
+					adios(NULL, "missing argument to %s",
+							argp[-2]);
+				/* create a minimal context */
+				if (context_foil(cp) == -1)
+					done(1);
+				continue;
 			}
 		}
 		if (msg)
@@ -325,100 +269,94 @@ main(int argc, char **argv)
 			msg = cp;
 	}
 
-	if (aliasflg < 0)
-		alias(AliasFile);  /* load default aka's */
-
 	if (!msg)
 		adios(NULL, "usage: %s [switches] file", invo_name);
 
 	if ((in = fopen(msg, "r")) == NULL)
 		adios(msg, "unable to open");
 
-	start_headers();
 	if (debug) {
 		verbose++;
 		out = stdout;
-	}
-	else {
+	} else {
 #ifdef HAVE_MKSTEMP
-			if ((out = fdopen( mkstemp(tmpfil), "w" )) == NULL )
-				adios(tmpfil, "unable to create");
+		if ((out = fdopen(mkstemp(tmpfil), "w")) == NULL)
+			adios(tmpfil, "unable to create");
 #else
-			mktemp(tmpfil);
-			if ((out = fopen(tmpfil, "w")) == NULL)
-				adios(tmpfil, "unable to create");
-			chmod(tmpfil, 0600);
+		mktemp(tmpfil);
+		if ((out = fopen(tmpfil, "w")) == NULL)
+			adios(tmpfil, "unable to create");
+		chmod(tmpfil, 0600);
 #endif
-		}
+	}
 
 	hdrtab = (msgstate == normal) ? NHeaders : RHeaders;
 
 	for (compnum = 1, state = FLD;;) {
 		switch (state = m_getfld(state, name, buf, sizeof(buf), in)) {
-			case FLD:
-				compnum++;
-				putfmt(name, buf, out);
-				continue;
-
-			case FLDPLUS:
-				compnum++;
+		case FLD:
+			compnum++;
+			putfmt(name, buf, out);
+			continue;
+
+		case FLDPLUS:
+			compnum++;
+			cp = add(buf, cp);
+			while (state == FLDPLUS) {
+				state = m_getfld(state, name, buf,
+						sizeof(buf), in);
 				cp = add(buf, cp);
-				while (state == FLDPLUS) {
-					state = m_getfld(state, name, buf,
-							sizeof(buf), in);
-					cp = add(buf, cp);
-				}
-				putfmt(name, cp, out);
-				free(cp);
-				continue;
-
-			case BODY:
-				finish_headers(out);
-				fprintf(out, "\n%s", buf);
-				while (state == BODY) {
-					state = m_getfld(state, name, buf,
-							sizeof(buf), in);
-					fputs(buf, out);
-				}
-				break;
+			}
+			putfmt(name, cp, out);
+			free(cp);
+			continue;
+
+		case BODY:
+			finish_headers(out);
+			fprintf(out, "\n%s", buf);
+			while (state == BODY) {
+				state = m_getfld(state, name, buf,
+						sizeof(buf), in);
+				fputs(buf, out);
+			}
+			break;
 
-			case FILEEOF:
-				finish_headers(out);
-				break;
+		case FILEEOF:
+			finish_headers(out);
+			break;
 
-			case LENERR:
-			case FMTERR:
-				adios(NULL, "message format error in component #%d", compnum);
+		case LENERR:
+		case FMTERR:
+			adios(NULL, "message format error in component #%d",
+					compnum);
 
-			default:
-				adios(NULL, "getfld() returned %d", state);
+		default:
+			adios(NULL, "getfld() returned %d", state);
 		}
 		break;
 	}
-
 	fclose(in);
-	if (backflg) {
-		strncpy(buf, m_backup(msg), sizeof(buf));
-		if (rename(msg, buf) == NOTOK)
-			advise(buf, "unable to rename %s to", msg);
-	}
 
 	if (debug) {
+		/* stop here */
 		done(0);
 	}
-	else
-		fclose(out);
 
-	file(tmpfil);
+	fclose(out);
+
+	/* process Fcc */
+	for (i=0; i<fccind; i++) {
+		fcc(tmpfil, fccfold[i]);
+	}
 
 	/*
 	** re-open the temp file, unlink it and exec sendmail, giving it
 	** the msg temp file as std in.
 	*/
-	if (freopen(tmpfil, "r", stdin) == NULL)
+	if (!freopen(tmpfil, "r", stdin)) {
 		adios(tmpfil, "can't reopen for sendmail");
-	if (rmflg)
-		unlink(tmpfil);
+	}
+	unlink(tmpfil);
 
 	argp = sargv;
 	*argp++ = "send-mail";
@@ -431,19 +369,19 @@ main(int argc, char **argv)
 
 	if (pushflg && !(watch || verbose)) {
 		/* fork to a child to run sendmail */
-		for (i=0; (pid = vfork()) == NOTOK && i < 5; i++)
+		for (i=0; (pid = fork()) == NOTOK && i < 5; i++)
 			sleep(5);
 		switch (pid) {
-			case NOTOK:
-				fprintf(verbose ? stdout : stderr,
-						"%s: can't fork to %s\n",
-						invo_name, sendmail);
-				exit(-1);
-			case OK:
-				/* we're the child .. */
-				break;
-			default:
-				exit(0);
+		case NOTOK:
+			fprintf(verbose ? stdout : stderr,
+					"%s: can't fork to %s\n",
+					invo_name, sendmail);
+			exit(-1);
+		case OK:
+			/* we're the child .. */
+			break;
+		default:
+			exit(0);
 		}
 	}
 	execv(sendmail, sargv);
@@ -464,13 +402,16 @@ putfmt(char *name, char *str, FILE *out)
 		str++;
 
 	if ((i = get_header(name, hdrtab)) == NOTOK) {
+		/* some boring header: push it through */
 		fprintf(out, "%s: %s", name, str);
 		return;
 	}
 
+	/* one of the interesting headers */
 	hdr = &hdrtab[i];
-	if (hdr->flags & HIGN)
+	if (hdr->flags & HIGN) {
 		return;
+	}
 	if (hdr->flags & HBAD) {
 		advise(NULL, "illegal header line -- %s:", name);
 		badmsg++;
@@ -478,18 +419,26 @@ putfmt(char *name, char *str, FILE *out)
 	}
 	msgflags |= hdr->set;
 
-	if (hdr->flags & HSUB)
-		subject = subject ? add(str, add("\t", subject)) :
-				getcpy(str);
+	if (hdr->flags & HSUB) {
+		if (subject) {
+			/* append mupliple subject */
+			char *cp = concat(subject, "\t", str, NULL);
+			free(subject);
+			subject = cp;
+		} else {
+			subject = getcpy(str);
+		}
+	}
 
 	if (hdr->flags & HFCC) {
-		if ((cp = strrchr(str, '\n')))
-			*cp = 0;
+		if ((cp = strrchr(str, '\n'))) {
+			*cp = '\0';
+		}
 		for (cp = pp = str; (cp = strchr(pp, ',')); pp = cp) {
-			*cp++ = 0;
-			insert_fcc(hdr, pp);
+			*cp++ = '\0';
+			insert_fcc(hdr->value, pp);
 		}
-		insert_fcc(hdr, pp);
+		insert_fcc(hdr->value, pp);
 		return;
 	}
 
@@ -513,7 +462,7 @@ putfmt(char *name, char *str, FILE *out)
 			register struct mailname *mp = 0;
 
 			while ((cp = getname(str))) {
-				mp = getm( cp, NULL, 0, AD_HOST, NULL);
+				mp = getm(cp, NULL, 0, AD_HOST, NULL);
 				if (f == 0) {
 					f = mp;
 					mp->m_next = mp;
@@ -524,7 +473,7 @@ putfmt(char *name, char *str, FILE *out)
 				}
 			}
 			f = mp->m_next; mp->m_next = 0;
-			putadr( name, f );
+			putadr(name, f);
 		} else {
 			/*
 			** The author(s) of spost decided that alias
@@ -545,105 +494,63 @@ putfmt(char *name, char *str, FILE *out)
 			** alias processing as well.
 			** -- Dan Harkless <dan-nmh@dilvish.speed.net>
 			*/
-			fprintf(out, "%s: %s", name, str );
+			fprintf(out, "%s: %s", name, str);
 		}
 	}
 }
 
 
+/*
+** Add yet missing headers.
+*/
 static void
-start_headers(void)
+finish_headers(FILE *out)
 {
 	char *cp;
-	char sigbuf[BUFSIZ];
+	char from[BUFSIZ];  /* my network address */
+	char signature[BUFSIZ];  /* my signature */
+	char *resentstr = (msgstate == resent) ? "Resent-" : "";
 
-	strncpy(from, getusername(), sizeof(from));
+	if (!(msgflags & MDAT)) {
+		fprintf(out, "%sDate: %s\n", resentstr, dtimenow(0));
+	}
 
+	strncpy(from, getusername(), sizeof(from));
 	if ((cp = getfullname()) && *cp) {
-		strncpy(sigbuf, cp, sizeof(sigbuf));
-		snprintf(signature, sizeof(signature), "%s <%s>",
-				sigbuf,  from);
-	} else
-		snprintf(signature, sizeof(signature), "%s",  from);
-}
-
-
-static void
-finish_headers(FILE *out)
-{
-	switch (msgstate) {
-		case normal:
-			if (!(msgflags & MDAT))
-				fprintf(out, "Date: %s\n", dtimenow(0));
-
-			if (msgflags & MFRM) {
-				/*
-				** There was already a From: in the draft.
-				** Don't add one.
-				*/
-				if (!draft_from_masquerading)
-					/*
-					** mts.conf didn't contain
-					** "masquerade:[...]draft_from[...]"
-					** so we'll reveal the user's
-					** actual account@thismachine
-					** address in a Sender: header
-					** (and use it as the envelope
-					** From: later).
-					*/
-					fprintf(out, "Sender: %s\n", from);
-			} else
-				fprintf(out, "From: %s\n", signature);
-
-#ifdef notdef
-			if (!(msgflags & MVIS))
-				fprintf(out, "Bcc: Blind Distribution List: ;\n");
-#endif /* notdef */
-			break;
-
-		case resent:
-			if (!(msgflags & MRDT))
-				fprintf(out, "Resent-Date: %s\n", dtimenow(0));
-			if (msgflags & MRFM) {
-				/*
-				** There was already a Resent-From: in draft.
-				** Don't add one.
-				*/
-				if (!draft_from_masquerading)
-					/*
-					** mts.conf didn't contain
-					** "masquerade:[...]draft_from[...]"
-					** so we'll reveal the user's
-					** actual account@thismachine
-					** address in a Sender: header
-					** (and use it as the envelope
-					** From: later).
-					*/
-					fprintf(out, "Resent-Sender: %s\n",
-							from);
-			} else
-				/* Construct a Resent-From: header. */
-				fprintf(out, "Resent-From: %s\n", signature);
+		snprintf(signature, sizeof(signature), "%s <%s>", cp, from);
+	} else {
+		snprintf(signature, sizeof(signature), "%s", from);
+	}
+	if (!(msgflags & MFRM)) {
+		fprintf(out, "%sFrom: %s\n", resentstr, signature);
+	} else {
+		/* In case the From: header contains multiple addresses. */
+		fprintf(out, "%sSender: %s\n", resentstr, from);
+	}
 #ifdef notdef
-			if (!(msgflags & MVIS))
-				fprintf(out, "Resent-Bcc: Blind Re-Distribution List: ;\n");
+	if (!(msgflags & MVIS))
+		fprintf(out, "%sBcc: Blind Distribution List: ;\n", resentstr);
 #endif /* notdef */
-			break;
-	}
 
-	if (badmsg)
+	if (badmsg) {
 		adios(NULL, "re-format message and try again");
+	}
 }
 
 
+/*
+** Return index of the requested header in the table, or NOTOK if missing.
+*/
 static int
 get_header(char *header, struct headers *table)
 {
 	struct headers *h;
 
-	for (h = table; h->value; h++)
-		if (!mh_strcasecmp(header, h->value))
+	for (h=table; h->value; h++) {
+		if (mh_strcasecmp(header, h->value)==0) {
 			return (h - table);
+		}
+	}
 
 	return NOTOK;
 }
@@ -674,34 +581,37 @@ putadr(char *name, struct mailname *nl)
 		if (mp->m_nohost) {
 			/* a local name - see if it's an alias */
 			cp = akvalue(mp->m_mbox);
-			if (cp == mp->m_mbox)
+			if (cp == mp->m_mbox) {
 				/* wasn't an alias - use what the user typed */
 				linepos = putone(mp->m_text, linepos, namelen);
-			else
+			} else {
 				/* an alias - expand it */
 				while ((cp = getname(cp))) {
 					if (linepos > MAX_SM_FIELD) {
-							fprintf(out, "\n%s: ", name);
-							linepos = namelen;
+						fprintf(out, "\n%s: ", name);
+						linepos = namelen;
 					}
-					mp2 = getm( cp, NULL, 0, AD_HOST, NULL);
+					mp2 = getm(cp, NULL, 0, AD_HOST, NULL);
 					if (akvisible()) {
 						mp2->m_pers = getcpy(mp->m_mbox);
-						linepos = putone( adrformat(mp2), linepos, namelen );
+						linepos = putone(adrformat(mp2), linepos, namelen);
 					} else {
-						linepos = putone( mp2->m_text, linepos, namelen );
+						linepos = putone(mp2->m_text,
+								linepos,
+								namelen);
 					}
-					mnfree( mp2 );
+					mnfree(mp2);
 				}
+			}
 		} else {
 			/* not a local name - use what the user typed */
-			linepos = putone( mp->m_text, linepos, namelen );
+			linepos = putone(mp->m_text, linepos, namelen);
 		}
 		mp2 = mp;
 		mp = mp->m_next;
-		mnfree( mp2 );
+		mnfree(mp2);
 	}
-	putc( '\n', out );
+	putc('\n', out);
 }
 
 static int
@@ -710,41 +620,44 @@ putone(char *adr, int pos, int indent)
 	register int len;
 	static int linepos;
 
-	len = strlen( adr );
+	len = strlen(adr);
 	if (pos == indent)
 		linepos = pos;
-	else if (linepos+len > outputlinelen) {
-		fprintf( out, ",\n%*s", indent, "");
+	else if (linepos+len > OUTPUTLINELEN) {
+		fprintf(out, ",\n%*s", indent, "");
 		linepos = indent;
 		pos += indent + 2;
 	} else {
-		fputs( ", ", out );
+		fputs(", ", out);
 		linepos += 2;
 		pos += 2;
 	}
-	fputs( adr, out );
+	fputs(adr, out);
 
 	linepos += len;
 	return (pos+len);
 }
 
 
+/*
+** Insert the normalized value from pp into fccfold[].
+*/
 static void
-insert_fcc(struct headers *hdr, unsigned char *pp)
+insert_fcc(char *name, unsigned char *pp)
 {
-	unsigned char   *cp;
+	unsigned char *cp;
 
 	for (cp = pp; isspace(*cp); cp++)
 		continue;
 	for (pp += strlen(pp) - 1; pp > cp && isspace(*pp); pp--)
 		continue;
 	if (pp >= cp)
-		*++pp = 0;
-	if (*cp == 0)
+		*++pp = '\0';
+	if (!*cp)
 		return;
 
 	if (fccind >= FCCS)
-		adios(NULL, "too many %ss", hdr->value);
+		adios(NULL, "too many %ss", name);
 	fccfold[fccind++] = getcpy(cp);
 }
 
@@ -771,56 +684,50 @@ make_bcc_file(void)
 	chmod(bccfil, 0600);
 
 	fprintf(out, "Date: %s\n", dtimenow(0));
-	if (msgflags & MFRM) {
-	  /* There was already a From: in the draft.  Don't add one. */
-	  if (!draft_from_masquerading)
-		/*
-		** mts.conf didn't contain "masquerade:[...]draft_from[...]"
-		** so we'll reveal the user's actual account@thismachine
-		** address in a Sender: header (and use it as the envelope
-		** From: later).
-		*/
-		fprintf(out, "Sender: %s\n", from);
-	} else
+	if (!(msgflags & MFRM)) {
 		/* Construct a From: header. */
 		fprintf(out, "From: %s\n", signature);
+	} else {
+		/* Add a Sender: header in case the From: header is fake. */
+		fprintf(out, "Sender: %s\n", from);
+	}
 	if (subject)
 		fprintf(out, "Subject: %s", subject);
 	fprintf(out, "BCC:\n\n------- Blind-Carbon-Copy\n\n");
 	fflush(out);
 
-	if (filter == NULL) {
+	if (!filter) {
 		if ((fd = open(tmpfil, O_RDONLY)) == NOTOK)
 			adios(NULL, "unable to re-open");
 		cpydgst(fd, fileno(out), tmpfil, bccfil);
 		close(fd);
 	} else {
-		vec[0] = r1bindex(mhlproc, '/');
+		vec[0] = mhbasename(mhlproc);
 
-		for (i = 0; (child_id = vfork()) == NOTOK && i < 5; i++)
+		for (i = 0; (child_id = fork()) == NOTOK && i < 5; i++)
 			sleep(5);
 		switch (child_id) {
-			case NOTOK:
-				adios("vfork", "unable to");
-
-			case OK:
-				dup2(fileno(out), 1);
-
-				i = 1;
-				vec[i++] = "-forward";
-				vec[i++] = "-form";
-				vec[i++] = filter;
-				vec[i++] = tmpfil;
-				vec[i] = NULL;
-
-				execvp(mhlproc, vec);
-				adios(mhlproc, "unable to exec");
-
-			default:
-				if (status = pidwait(child_id, OK))
-					admonish(NULL, "%s lost (status=0%o)",
-							vec[0], status);
-				break;
+		case NOTOK:
+			adios("fork", "unable to");
+
+		case OK:
+			dup2(fileno(out), 1);
+
+			i = 1;
+			vec[i++] = "-forward";
+			vec[i++] = "-form";
+			vec[i++] = filter;
+			vec[i++] = tmpfil;
+			vec[i] = NULL;
+
+			execvp(mhlproc, vec);
+			adios(mhlproc, "unable to exec");
+
+		default:
+			if (status = pidwait(child_id, OK))
+				admonish(NULL, "%s lost (status=0%o)",
+						vec[0], status);
+			break;
 		}
 	}
 
@@ -830,20 +737,8 @@ make_bcc_file(void)
 }
 #endif /* if 0 */
 
-/* FCC INTERACTION */
-
-static void
-file(char *path)
-{
-	int i;
-
-	if (fccind == 0)
-		return;
-
-	for (i = 0; i < fccind; i++)
-		fcc(path, fccfold[i]);
-}
 
+/* FCC INTERACTION */
 
 static void
 fcc(char *file, char *folder)
@@ -857,55 +752,39 @@ fcc(char *file, char *folder)
 				folder);
 	fflush(stdout);
 
-	for (i = 0; (child_id = vfork()) == NOTOK && i < 5; i++)
+	for (i = 0; (child_id = fork()) == NOTOK && i < 5; i++)
 		sleep(5);
 	switch (child_id) {
-		case NOTOK:
-			if (!verbose)
-				fprintf(stderr, "  %sFcc %s: ",
-						msgstate == resent ?
-						"Resent-" : "", folder);
-			fprintf(verbose ? stdout : stderr, "no forks, so not ok\n");
-			break;
+	case NOTOK:
+		if (verbose) {
+			printf("Sorry man, but we had no more forks.\n");
+		} else {
+			fprintf(stderr, "Skipped %sFcc %s: unable to fork.\n",
+					msgstate == resent ? "Resent-" : "",
+					folder);
+		}
+		break;
 
-		case OK:
-			snprintf(fold, sizeof(fold), "%s%s",
-				*folder == '+' || *folder == '@' ? "" : "+", folder);
-			execlp(fileproc, r1bindex(fileproc, '/'),
+	case OK:
+		snprintf(fold, sizeof(fold), "%s%s",
+				*folder == '+' || *folder == '@' ? "" : "+",
+				folder);
+		execlp(fileproc, mhbasename(fileproc),
 				"-link", "-file", file, fold, NULL);
-			_exit(-1);
-
-		default:
-			if ((status = pidwait(child_id, OK))) {
-				if (!verbose)
-					fprintf(stderr, "  %sFcc %s: ",
-							msgstate == resent ?
-							"Resent-" : "",
-							folder);
-				fprintf(verbose ? stdout : stderr,
-						" errored (0%o)\n", status);
+		_exit(-1);
+
+	default:
+		if ((status = pidwait(child_id, OK))) {
+			if (verbose) {
+				printf(" errored (0%o)\n", status);
+			} else {
+				fprintf(stderr, "  %sFcc %s: errored (0%o)\n",
+						msgstate == resent ?
+						"Resent-" : "", folder,
+						status);
 			}
+		}
 	}
 
 	fflush(stdout);
 }
-
-
-#if 0
-
-/*
-** TERMINATION
-*/
-
-static void
-die(char *what, char *fmt, ...)
-{
-	va_list ap;
-
-	va_start(ap, fmt);
-	advertise(what, NULL, fmt, ap);
-	va_end(ap);
-
-	done(1);
-}
-#endif