X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fsend.c;h=d7691db99a332a57c9ddc6322303cc6371b7bd91;hp=2416baf99f487e3dfa05b43669f18ccc1ab0769f;hb=6e9577f324bef90765a5edc02044eb111ec48072;hpb=714b5c530ece27ea2835a313013f5b770163403c

diff --git a/uip/send.c b/uip/send.c
index 2416baf..d7691db 100644
--- a/uip/send.c
+++ b/uip/send.c
@@ -10,115 +10,88 @@
 #include <fcntl.h>
 #include <errno.h>
 #include <signal.h>
+#include <h/signals.h>
+#include <h/mime.h>
+#include <h/tws.h>
+#include <h/utils.h>
+#include <sysexits.h>
+#include <sys/wait.h>
+#include <unistd.h>
+#include <ctype.h>
+#include <sys/stat.h>
+#include <locale.h>
+
+#ifdef HAVE_SYS_TIME_H
+# include <sys/time.h>
+#endif
+#include <time.h>
+
+#ifdef HAVE_SYS_PARAM_H
+# include <sys/param.h>
+#endif
+
+int debugsw = 0;  /* global */
+char *altmsg = NULL;
+char *annotext = NULL;
+char *distfile = NULL;
+
+/* name of temp file for body content */
+static char body_file_name[MAXPATHLEN + 1];
+/* name of mhbuild composition temporary file */
+static char composition_file_name[MAXPATHLEN + 1]; 
+static int field_size;  /* size of header field buffer */
+static char *field;  /* header field buffer */
+static FILE *draft_file;  /* draft file pointer */
+static FILE *body_file;  /* body file pointer */
+static FILE *composition_file;  /* composition file pointer */
+
+/*
+** static prototypes
+*/
+static int sendsbr(char **, int, char *, struct stat *);
+static void anno(struct stat *);
+static int sendaux(char **, int, char *, struct stat *);
+static int attach(char *);
+static int signandenc(char *);
+static void clean_up_temporary_files(void);
+static int get_line(void);
+static void make_mime_composition_file_entry(char *);
+static char* strexit(int status);
 
 
 static struct swit switches[] = {
-#define ALIASW  0
-	{ "alias aliasfile", 0 },
-#define DEBUGSW  1
+#define DEBUGSW  0
 	{ "debug", -5 },
-#define FILTSW  2
-	{ "filter filterfile", 0 },
-#define NFILTSW  3
-	{ "nofilter", 0 },
-#define FRMTSW  4
-	{ "format", 0 },
-#define NFRMTSW  5
-	{ "noformat", 0 },
-#define FORWSW  6
-	{ "forward", 0 },
-#define NFORWSW  7
-	{ "noforward", 0 },
-#define MIMESW  8
-	{ "mime", 0 },
-#define NMIMESW  9
-	{ "nomime", 0 },
-#define MSGDSW  10
-	{ "msgid", 0 },
-#define NMSGDSW  11
-	{ "nomsgid", 0 },
-#define PUSHSW  12
-	{ "push", 0 },
-#define NPUSHSW  13
-	{ "nopush", 0 },
-#define UNIQSW  14
-	{ "unique", -6 },
-#define NUNIQSW  15
-	{ "nounique", -8 },
-#define VERBSW  16
+#define VERBSW  1
 	{ "verbose", 0 },
-#define NVERBSW  17
-	{ "noverbose", 0 },
-#define WATCSW  18
-	{ "watch", 0 },
-#define NWATCSW  19
-	{ "nowatch", 0 },
-#define WIDTHSW  20
-	{ "width columns", 0 },
-#define VERSIONSW  21
-	{ "version", 0 },
-#define HELPSW  22
+#define NVERBSW  2
+	{ "noverbose", 2 },
+#define VERSIONSW  3
+	{ "Version", 0 },
+#define HELPSW  4
 	{ "help", 0 },
-#define BITSTUFFSW  23
-	{ "dashstuffing", -12 },
-#define NBITSTUFFSW  24
-	{ "nodashstuffing", -14 },
-#define MAILSW  25
-	{ "mail", -4 },
-#define SAMLSW  26
-	{ "saml", -4 },
-#define SENDSW  27
-	{ "send", -4 },
-#define SOMLSW  28
-	{ "soml", -4 },
-#define CLIESW  29
-	{ "client host", -6 },
-#define SERVSW  30
-	{ "server host", 6 },
-#define SNOOPSW  31
-	{ "snoop", 5 },
-#define ATTACHSW  32
-	{ "attach", 6 },
-#define ATTACHFORMATSW  33
-	{ "attachformat", 7 },
-#define PORTSW  34
-	{ "port server-port-name/number" , 4 },
 	{ NULL, 0 }
 };
 
