X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fspost.c;h=73787f79ca8adbad53306da10816973e6b6b551e;hb=5276fe8873c9201f9b4ba8c6fcb5efb3887eab77;hp=76b68a4e1ca7840a6f447ea6014dcbb97571a636;hpb=fce8a87e8a4a443a08a98b24eef270451a63fab8;p=mmh

diff --git a/uip/spost.c b/uip/spost.c
index 76b68a4..73787f7 100644
--- a/uip/spost.c
+++ b/uip/spost.c
@@ -50,24 +50,20 @@ struct swit switches[] = {
 	{ "alias aliasfile", 0 },
 #define NALIASW  13
 	{ "noalias", 0 },
-#define WIDTHSW  14
-	{ "width columns", 0 },
-#define VERSIONSW  15
+#define VERSIONSW  14
 	{ "version", 0 },
-#define HELPSW  16
+#define HELPSW  15
 	{ "help", 0 },
-#define DEBUGSW  17
+#define DEBUGSW  16
 	{ "debug", -5 },
-#define DISTSW  18
+#define DISTSW  17
 	{ "dist", -4 },  /* interface from dist */
-#define PUSHSW  19  /* fork to sendmail then exit */
+#define PUSHSW  18  /* fork to sendmail then exit */
 	{ "push", -4 },
-#define NPUSHSW  20  /* exec sendmail */
+#define NPUSHSW  19  /* exec sendmail */
 	{ "nopush", -6 },
-#define LIBSW  21
+#define LIBSW  20
 	{ "library directory", -7 },
-#define ANNOSW  22
-	{ "idanno number", -6 },
 	{ NULL, 0 }
 };
 
@@ -109,7 +105,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 +119,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,8 +129,6 @@ 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 */
@@ -143,7 +137,6 @@ 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 = 0;  /* if going to process aliases */
-static int outputlinelen=72;
 
 static unsigned msgflags = 0;  /* what we've seen */
 
@@ -158,6 +151,7 @@ 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 */
@@ -181,12 +175,10 @@ 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
 
@@ -215,104 +207,94 @@ main(int argc, char **argv)
 	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 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]);
+				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 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]);
-					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 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)
@@ -348,43 +330,44 @@ main(int argc, char **argv)
 
 	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;
 	}
@@ -398,11 +381,14 @@ main(int argc, char **argv)
 
 	if (debug) {
 		done(0);
-	}
-	else
+	} else {
 		fclose(out);
+	}
 
-	file(tmpfil);
+	/* process Fcc */
+	for (i=0; i<fccind; i++) {
+		fcc(tmpfil, fccfold[i]);
+	}
 
 	/*
 	** re-open the temp file, unlink it and exec sendmail, giving it
@@ -424,19 +410,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);
@@ -457,13 +443,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++;
@@ -471,18 +460,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;
 	}
 
@@ -506,7 +503,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;
@@ -517,7 +514,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
@@ -544,99 +541,69 @@ putfmt(char *name, char *str, FILE *out)
 }
 
 
+/*
+** Construct signature name
+*/
 static void
 start_headers(void)
 {
 	char *cp;
-	char sigbuf[BUFSIZ];
 
 	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);
+		snprintf(signature, sizeof(signature), "%s <%s>", cp, from);
+	} else {
+		snprintf(signature, sizeof(signature), "%s", from);
+	}
 }
 
 
+/*
+** Add yet missing headers.
+*/
 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);
+	char *resentstr = (msgstate == resent) ? "Resent-" : "";
 
+	if (!(msgflags & MDAT)) {
+		fprintf(out, "%sDate: %s\n", resentstr, dtimenow(0));
+	}
+	if (!(msgflags & MFRM)) {
+		fprintf(out, "%sFrom: %s\n", resentstr, signature);
+	} else 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, "%sSender: %s\n", resentstr, from);
+	}
 #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);
-#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;
 }
@@ -706,7 +673,7 @@ putone(char *adr, int pos, int indent)
 	len = strlen( adr );
 	if (pos == indent)
 		linepos = pos;
-	else if (linepos+len > outputlinelen) {
+	else if (linepos+len > OUTPUTLINELEN) {
 		fprintf( out, ",\n%*s", indent, "");
 		linepos = indent;
 		pos += indent + 2;
@@ -722,22 +689,25 @@ putone(char *adr, int pos, int indent)
 }
 
 
+/*
+** 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);
 }
 
@@ -790,30 +760,30 @@ make_bcc_file(void)
 	} else {
 		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;
 		}
 	}
 
@@ -823,20 +793,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)
@@ -850,55 +808,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, mhbasename(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