X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fspost.c;h=f3630d25edea9272429ad9a732f1fa62a42076d1;hp=8b4b8300dacc80edce7eae329d2d661d24c7fec5;hb=32b2354dbaf4bf934936eb5b102a4a3d2fdd209a;hpb=fcde9624e6832e0dcdc6f21996b69b7e58745e3d

diff --git a/uip/spost.c b/uip/spost.c
index 8b4b830..f3630d2 100644
--- a/uip/spost.c
+++ b/uip/spost.c
@@ -18,7 +18,6 @@
 #include <h/utils.h>
 
 #define MAX_SM_FIELD 1476  /* < largest hdr field sendmail will accept */
-#define FCCS 10  /* max number of fccs allowed */
 
 struct swit switches[] = {
 #define VERBSW  0
@@ -34,18 +33,14 @@ struct swit switches[] = {
 #define NALIASW  5
 	{ "noalias", 0 },
 #define VERSIONSW  6
-	{ "version", 0 },
+	{ "Version", 0 },
 #define HELPSW  7
 	{ "help", 0 },
 #define DEBUGSW  8
 	{ "debug", -5 },
 #define DISTSW  9
 	{ "dist", -4 },  /* interface from dist */
-#define PUSHSW  10  /* fork to sendmail then exit */
-	{ "push", -4 },
-#define NPUSHSW  11  /* exec sendmail */
-	{ "nopush", -6 },
-#define LIBSW  12
+#define LIBSW  10
 	{ "library directory", -7 },
 	{ NULL, 0 }
 };
@@ -58,10 +53,8 @@ struct swit switches[] = {
 #define HSUB  0x0004  /* Subject: header */
 #define HTRY  0x0008  /* try to send to addrs on header */
 #define HBCC  0x0010  /* don't output this header */
-#define HNGR  0x0020  /* no groups allowed in this header */
-#define HFCC  0x0040  /* FCC: type header */
-#define HNIL  0x0080  /* okay for this header not to have addrs */
-#define HIGN  0x0100  /* ignore this header */
+#define HFCC  0x0020  /* FCC: type header */
+#define HIGN  0x0040  /* ignore this header */
 
 /* flags for headers->set */
 #define MFRM  0x0001  /* we've seen a From: */
@@ -77,26 +70,26 @@ struct headers {
 	unsigned int set;
 };
 
-
 static struct headers NHeaders[] = {
 	{ "Return-Path", HBAD, 0 },
 	{ "Received", HBAD, 0 },
-	{ "Reply-To", HADR|HNGR, 0 },
-	{ "From", HADR|HNGR, MFRM },
+	{ "Reply-To", HADR, 0 },
+	{ "From", HADR, MFRM },
 	{ "Sender", HADR|HBAD, 0 },
 	{ "Date", HNOP, MDAT },
 	{ "Subject", HSUB, 0 },
 	{ "To", HADR|HTRY, MVIS },
 	{ "Cc", HADR|HTRY, MVIS },
-	{ "Bcc", HADR|HTRY|HBCC|HNIL, MINV },
+	{ "Bcc", HADR|HTRY|HBCC, MINV },
 	{ "Message-Id", HBAD, 0 },
 	{ "Fcc", HFCC, 0 },
+	{ "Envelope-From", HIGN, 0 },
 	{ NULL, 0, 0 }
 };
 
 static struct headers RHeaders[] = {
-	{ "Resent-Reply-To",   HADR|HNGR, 0 },
-	{ "Resent-From", HADR|HNGR, MRFM },
+	{ "Resent-Reply-To",   HADR, 0 },
+	{ "Resent-From", HADR, MRFM },
 	{ "Resent-Sender", HADR|HBAD, 0 },
 	{ "Resent-Date", HNOP, MRDT },
 	{ "Resent-Subject", HSUB, 0 },
@@ -107,6 +100,7 @@ static struct headers RHeaders[] = {
 	{ "Resent-Fcc", HFCC, 0 },
 	{ "Reply-To", HADR, 0 },
 	{ "Fcc", HIGN, 0 },
+	{ "Envelope-From", HIGN, 0 },
 	{ NULL, 0, 0 }
 };
 
@@ -115,7 +109,6 @@ static int badmsg = 0;  /* message has bad semantics */
 static int verbose = 0;  /* spell it out */
 static int debug = 0;  /* debugging post */
 static int watch = 0;  /* watch the delivery process */
-static int pushflg = 0;  /* if going to fork to sendmail */
 static int aliasflg = 0;  /* if going to process aliases */
 
 static unsigned msgflags = 0;  /* what we've seen */
@@ -124,19 +117,15 @@ static enum {
 	normal, resent
 } msgstate = normal;
 
-static char tmpfil[] = "/tmp/spost-XXXXXX";
-static char bccfil[] = "/tmp/spost-bcc-XXXXXX";
+static char *tmpfil;
 
 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[] */
-struct mailname *bccs = NULL;
+static char fccs[BUFSIZ] = "";
+struct mailname *bccs = NULL;  /* list of the bcc recipients */
 
 static struct headers *hdrtab;  /* table for the message we're doing */
 static FILE *out;  /* output (temp) file */
 
-extern char *sendmail;
-
 /*
 ** static prototypes
 */
@@ -145,15 +134,15 @@ 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(char *, unsigned char *);
+static void process_fcc(char *);
 static void fcc(char *, char *);
-static void make_bcc_draft(char *);
+static void process_bccs(char *);
 
 
 int
 main(int argc, char **argv)
 {
-	int state, i, pid, compnum;
+	int state, compnum;
 	char *cp, *msg = NULL, **argp, **arguments;
 	char *sargv[16], buf[BUFSIZ], name[NAMESZ];
 	FILE *in;
@@ -211,13 +200,6 @@ main(int argc, char **argv)
 				watch = 0;
 				continue;
 
-			case PUSHSW:
-				pushflg++;
-				continue;
-			case NPUSHSW:
-				pushflg = 0;
-				continue;
-
 			case ALIASW:
 				if (!(cp = *argp++) || *cp == '-')
 					adios(NULL, "missing argument to %s",
@@ -256,15 +238,7 @@ main(int argc, char **argv)
 		verbose++;
 		out = stdout;
 	} else {
-#ifdef HAVE_MKSTEMP
-		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);
-#endif
+		tmpfil = getcpy(m_mktemp2("/tmp/", invo_name, NULL, &out));
 	}
 
 	hdrtab = (msgstate == normal) ? NHeaders : RHeaders;
@@ -322,24 +296,10 @@ main(int argc, char **argv)
 	fclose(out);
 
 	/* process Fcc */
-	for (i=0; i<fccind; i++) {
-		fcc(tmpfil, fccfold[i]);
-	}
-
-	/* process Bcc */
-	if (bccs) {
-		make_bcc_draft(tmpfil);
+	if (*fccs) {
+		fcc(tmpfil, fccs);
 	}
 
-	/*
-	** re-open the temp file, unlink it and exec sendmail, giving it
-	** the msg temp file as std in.
-	*/
-	if (!freopen(tmpfil, "r", stdin)) {
-		adios(tmpfil, "can't reopen for sendmail");
-	}
-	unlink(tmpfil);
-
 	argp = sargv;
 	*argp++ = "send-mail";
 	*argp++ = "-m";  /* send to me too */
@@ -347,161 +307,135 @@ main(int argc, char **argv)
 	*argp++ = "-i";  /* don't stop on "." */
 	if (watch || verbose) {
 		*argp++ = "-v";
-		pushflg = 0;
 	}
 	*argp = NULL;
 
-	if (pushflg) {
-		/* fork to a child to run sendmail */
-		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:
+	if (bccs) {
+		process_bccs(tmpfil);
+		if (!(msgflags & MVIS)) {
+			/* only Bcc rcpts: we're finished here */
+			unlink(tmpfil);
 			exit(0);
 		}
 	}
 
-	if (0 /*bccs*/) {
-		/* fork to a child to run sendmail */
-		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 .. */
-			exit(0);
-		default:
-			exit(0);
-		}
+	/*
+	** re-open the temp file, unlink it and exec sendmail, giving it
+	** the msg temp file as std in.
+	*/
+	if (!freopen(tmpfil, "r", stdin)) {
+		adios(tmpfil, "can't reopen for sendmail");
 	}
+	unlink(tmpfil);
 
 	execv(sendmail, sargv);
 	adios(sendmail, "can't exec");
-	return 0;  /* dead code to satisfy the compiler */
+	return -1;
 }
 
+
 /* DRAFT GENERATION */
 
 static void
 putfmt(char *name, char *str, FILE *out)
 {
 	int i;
-	char *cp, *pp;
+	char *cp;
 	struct headers *hdr;
 
-	while (*str == ' ' || *str == '\t')
+	/* remove all leading whitespace (even newlines) */
+	while (*str==' ' || *str=='\t' || *str=='\n') {
 		str++;
+	}
 
 	if ((i = get_header(name, hdrtab)) == NOTOK) {
-		/* some boring header: push it through */
+		/* no header we would care for: push it through */
 		fprintf(out, "%s: %s", name, str);
 		return;
 	}
-	/* one of the interesting headers */
+	/* it's one of the interesting headers */
 	hdr = &hdrtab[i];
 
-	if (hdr->flags & HIGN) {
+	if (hdr->flags & HIGN || !*str) {
 		return;
 	}
+
 	if (hdr->flags & HBAD) {
 		advise(NULL, "illegal header line -- %s:", name);
 		badmsg++;
 		return;
 	}
+
 	msgflags |= hdr->set;
 
-	if (hdr->flags & HSUB) {
-		if (subject) {
-			/* concatenate mupliple subject */
-			char *cp = concat(subject, "\t", str, NULL);
-			free(subject);
-			subject = cp;
-		} else {
-			subject = getcpy(str);
-		}
+	if (hdr->flags & HFCC) {
+		process_fcc(str);
+		return;
 	}
 
-	if (hdr->flags & HFCC) {
-		if ((cp = strrchr(str, '\n'))) {
-			*cp = '\0';
-		}
-		for (cp = pp = str; (cp = strchr(pp, ',')); pp = cp) {
-			*cp++ = '\0';
-			insert_fcc(hdr->value, pp);
+	if (hdr->flags & HBCC) {
+		struct mailname *mp = NULL;
+
+		/* Create list of Bcc addrs. */
+		while ((cp = getname(str))) {
+			mp = getm(cp, NULL, 0, AD_HOST, NULL);
+			mp->m_next = bccs;  /* push */
+			bccs = mp;
 		}
-		insert_fcc(hdr->value, pp);
 		return;
 	}
 
-	if (*str != '\n' && *str != '\0') {
-		if (hdr->flags & HBCC) {
-			struct mailname *mp = NULL;
-
-			/* Create list of Bcc adds. */
-			while ((cp = getname(str))) {
-				mp = getm(cp, NULL, 0, AD_HOST, NULL);
-				mp->m_next = bccs;  /* push */
-				bccs = mp;
-			}
-		} else if (aliasflg && hdr->flags & HTRY) {
-			/*
-			** this header contains address(es) that we have to do
-			** alias expansion on.  Because of the saved state in
-			** getname we have to put all the addresses into a
-			** list. We then let putadr munch on that list,
-			** possibly expanding aliases.
-			**/
-			register struct mailname *f = 0;
-			register struct mailname *mp = 0;
-
-			while ((cp = getname(str))) {
-				mp = getm(cp, NULL, 0, AD_HOST, NULL);
-				if (f == 0) {
-					f = mp;
-					mp->m_next = mp;
-				} else {
-					mp->m_next = f->m_next;
-					f->m_next = mp;
-					f = mp;
-				}
+	if (aliasflg && hdr->flags & HTRY) {
+		/*
+		** This header contains address(es) that we have to do
+		** alias expansion on.  Because of the saved state in
+		** getname we have to put all the addresses into a list.
+		**/
+		struct mailname *f = NULL;
+		struct mailname *mp = NULL;
+
+		while ((cp = getname(str))) {
+			mp = getm(cp, NULL, 0, AD_HOST, NULL);
+			if (!f) {
+				f = mp;
+				mp->m_next = mp;
+			} else {
+				mp->m_next = f->m_next;
+				f->m_next = mp;
+				f = mp;
 			}
-			f = mp->m_next; mp->m_next = 0;
-			putadr(name, f);
-		} else {
-			/*
-			** The author(s) of spost decided that alias
-			** substitution wasn't necessary for the non-HTRY
-			** headers.  Unfortunately, one of those headers
-			** is "From:", and having alias substitution
-			** work on that is extremely useful for someone
-			** with a lot of POP3 email accounts or aliases.
-			** post supports aliasing of "From:"...
-			**
-			** Since "From:"-processing is incompletely
-			** implemented in this unsupported and
-			** undocumented spost backend, I'm not
-			** going to take the time to implement my new
-			** draft-From:-based email address masquerading.
-			** If I do ever implement it here, I'd almost
-			** certainly want to implement "From:" line
-			** alias processing as well.
-			** -- Dan Harkless <dan-nmh@dilvish.speed.net>
-			*/
-			fprintf(out, "%s: %s", name, str);
 		}
+		f = mp->m_next;
+		mp->m_next = NULL;
+		/* Now munch on the list, possibly expanding aliases */
+		putadr(name, f);
+		return;
 	}
+
+	/*
+	** The author(s) of spost decided that alias substitution wasn't
+	** necessary for the non-HTRY headers.	Unfortunately, one of
+	** those headers is "From:", and having alias substitution work on
+	** that is extremely useful for someone with a lot of POP3 email
+	** accounts or aliases.  post supports aliasing of "From:"...
+	**
+	** Since "From:"-processing is incompletely implemented in this
+	** unsupported and undocumented spost backend, I'm not going
+	** to take the time to implement my new draft-From:-based email
+	** address masquerading.  If I do ever implement it here, I'd almost
+	** certainly want to implement "From:" line alias processing as well.
+	** -- Dan Harkless <dan-nmh@dilvish.speed.net>
+	*/
+	/*
+	** Although there is no masquerading anymore in mmh, we might want
+	** to have aliasing of From: addresses. Think about it.
+	** -- meillo@marmaro.de  2012-02
+	*/
+
+	if (hdr->flags & HSUB) {
+		subject = getcpy(str);
+	}
+	fprintf(out, "%s: %s", name, str);
 }
 
 
@@ -517,7 +451,7 @@ finish_headers(FILE *out)
 	char *resentstr = (msgstate == resent) ? "Resent-" : "";
 
 	if (!(msgflags & MDAT)) {
-		fprintf(out, "%sDate: %s\n", resentstr, dtimenow(0));
+		fprintf(out, "%sDate: %s\n", resentstr, dtimenow());
 	}
 
 	strncpy(from, getusername(), sizeof(from));
@@ -536,6 +470,7 @@ finish_headers(FILE *out)
 		fprintf(out, "%sBcc: Blind Distribution List: ;\n", resentstr);
 	}
 	if (badmsg) {
+		unlink(tmpfil);
 		adios(NULL, "re-format message and try again");
 	}
 }
@@ -642,104 +577,101 @@ putone(char *adr, int pos, int indent)
 }
 
 
-/*
-** Insert the normalized value from pp into fccfold[].
-*/
 static void
-insert_fcc(char *name, unsigned char *pp)
+process_fcc(char *str)
 {
-	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)
-		return;
+	char *cp, *pp;
+	int state = 0;
 
-	if (fccind >= FCCS)
-		adios(NULL, "too many %ss", name);
-	fccfold[fccind++] = getcpy(cp);
+	if (strlen(str)+strlen(fccs) > sizeof fccs /2) {
+		adios(NULL, "Too much Fcc data");
+	}
+	/* todo: better have three states: SEPARATOR, PLUS, WORD */
+	for (cp=pp=str; *cp; cp++) {
+		switch (*cp) {
+		case ' ':
+		case '\t':
+		case '\n':
+		case ',':
+			if (state != 0) {
+				state = 0;
+				*cp = '\0';
+				if (*pp=='+' || *pp=='@') {
+					strcat(fccs, " ");
+				} else {
+					strcat(fccs, " +");
+				}
+				strcat(fccs, pp);
+			}
+			break;
+		default:
+			if (state == 0) {
+				state = 1;
+				pp = cp;
+			}
+			break;
+		}
+	}
 }
 
 
 static void
-fcc(char *file, char *folder)
+fcc(char *file, char *folders)
 {
-	pid_t child_id;
-	int i, status;
-	char fold[BUFSIZ];
+	int status;
+	char cmd[BUFSIZ];
 
-	if (verbose)
+	if (verbose) {
 		printf("%sFcc: %s\n", msgstate == resent ? "Resent-" : "",
-				folder);
-	fflush(stdout);
-
-	for (i = 0; (child_id = fork()) == NOTOK && i < 5; i++)
-		sleep(5);
-	switch (child_id) {
-	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),
-				"-link", "-file", file, fold, NULL);
-		_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);
-			}
-		}
+				folders);
+		fflush(stdout);
+	}
+	if (100+strlen(file)+strlen(folders) > sizeof cmd) {
+		adios(NULL, "Too much Fcc data");
+	}
+	/* hack: read from /dev/null and refile(1) won't question us */
+	snprintf(cmd, sizeof cmd, "</dev/null refile -link -file '%s' %s",
+			file, folders);
+	status = system(cmd);
+	if (status == -1) {
+		fprintf(stderr, "Skipped %sFcc %s: unable to system().\n",
+				msgstate == resent ? "Resent-" : "", folders);
+	} else if (status != 0) {
+		fprintf(stderr, "%sFcc %s: Problems occured.\n",
+				msgstate == resent ? "Resent-" : "", folders);
 	}
-
-	fflush(stdout);
 }
 
 
 /* BCC GENERATION */
 
 static void
-make_bcc_draft(char *draft)
+process_bccs(char *origmsg)
 {
-	int fd;
-	FILE *out;
-
-#ifdef HAVE_MKSTEMP
-	fd = mkstemp(bccfil);
-	if (fd == -1 || (out = fdopen(fd, "w")) == NULL)
-		adios(bccfil, "unable to create");
-#else
-	mktemp(bccfil);
-	if ((out = fopen(bccfil, "w")) == NULL)
-		adios(bccfil, "unable to create");
-#endif
-	chmod(bccfil, 0600);
-
-	if (subject) {
-		fprintf(out, "Subject: BCC: %s", subject);
-	} else {
-		fprintf(out, "Subject: BCC: message without subject");
+	char *bccdraft = NULL;
+	char buf[BUFSIZ];
+	struct mailname *mp = NULL;
+	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 : "");
+		fprintf(out, "%s: %s\n", attach_hdr, origmsg);
+		fprintf(out, "------------\n");
+		fclose(out);
+
+		snprintf(buf, sizeof buf, "send %s", bccdraft);
+		if (system(buf) != 0) {
+			admonish(invo_name, "Problems to send Bcc to %s",
+					mp->m_text);
+			unlink(bccdraft);
+		}
+		/* TODO: unlink renamed bcc draft after send(1) */
 	}
-	fprintf(out, "%s: %s\n", attach_hdr, draft);
-	fprintf(out, "------------\n");
-	fclose(out);
 }