-extern int debugsw;  /* from sendsbr.c */
-extern int forwsw;
-extern int inplace;
-extern int pushsw;
-extern int unique;
-extern int verbsw;
-
-extern char *altmsg;  /*  .. */
-extern char *annotext;
-extern char *distfile;
-
+char *version=VERSION;
 
 int
 main(int argc, char **argv)
 {
-	int msgp = 0, distsw = 0, vecp = 1;
-	int mime = 0;
+	int nmsgs = 0, nfiles = 0, distsw = 0, vecp = 1;
 	int msgnum, status;
-	char *cp, *maildir = NULL;
-	char buf[BUFSIZ], **ap, **argp, **arguments;
+	int in, out;
+	int n;
+	char *cp, *maildir = NULL, *folder = NULL;
+	char buf[BUFSIZ], **argp, **arguments;
 	char *msgs[MAXARGS], *vec[MAXARGS];
+	char *files[MAXARGS];
 	struct msgs *mp;
 	struct stat st;
-	char *attach = (char *)0;  /* header field name for attachments */
-	int attachformat = 0; /* mhbuild format specifier for attachments */
-#ifdef UCI
-	FILE *fp;
-#endif /* UCI */
+	struct stat st2;
 
-#ifdef LOCALE
 	setlocale(LC_ALL, "");
-#endif
-	invo_name = r1bindex(argv[0], '/');
+	invo_name = mhbasename(argv[0]);
 
 	/* read user profile/context */
 	context_read();
@@ -126,257 +99,628 @@ main(int argc, char **argv)
 	arguments = getarguments(invo_name, argc, argv, 1);
 	argp = arguments;
 
-	vec[vecp++] = "-library";
-	vec[vecp++] = getcpy(m_maildir(""));
-
 	while ((cp = *argp++)) {
 		if (*cp == '-') {
 			switch (smatch(++cp, switches)) {
-				case AMBIGSW:
-					ambigsw(cp, switches);
-					done(1);
-				case UNKWNSW:
-					adios(NULL, "-%s unknown\n", cp);
-
-				case HELPSW:
-					snprintf(buf, sizeof(buf),
-							"%s [file] [switches]",
-							invo_name);
-					print_help(buf, switches, 1);
-					done(1);
-				case VERSIONSW:
-					print_version(invo_name);
-					done(1);
-
-				case PUSHSW:
-					pushsw++;
-					continue;
-				case NPUSHSW:
-					pushsw = 0;
-					continue;
-
-				case UNIQSW:
-					unique++;
-					continue;
-				case NUNIQSW:
-					unique = 0;
-					continue;
-
-				case FORWSW:
-					forwsw++;
-					continue;
-				case NFORWSW:
-					forwsw = 0;
-					continue;
-
-				case VERBSW:
-					verbsw++;
-					vec[vecp++] = --cp;
-					continue;
-				case NVERBSW:
-					verbsw = 0;
-					vec[vecp++] = --cp;
-					continue;
-
-				case MIMESW:
-					mime++;
-					vec[vecp++] = --cp;
-					continue;
-				case NMIMESW:
-					mime = 0;
-					vec[vecp++] = --cp;
-					continue;
-
-				case DEBUGSW:
-					debugsw++;  /* fall */
-				case NFILTSW:
-				case FRMTSW:
-				case NFRMTSW:
-				case BITSTUFFSW:
-				case NBITSTUFFSW:
-				case MSGDSW:
-				case NMSGDSW:
-				case WATCSW:
-				case NWATCSW:
-				case MAILSW:
-				case SAMLSW:
-				case SENDSW:
-				case SOMLSW:
-				case SNOOPSW:
-					vec[vecp++] = --cp;
-					continue;
-
-				case ALIASW:
-				case FILTSW:
-				case WIDTHSW:
-				case CLIESW:
-				case SERVSW:
-				case PORTSW:
-					vec[vecp++] = --cp;
-					if (!(cp = *argp++) || *cp == '-')
-						adios(NULL, "missing argument to %s", argp[-2]);
-					vec[vecp++] = cp;
-					continue;
-
-				case ATTACHSW:
-					if (!(attach = *argp++) ||
-							*attach == '-')
-						adios(NULL, "missing argument to %s", argp[-2]);
-					continue;
-
-				case ATTACHFORMATSW:
-					if (! *argp || **argp == '-')
-						adios(NULL, "missing argument to %s", argp[-1]);
-					else {
-						attachformat = atoi(*argp);
-						if (attachformat < 0 ||
-							attachformat > ATTACHFORMATS - 1) {
-							advise(NULL, "unsupported attachformat %d",
-									attachformat);
-							continue;
-						}
-					}
-					++argp;
-					continue;
+			case AMBIGSW:
+				ambigsw(cp, switches);
+				exit(EX_USAGE);
+			case UNKWNSW:
+				adios(EX_USAGE, NULL, "-%s unknown\n", cp);
+
+			case HELPSW:
+				snprintf(buf, sizeof(buf),
+						"%s [file] [switches]",
+						invo_name);
+				print_help(buf, switches, 1);
+				exit(argc == 2 ? EX_OK : EX_USAGE);
+			case VERSIONSW:
+				print_version(invo_name);
+				exit(argc == 2 ? EX_OK : EX_USAGE);
+
+			case DEBUGSW:
+				debugsw++;
+				/* fall */
+			case VERBSW:
+			case NVERBSW:
+				vec[vecp++] = --cp;
+				continue;
+			}
+		} else if (*cp == '+' || *cp == '@') {
+			if (folder) {
+				adios(EX_USAGE, NULL, "only one folder at a time!");
+			} else {
+				folder = mh_xstrdup(expandfol(cp));
 			}
 		} else {
-			msgs[msgp++] = cp;
+			if (*cp == '/') {
+				files[nfiles++] = cp;
+			} else {
+				msgs[nmsgs++] = cp;
+			}
 		}
 	}
 
+	if (!nmsgs && !nfiles) {
+		msgs[nmsgs++] = seq_cur;
+	}
+
+	if (nmsgs) {
+		folder = folder ? folder : draftfolder;
+		maildir = toabsdir(folder);
+		if (chdir(maildir) == NOTOK) {
+			adios(EX_OSERR, maildir, "unable to change directory to");
+		}
+		if (!(mp = folder_read(folder))) {
+			adios(EX_IOERR, NULL, "unable to read folder %s",
+					folder);
+		}
+		if (mp->nummsg == 0) {
+			adios(EX_DATAERR, NULL, "no messages in folder %s",
+					folder);
+		}
+		/* parse all the msgranges/sequences and set SELECTED */
+		for (msgnum = 0; msgnum < nmsgs; msgnum++) {
+			if (!m_convert(mp, msgs[msgnum])) {
+				exit(EX_USAGE);
+			}
+		}
+		seq_setprev(mp);
+
+		for (nmsgs = 0, msgnum = mp->lowsel;
+				msgnum <= mp->hghsel; msgnum++) {
+			if (is_selected(mp, msgnum)) {
+				files[nfiles++] = mh_xstrdup(m_name(msgnum));
+				unset_exists(mp, msgnum);
+			}
+		}
+
+		mp->msgflags |= SEQMOD;
+		seq_save(mp);
+	}
+
+	if (!(cp = getenv("SIGNATURE")) || !*cp) {
+		if ((cp = context_find("signature")) && *cp) {
+			m_putenv("SIGNATURE", cp);
+		}
+	}
+
+	for (n = 0; n < nfiles; n++) {
+		if (stat(files[n], &st) == NOTOK) {
+			adios(EX_IOERR, files[n], "unable to stat draft file");
+		}
+	}
+
+	if (!(annotext = getenv("mhannotate")) || !*annotext) {
+		annotext = NULL;
+	}
+	if (!(altmsg = getenv("mhaltmsg")) || !*altmsg) {
+		altmsg = NULL;  /* used by dist interface - see below */
+	}
+
+	if ((cp = getenv("mhdist")) && *cp && (distsw = atoi(cp)) && altmsg) {
+		vec[vecp++] = "-dist";
+		if ((in = open(altmsg, O_RDONLY)) == NOTOK) {
+			adios(EX_IOERR, altmsg, "unable to open for reading");
+		}
+		fstat(in, &st2);
+		distfile = mh_xstrdup(m_mktemp2(NULL, invo_name, NULL, NULL));
+		if ((out = creat(distfile, (int)st2.st_mode & 0777))==NOTOK) {
+			adios(EX_IOERR, distfile, "unable to open for writing");
+		}
+		cpydata(in, out, altmsg, distfile);
+		close(in);
+		close(out);
+	} else {
+		distfile = NULL;
+	}
+
+	if (!altmsg || stat(altmsg, &st) == NOTOK) {
+		st.st_mtime = 0;
+		st.st_dev = 0;
+		st.st_ino = 0;
+	}
+	status = 0;
+	vec[0] = "spost";
+	for (n=3; n<OPEN_MAX; n++) {
+		close(n);
+	}
+
+	for (n = 0; n < nfiles; n++) {
+		switch (sendsbr(vec, vecp, files[n], &st)) {
+		case DONE:
+			exit(++status);
+		case NOTOK:
+			status++;  /* fall */
+		case OK:
+			break;
+		}
+	}
+
+	context_save();
+	return status;
+}
+
+
+/*
+** message sending back-end
+*/
+static int
+sendsbr(char **vec, int vecp, char *drft, struct stat *st)
+{
+	int status, dupfd;
+	char *original_draft;
+
+	/*
+	** Save the original name of the draft file.  The name of the
+	** draft file is changed to a temporary file containing the built
+	** MIME message if there are attachments.  We need the original
+	** name so that it can be renamed after the message is sent.
+	*/
+	original_draft = drft;
+
+	/*
+	** Convert the draft to a MIME message.
+	** Use the mhbuild composition file for the draft if there was
+	** a successful conversion because that now contains the MIME
+	** message.  A nice side effect of this is that it leaves the
+	** original draft file untouched so that it can be retrieved
+	** and modified if desired.
+	*/
+	switch (attach(drft)) {
+	case OK:
+		/* successfully MIMEified: use generate draft */
+		drft = composition_file_name;
+		break;
+
+	case NOTOK:
+		return (NOTOK);
+
+	case DONE:
+		/* already in MIME format: keep original draft */
+		break;
+	}
+
 	/*
-	** check for "Aliasfile:" profile entry
+	** Sign and encrypt the message as needed.
+	** Use the mhbuild composition file for the draft if there was
+	** a successful conversion because that now contains the MIME
+	** message.  A nice side effect of this is that it leaves the
+	** original draft file untouched so that it can be retrieved
+	** and modified if desired.
 	*/
-	if ((cp = context_find("Aliasfile"))) {
-		char *dp = NULL;
+	switch (signandenc(drft)) {
+	case OK:
+		drft = composition_file_name;
+		break;
 
-		for (ap = brkstring(dp = getcpy(cp), " ", "\n"); ap && *ap;
-				ap++) {
-			vec[vecp++] = "-alias";
-			vec[vecp++] = *ap;
+	case NOTOK:
+		return (NOTOK);
+
+	case DONE:
+		break;
+	}
+
+	if ((status = sendaux(vec, vecp, drft, st)) == OK) {
+		/* move original draft to +trash folder */
+		/* temporary close stdin, for refile not to ask */
+		dupfd = dup(0);
+		close(0);
+		if (execprogl("refile", "refile", "-file",
+				original_draft, "+trash",
+				(char *)NULL) != 0) {
+			advise(NULL, "unable to trash the draft");
 		}
+		dup2(dupfd, 0);
+		close(dupfd);
+	} else {
+		status = DONE;
+	}
+
+	if (distfile) {
+		unlink(distfile);
 	}
 
-	if (!context_find("path"))
-		free(path("./", TFOLDER));
+	/* Get rid of temporary files that we created for attachments. */
+	if (drft == composition_file_name) {
+		clean_up_temporary_files();
+	}
 
-	if (!msgp)
-		msgs[msgp++] = "cur";
-	maildir = m_maildir(draftfolder);
+	return status;
+}
 
-	if (chdir(maildir) == NOTOK)
-		adios(maildir, "unable to change directory to");
+static int
+attach(char *draft_file_name)
+{
+	char buf[MAXPATHLEN + 6];
+	int c;
+	int length = strlen(attach_hdr);
+	char *p;
 
-	/* read folder and create message structure */
-	if (!(mp = folder_read(draftfolder)))
-		adios(NULL, "unable to read draft folder %s", draftfolder);
+	if(distfile) {
+		return DONE;
+	}
 
-	/* check for empty folder */
-	if (mp->nummsg == 0)
-		adios(NULL, "no messages in draft folder %s", draftfolder);
+	if (!(draft_file = fopen(draft_file_name, "r"))) {
+		adios(EX_IOERR, NULL, "can't open draft file `%s'.", draft_file_name);
+	}
 
-	/* parse all the message ranges/sequences and set SELECTED */
-	for (msgnum = 0; msgnum < msgp; msgnum++)
-		if (!m_convert(mp, msgs[msgnum]))
-			done(1);
-	seq_setprev(mp);  /* set the previous-sequence */
+	/* We'll grow the buffer as needed. */
+	field = mh_xcalloc(field_size = 256, sizeof(char));
 
-	for (msgp = 0, msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) {
-		if (is_selected(mp, msgnum)) {
-			msgs[msgp++] = getcpy(m_name(msgnum));
-			unset_exists(mp, msgnum);
+	/*
+	** MIMEify
+	*/
+
+	/* Make names for the temporary files.  */
+	strncpy(body_file_name,
+			m_mktemp(toabsdir(invo_name), NULL, NULL),
+			sizeof (body_file_name));
+	strncpy(composition_file_name,
+			m_mktemp(toabsdir(invo_name), NULL, NULL),
+			sizeof (composition_file_name));
+
+	body_file = fopen(body_file_name, "w");
+	composition_file = fopen(composition_file_name, "w");
+
+	if (!body_file || !composition_file) {
+		clean_up_temporary_files();
+		adios(EX_IOERR, NULL, "unable to open all of the temporary files.");
+	}
+
+	/* Copy non-attachment header fields to the temp composition file. */
+	rewind(draft_file);
+	while (get_line() != EOF && *field && *field != '-') {
+		if (strncasecmp(field, VRSN_FIELD, strlen(VRSN_FIELD))==0 &&
+				field[strlen(VRSN_FIELD)] == ':') {
+			/*
+			** The draft is already in MIME format, thus
+			** back out and use the original draft file.
+			*/
+			clean_up_temporary_files();
+			return DONE;
+		}
+
+		if (strncasecmp(field, attach_hdr, length) != 0 ||
+				field[length] != ':') {
+			fprintf(composition_file, "%s\n", field);
 		}
 	}
+	fputs("--------\n", composition_file);
 
-	mp->msgflags |= SEQMOD;
-	seq_save(mp);
+	/* Copy the message body to the temporary file. */
+	while ((c = getc(draft_file)) != EOF) {
+		putc(c, body_file);
+	}
+	fclose(body_file);
 
-	if ((cp = getenv("SIGNATURE")) == NULL || *cp == 0)
-		if ((cp = context_find("signature")) && *cp)
-			m_putenv("SIGNATURE", cp);
-#ifdef UCI
-		else {
-			snprintf(buf, sizeof(buf), "%s/.signature", mypath);
-			if ((fp = fopen(buf, "r")) != NULL &&
-					fgets(buf, sizeof buf, fp) != NULL) {
-					fclose(fp);
-					if (cp = strchr(buf, '\n'))
-						*cp = 0;
-					m_putenv("SIGNATURE", buf);
+	/* Add a mhbuild MIME composition file line for the body */
+	/* charset will be discovered/guessed by mhbuild */
+	fprintf(composition_file, "#text/plain %s\n", body_file_name);
+
+	/*
+	** Now, go back to the beginning of the draft file and look for
+	** header fields that specify attachments.  Add a mhbuild MIME
+	** composition file for each.
+	*/
+	rewind(draft_file);
+	while (get_line() != EOF && *field && *field != '-') {
+		if (strncasecmp(field, attach_hdr, length) == 0 &&
+				field[length] == ':') {
+			p = trim(field+length+1);
+			if (*p == '+') {
+				/* forwarded message */
+				fprintf(composition_file, "#forw [forwarded message(s)] %s\n", p);
+			} else {
+				/* regular attachment */
+				make_mime_composition_file_entry(p);
 			}
 		}
-#endif /* UCI */
+	}
+	fclose(composition_file);
+
+	/* We're ready to roll! */
+	if (execprogl("mhbuild", "mhbuild", composition_file_name,
+			(char *)NULL) != 0) {
+		/* some problem */
+		clean_up_temporary_files();
+		return (NOTOK);
+	}
+	/* Remove the automatically created backup of mhbuild. */
+	snprintf(buf, sizeof buf, "%s.orig", composition_file_name);
+	if (unlink(buf) == -1) {
+		advise(NULL, "unable to remove original composition file.");
+	}
 
-	for (msgnum = 0; msgnum < msgp; msgnum++)
-		if (stat(msgs[msgnum], &st) == NOTOK)
-			adios(msgs[msgnum], "unable to stat draft file");
+	return (OK);
+}
 
-	if ((annotext = getenv("mhannotate")) == NULL || *annotext == 0)
-		annotext = NULL;
-	if (annotext && ((cp = getenv("mhinplace")) != NULL && *cp != 0))
-		inplace = atoi(cp);
-	if ((altmsg = getenv("mhaltmsg")) == NULL || *altmsg == 0)
-		altmsg = NULL;  /* used by dist interface - see below */
+static int
+signandenc(char *draft_file_name)
+{
+	char buf[BUFSIZ];
+	int dosign = 0;
+	int doenc = 0;
+	int ret;
 
-	if ((cp = getenv("mhdist")) && *cp && (distsw = atoi (cp)) && altmsg) {
-		vec[vecp++] = "-dist";
-		distfile = getcpy(m_mktemp2(altmsg, invo_name, NULL, NULL));
-		if (link(altmsg, distfile) == NOTOK) {
-			if (errno != EXDEV
-#ifdef EISREMOTE
-					&& errno != EISREMOTE
-#endif /* EISREMOTE */
-				)
-				adios(distfile, "unable to link %s to",
-						altmsg);
-			free(distfile);
-			distfile = getcpy(m_mktemp2(NULL, invo_name,
-					NULL, NULL));
-			{
-				int in, out;
-				struct stat st;
-
-				if ((in = open(altmsg, O_RDONLY)) == NOTOK)
-					adios(altmsg, "unable to open");
-				fstat(in, &st);
-				if ((out = creat(distfile,
-						(int) st.st_mode & 0777))
-						== NOTOK)
-					adios(distfile, "unable to write");
-				cpydata(in, out, altmsg, distfile);
-				close(in);
-				close(out);
-			}
+	if(distfile) {
+		return DONE;
+	}
+
+	if (!(draft_file = fopen(draft_file_name, "r"))) {
+		adios(EX_IOERR, NULL, "can't open draft file `%s'.", draft_file_name);
+	}
+
+	/* We'll grow the buffer as needed. */
+	field = mh_xcalloc(field_size = 256, sizeof(char));
+
+	/* Scan the draft file for an attachment header field name. */
+	while (get_line() != EOF && *field != '\0' && *field != '-') {
+		if (strncasecmp(field, sign_hdr, strlen(sign_hdr))==0 &&
+				field[strlen(sign_hdr)] == ':') {
+			dosign = 1;
+		}
+		if (strncasecmp(field, enc_hdr, strlen(enc_hdr))==0 &&
+				field[strlen(enc_hdr)] == ':') {
+			doenc = 1;
 		}
+	}
+	if (!dosign && !doenc) {
+		return DONE;
+	}
+
+	strcpy(composition_file_name, draft_file_name);
+
+	/* We're ready to roll! */
+	if (doenc) {
+		ret = execprogl("mhsign", "mhsign", "-m", "-e",
+				draft_file_name, (char *)NULL);
 	} else {
-		distfile = NULL;
+		ret = execprogl("mhsign", "mhsign", "-m",
+				draft_file_name, (char *)NULL);
+	}
+	if (ret != 0) {
+		/* some problem */
+		return (NOTOK);
+	}
+	/* Remove the automatically created backup of mhsign. */
+	snprintf(buf, sizeof buf, "%s.orig", draft_file_name);
+	if (unlink(buf) == -1) {
+		advise(NULL, "unable to remove original draft file.");
 	}
 
-	if (altmsg == NULL || stat(altmsg, &st) == NOTOK) {
-		st.st_mtime = 0;
-		st.st_dev = 0;
-		st.st_ino = 0;
+	return (OK);
+}
+
+static void
+clean_up_temporary_files(void)
+{
+	unlink(body_file_name);
+	unlink(composition_file_name);
+
+	return;
+}
+
+static int
+get_line(void)
+{
+	int c;  /* current character */
+	int n;  /* number of bytes in buffer */
+	char *p;
+
+	/*
+	** Get a line from the input file, growing the field buffer as
+	** needed.  We do this so that we can fit an entire line in the
+	** buffer making it easy to do a string comparison on both the
+	** field name and the field body which might be a long path name.
+	*/
+	for (n = 0, p = field; (c = getc(draft_file)) != EOF; *p++ = c) {
+		if (c == '\n' && (c = getc(draft_file)) != ' ' && c != '\t') {
+			ungetc(c, draft_file);
+			c = '\n';
+			break;
+		}
+		if (++n >= field_size - 1) {
+			field = mh_xrealloc(field, field_size += 256);
+			p = field + n - 1;
+		}
 	}
-	if (pushsw)
-		push();
+	*p = '\0';
 
-	status = 0;
-	vec[0] = r1bindex(postproc, '/');
-	closefds(3);
-
-	for (msgnum = 0; msgnum < msgp; msgnum++) {
-		switch (sendsbr(vec, vecp, msgs[msgnum], &st, 1, attach,
-				attachformat)) {
-			case DONE:
-				done(++status);
-			case NOTOK:
-				status++;  /* fall */
-			case OK:
-				break;
+	return (c);
+}
+
+static void
+make_mime_composition_file_entry(char *file_name)
+{
+	FILE *fp;
+	struct node *np;
+	char *cp;
+	char content_type[BUFSIZ];
+	char cmdbuf[BUFSIZ];
+	char *cmd = mimetypequeryproc;
+	int semicolon = 0;
+
+	for (np = m_defs; np; np = np->n_next) {
+		if (strcasecmp(np->n_name, mimetypequery)==0) {
+			cmd = np->n_field;
+			break;
 		}
 	}
+	snprintf(cmdbuf, sizeof cmdbuf, "%s %s", cmd, file_name);
 
-	context_save();  /* save the context file */
-	done(status);
-	return 1;
+	if (!(fp = popen(cmdbuf, "r"))) {
+		clean_up_temporary_files();
+		adios(EX_IOERR, NULL, "unable to determine content type with `%s'",
+				cmdbuf);
+	}
+	if (fgets(content_type, sizeof content_type, fp) &&
+			(cp = strrchr(content_type, '\n'))) {
+		*cp = '\0';
+	} else {
+		strcpy(content_type, "application/octet-stream");
+		admonish(NULL, "problems with `%s', using fall back type `%s'",
+				cmdbuf, content_type);
+	}
+	pclose(fp);
+
+	/* TODO: don't use access(2) because it checks for ruid, not euid */
+	if (access(file_name, R_OK) != 0) {
+		clean_up_temporary_files();
+		adios(EX_IOERR, NULL, "unable to access file `%s'", file_name);
+	}
+
+	/* Check for broken file(1). See man page mh-profile(5). */
+	for (cp=content_type; *cp; cp++) {
+		if (isspace(*cp)) {
+			if (!semicolon) {
+				adios(EX_SOFTWARE, NULL, "Sorry, your Mime-Type-Query command (%s) is broken.\n\tThe output misses a semicolon before the whitespace.\n\tOutput was: %s", cmd, content_type);
+			}
+		} else if (*cp == ';') {
+			semicolon = 1;
+		} else {
+			semicolon = 0;
+		}
+	}
+
+	cp = (!(cp = strrchr(file_name, '/'))) ? file_name : cp + 1;
+	fprintf(composition_file,
+			"#%s; name=\"%s\" <> [%s] {attachment} %s\n",
+			content_type, cp, cp, file_name);
+
+	return;
+}
+
+/*
+** The back-end of the message sending back-end.
+** Annotate original message, and call `spost' to send message.
+*/
+static int
+sendaux(char **vec, int vecp, char *drft, struct stat *st)
+{
+	pid_t child_id;
+	int status;
+	char backup[BUFSIZ];
+
+	vec[vecp++] = drft;
+	if (distfile && distout(drft, distfile, backup) == NOTOK) {
+		return DONE;
+	}
+	vec[vecp] = NULL;
+
+	switch (child_id = fork()) {
+	case -1:
+		/* oops -- fork error */
+		advise("fork", "unable to");
+		return DONE;
+
+	case 0:
+		/* child process -- send it */
+		execvp(*vec, vec);
+		fprintf(stderr, "unable to exec ");
+		perror(*vec);
+		_exit(EX_OSERR);
+		break;  /* NOT REACHED */
+
+	default:
+		/* parent process -- wait for it */
+		status = pidwait(child_id, NOTOK);
+		if (WIFEXITED(status) && WEXITSTATUS(status) == EX_OK) {
+			if (annotext) {
+				anno(st);
+			}
+		} else {
+			/* spost failed */
+			advise(NULL, "%s", strexit(status));
+			if (distfile) {
+				unlink(drft);
+				if (rename(backup, drft) == NOTOK) {
+					advise(drft, "unable to rename %s to",
+							backup);
+				}
+			}
+		}
+	}
+
+	return status ? NOTOK : status;
+}
+
+
+static void
+anno(struct stat *st)
+{
+	struct stat st2;
+	char *msgs, *folder;
+	char buf[BUFSIZ];
+	char *vec[MAXARGS];
+	int vecp = 0;
+	char *cp, *dp;
+
+	if (altmsg && (stat(altmsg, &st2) == NOTOK ||
+			st->st_mtime != st2.st_mtime ||
+			st->st_dev != st2.st_dev ||
+			st->st_ino != st2.st_ino)) {
+		if (debugsw) {
+			admonish(NULL, "$mhaltmsg mismatch");
+		}
+		return;
+	}
+
+	if (!(folder = getenv("mhfolder")) || !*folder) {
+		if (debugsw) {
+			admonish(NULL, "$mhfolder not set");
+		}
+		return;
+	}
+	if (!(msgs = getenv("mhmessages")) || !*msgs) {
+		if (debugsw) {
+			admonish(NULL, "$mhmessages not set");
+		}
+		return;
+	}
+	if (debugsw) {
+		advise(NULL, "annotate as `%s': %s %s", annotext,
+				folder, msgs);
+	}
+	vec[vecp++] = "anno";
+	vec[vecp++] = "-comp";
+	vec[vecp++] = annotext;
+	snprintf(buf, sizeof buf, "+%s", folder);
+	vec[vecp++] = buf;
+
+	while (isspace(*msgs)) {
+		msgs++;
+	}
+	for (cp=dp=msgs; *cp; cp++) {
+		if (isspace(*cp)) {
+			while (isspace(*cp)) {
+				*cp++ = '\0';
+			}
+			vec[vecp++] = dp;
+			dp = cp;
+		}
+	}
+	vec[vecp++] = dp;
+	vec[vecp] = NULL;
+	if (execprog(*vec, vec) != 0) {
+		advise(NULL, "unable to annotate");
+	}
+}
+
+
+char*
+strexit(int status)
+{
+	if (WIFSIGNALED(status)) {
+		return "spost or sendmail killed by signal";
+	}
+	if (!WIFEXITED(status)) {
+		return "message not delivered to anyone";
+	}
+	switch (WEXITSTATUS(status)) {
+	case EX_TEMPFAIL:
+		return "Temporary error, maybe the MTA has queued the message";
+	default:
+		return "message not delivered to anyone";
+	}
 }