X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fsend.c;h=3ca6772190d9aba80ce5e58081dd6ce0de220acd;hp=a2e9932956805c47f65574703617c50f037c1d60;hb=8bf8e1e29df17658c3d77629e17f88bf9159e21b;hpb=b3628819b4ab903269cd83cc68e453b13534346c

diff --git a/uip/send.c b/uip/send.c
index a2e9932..3ca6772 100644
--- a/uip/send.c
+++ b/uip/send.c
@@ -15,6 +15,8 @@
 #include <h/mime.h>
 #include <h/tws.h>
 #include <h/utils.h>
+#include <sysexits.h>
+#include <sys/wait.h>
 
 #ifdef HAVE_SYS_TIME_H
 # include <sys/time.h>
@@ -22,9 +24,7 @@
 #include <time.h>
 
 int debugsw = 0;  /* global */
-int forwsw  = 1;
-int pushsw  = 0;
-int verbsw  = 0;
+int verbosesw = 0;
 char *altmsg   = NULL;
 char *annotext = NULL;
 char *distfile = NULL;
@@ -44,42 +44,28 @@ static FILE *composition_file;  /* composition file pointer */
 /*
 ** static prototypes
 */
-static int sendsbr(char **, int, char *, struct stat *, int);
+static int sendsbr(char **, int, char *, struct stat *);
 static void armed_done(int) NORETURN;
-static void alert(char *, int);
-static int tmp_fd(void);
 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 FORWSW  2
-	{ "forward", 0 },
-#define NFORWSW  3
-	{ "noforward", 0 },
-#define PUSHSW  4
-	{ "push", 0 },
-#define NPUSHSW  5
-	{ "nopush", 0 },
-#define VERBSW  6
+#define VERBSW  1
 	{ "verbose", 0 },
-#define NVERBSW  7
-	{ "noverbose", 0 },
-#define WATCSW  8
-	{ "watch", 0 },
-#define NWATCSW  9
-	{ "nowatch", 0 },
-#define VERSIONSW  10
-	{ "version", 0 },
-#define HELPSW  11
+#define NVERBSW  2
+	{ "noverbose", 2 },
+#define VERSIONSW  3
+	{ "Version", 0 },
+#define HELPSW  4
 	{ "help", 0 },
 	{ NULL, 0 }
 };
@@ -88,22 +74,19 @@ static struct swit switches[] = {
 int
 main(int argc, char **argv)
 {
-	int msgp = 0, nfiles = 0, distsw = 0, vecp = 1;
+	int nmsgs = 0, nfiles = 0, distsw = 0, vecp = 1;
 	int msgnum, status;
 	int in, out;
 	int n;
 	char *cp, *maildir = NULL;
-	char buf[BUFSIZ], **ap, **argp, **arguments;
+	char buf[BUFSIZ], **argp, **arguments;
 	char *msgs[MAXARGS], *vec[MAXARGS];
 	char *files[MAXARGS];
 	struct msgs *mp;
 	struct stat st;
 	struct stat st2;
 
-
-#ifdef LOCALE
 	setlocale(LC_ALL, "");
-#endif
 	invo_name = mhbasename(argv[0]);
 
 	/* read user profile/context */
@@ -112,9 +95,6 @@ main(int argc, char **argv)
 	arguments = getarguments(invo_name, argc, argv, 1);
 	argp = arguments;
 
-	vec[vecp++] = "-library";
-	vec[vecp++] = getcpy(toabsdir("+"));
-
 	while ((cp = *argp++)) {
 		if (*cp == '-') {
 			switch (smatch(++cp, switches)) {
@@ -134,97 +114,61 @@ main(int argc, char **argv)
 				print_version(invo_name);
 				done(1);
 
-			case PUSHSW:
-				pushsw++;
-				continue;
-			case NPUSHSW:
-				pushsw = 0;
-				continue;
-
-			case FORWSW:
-				forwsw++;
-				continue;
-			case NFORWSW:
-				forwsw = 0;
-				continue;
-
+			case DEBUGSW:
+				debugsw++;
+				/* fall */
 			case VERBSW:
-				verbsw++;
-				vec[vecp++] = --cp;
-				continue;
+				verbosesw += 2;
 			case NVERBSW:
-				verbsw = 0;
-				vec[vecp++] = --cp;
-				continue;
-
-			case DEBUGSW:
-				debugsw++;  /* fall */
-			case WATCSW:
-			case NWATCSW:
+				verbosesw--;
 				vec[vecp++] = --cp;
 				continue;
-
-			case ALIASW:
-				vec[vecp++] = --cp;
-				if (!(cp = *argp++) || *cp == '-') {
-					adios(NULL, "missing argument to %s",
-							argp[-2]);
-				}
-				vec[vecp++] = cp;
-				continue;
-
 			}
 		} else {
 			if (*cp == '/') {
 				files[nfiles++] = cp;
 			} else {
-				msgs[msgp++] = cp;
+				msgs[nmsgs++] = cp;
 			}
 		}
 	}
 
-	/* check for "Aliasfile:" profile entry */
-	if ((cp = context_find("Aliasfile"))) {
-		char *dp = NULL;
-
-		for (ap=brkstring(dp=getcpy(cp), " ", "\n"); ap && *ap; ap++) {
-			vec[vecp++] = "-alias";
-			vec[vecp++] = getcpy(etcpath(*ap));
-		}
-	}
-
-	if (!msgp && !nfiles) {
-		msgs[msgp++] = seq_cur;
+	if (!nmsgs && !nfiles) {
+		msgs[nmsgs++] = seq_cur;
 	}
-	maildir = toabsdir(draftfolder);
 
-	if (chdir(maildir) == NOTOK) {
-		adios(maildir, "unable to change directory to");
-	}
-
-	if (!(mp = folder_read(draftfolder))) {
-		adios(NULL, "unable to read draft folder %s", draftfolder);
-	}
-	if (mp->nummsg == 0) {
-		adios(NULL, "no messages in draft folder %s", draftfolder);
-	}
-	/* parse all the message ranges/sequences and set SELECTED */
-	for (msgnum = 0; msgnum < msgp; msgnum++) {
-		if (!m_convert(mp, msgs[msgnum])) {
-			done(1);
+	if (nmsgs) {
+		maildir = toabsdir(draftfolder);
+		if (chdir(maildir) == NOTOK) {
+			adios(maildir, "unable to change directory to");
 		}
-	}
-	seq_setprev(mp);
+		if (!(mp = folder_read(draftfolder))) {
+			adios(NULL, "unable to read draft folder %s",
+					draftfolder);
+		}
+		if (mp->nummsg == 0) {
+			adios(NULL, "no messages in draft folder %s",
+					draftfolder);
+		}
+		/* parse all the msgranges/sequences and set SELECTED */
+		for (msgnum = 0; msgnum < nmsgs; msgnum++) {
+			if (!m_convert(mp, msgs[msgnum])) {
+				done(1);
+			}
+		}
+		seq_setprev(mp);
 
-	for (msgp = 0, msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) {
-		if (is_selected(mp, msgnum)) {
-			files[nfiles++] = getcpy(m_name(msgnum));
-			unset_exists(mp, msgnum);
+		for (nmsgs = 0, msgnum = mp->lowsel;
+				msgnum <= mp->hghsel; msgnum++) {
+			if (is_selected(mp, msgnum)) {
+				files[nfiles++] = getcpy(m_name(msgnum));
+				unset_exists(mp, msgnum);
+			}
 		}
-	}
 
-	mp->msgflags |= SEQMOD;
-	seq_save(mp);
+		mp->msgflags |= SEQMOD;
+		seq_save(mp);
+	}
 
 	if (!(cp = getenv("SIGNATURE")) || !*cp) {
 		if ((cp = context_find("signature")) && *cp) {
@@ -232,9 +176,9 @@ main(int argc, char **argv)
 		}
 	}
 
-	for (msgnum = 0; msgnum < nfiles; msgnum++) {
-		if (stat(files[msgnum], &st) == NOTOK) {
-			adios(files[msgnum], "unable to stat draft file");
+	for (n = 0; n < nfiles; n++) {
+		if (stat(files[n], &st) == NOTOK) {
+			adios(files[n], "unable to stat draft file");
 		}
 	}
 
@@ -267,44 +211,14 @@ main(int argc, char **argv)
 		st.st_dev = 0;
 		st.st_ino = 0;
 	}
-	if (pushsw) {
-		/* push a fork into the background */
-		pid_t pid;
-
-		switch (pid = fork()) {
-		case -1:
-			/* fork error */
-			advise(NULL, "unable to fork, so can't push...");
-			break;
-
-		default:
-			/* parent, just exit */
-			done(0);
-
-		case 0:
-			/* child, block a few signals and continue */
-			SIGNAL(SIGHUP, SIG_IGN);
-			SIGNAL(SIGINT, SIG_IGN);
-			SIGNAL(SIGQUIT, SIG_IGN);
-			SIGNAL(SIGTERM, SIG_IGN);
-#ifdef SIGTSTP
-			SIGNAL(SIGTSTP, SIG_IGN);
-			SIGNAL(SIGTTIN, SIG_IGN);
-			SIGNAL(SIGTTOU, SIG_IGN);
-#endif
-			freopen("/dev/null", "r", stdin);
-			freopen("/dev/null", "w", stdout);
-			break;
-		}
-	}
 	status = 0;
 	vec[0] = "spost";
 	for (n=3; n<OPEN_MAX; n++) {
 		close(n);
 	}
 
-	for (msgnum = 0; msgnum < nfiles; msgnum++) {
-		switch (sendsbr(vec, vecp, files[msgnum], &st, 1)) {
+	for (n = 0; n < nfiles; n++) {
+		switch (sendsbr(vec, vecp, files[n], &st)) {
 		case DONE:
 			done(++status);
 		case NOTOK:
@@ -324,12 +238,11 @@ main(int argc, char **argv)
 ** message sending back-end
 */
 static int
-sendsbr(char **vec, int vecp, char *drft, struct stat *st, int rename_drft)
+sendsbr(char **vec, int vecp, char *drft, struct stat *st)
 {
 	int status;
 	char buffer[BUFSIZ];
 	char *original_draft;
-	char *p;  /* string pointer for building file name */
 
 	/*
 	** Save the original name of the draft file.  The name of the
@@ -359,16 +272,38 @@ sendsbr(char **vec, int vecp, char *drft, struct stat *st, int rename_drft)
 		break;
 	}
 
+	/*
+	** 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.
+	*/
+	switch (signandenc(drft)) {
+	case OK:
+		drft = composition_file_name;
+		break;
+
+	case NOTOK:
+		return (NOTOK);
+
+	case DONE:
+		break;
+	}
+
 	done=armed_done;
 	switch (setjmp(env)) {
 	case OK:
 		status = sendaux(vec, vecp, drft, st) ? NOTOK : OK;
-		/* rename the original draft */
-		if (rename_drft && status == OK &&
-				rename(original_draft, strncpy(buffer,
-				m_backup(original_draft), sizeof(buffer)))
-				== NOTOK) {
-			advise(buffer, "unable to rename %s to", drft);
+		if (status == OK) {
+			/* move original draft to +trash folder */
+			snprintf(buffer, sizeof buffer,
+					"</dev/null refile -file %s +trash",
+					original_draft);
+			if (system(buffer) != 0) {
+				advise(NULL, "unable to trash the draft");
+			}
 		}
 		break;
 
@@ -382,31 +317,9 @@ sendsbr(char **vec, int vecp, char *drft, struct stat *st, int rename_drft)
 		unlink(distfile);
 	}
 
-	/*
-	** Get rid of any temporary files that we created for attachments.
-	** Also get rid of the renamed composition file that mhbuild
-	** leaves as a turd.  It looks confusing, but we use the body
-	** file name to help build the renamed composition file name.
-	*/
+	/* Get rid of temporary files that we created for attachments. */
 	if (drft == composition_file_name) {
 		clean_up_temporary_files();
-
-		if (strlen(composition_file_name) >=
-				sizeof (composition_file_name) - 6) {
-			advise(NULL, "unable to remove original composition file.");
-		} else {
-			if (!(p = strrchr(composition_file_name, '/'))) {
-				p = composition_file_name;
-			} else {
-				p++;
-			}
-			strcpy(body_file_name, p);
-			*p++ = ',';
-			strcpy(p, body_file_name);
-			strcat(p, ".orig");
-
-			unlink(composition_file_name);
-		}
 	}
 
 	return status;
@@ -522,9 +435,7 @@ attach(char *draft_file_name)
 	while (get_line() != EOF && *field && *field != '-') {
 		if (strncasecmp(field, attach_hdr, length) == 0 &&
 				field[length] == ':') {
-			for (p = field+length+1; *p==' ' || *p=='\t'; p++) {
-				continue;
-			}
+			p = trim(field+length+1);
 			if (*p == '+') {
 				/* forwarded message */
 				fprintf(composition_file, "#forw [forwarded message(s)] %s\n", p);
@@ -537,12 +448,70 @@ attach(char *draft_file_name)
 	fclose(composition_file);
 
 	/* We're ready to roll! */
-	sprintf(buf, "mhbuild %s", composition_file_name);
-	if (system(buf) != 0) {
+	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.");
+	}
+
+	return (OK);
+}
+
+static int
+signandenc(char *draft_file_name)
+{
+	char buf[BUFSIZ];
+	int dosign = 0;
+	int doenc = 0;
+	int ret;
+
+	if (!(draft_file = fopen(draft_file_name, "r"))) {
+		adios(NULL, "can't open draft file `%s'.", draft_file_name);
+	}
+
+	/* We'll grow the buffer as needed. */
+	field = (char *)mh_xmalloc(field_size = 256);
+
+	/* 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 {
+		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.");
+	}
 
 	return (OK);
 }
@@ -594,6 +563,7 @@ make_mime_composition_file_entry(char *file_name)
 	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) {
@@ -624,11 +594,23 @@ make_mime_composition_file_entry(char *file_name)
 		adios(NULL, "unable to access file `%s'", file_name);
 	}
 
-	cp = (!(cp = strrchr(file_name, '/'))) ? file_name : cp + 1;
-	fprintf(composition_file, "#%s; name=\"%s\" <> [%s] {attachment}",
-			content_type, cp, cp);
+	/* Check for broken file(1). See man page mh-profile(5). */
+	for (cp=content_type; *cp; cp++) {
+		if (isspace(*cp)) {
+			if (!semicolon) {
+				adios(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;
+		}
+	}
 
-	fprintf(composition_file, " %s\n", file_name);
+	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;
 }
@@ -641,15 +623,9 @@ static int
 sendaux(char **vec, int vecp, char *drft, struct stat *st)
 {
 	pid_t child_id;
-	int status, fd;
+	int status;
 	char backup[BUFSIZ];
 
-	/*
-	** fd collects the output of spost, and is used for the
-	** failure notice if we need to send one in alert().
-	*/
-	fd = pushsw ? tmp_fd() : NOTOK;
-
 	vec[vecp++] = drft;
 	if (distfile && distout(drft, distfile, backup) == NOTOK) {
 		done(1);
@@ -663,17 +639,7 @@ sendaux(char **vec, int vecp, char *drft, struct stat *st)
 		break;  /* NOT REACHED */
 
 	case 0:
-		/*
-		** child process -- send it
-		**
-		** If fd is ok, then we are pushing and fd points to temp
-		** file, so capture anything on stdout and stderr there.
-		*/
-		if (fd != NOTOK) {
-			dup2(fd, fileno(stdout));
-			dup2(fd, fileno(stderr));
-			close(fd);
-		}
+		/* child process -- send it */
 		execvp(*vec, vec);
 		fprintf(stderr, "unable to exec ");
 		perror(*vec);
@@ -682,21 +648,16 @@ sendaux(char **vec, int vecp, char *drft, struct stat *st)
 
 	default:
 		/* parent process -- wait for it */
-		if ((status = pidwait(child_id, NOTOK)) == OK) {
+		status = pidwait(child_id, NOTOK);
+		if (WIFEXITED(status) && WEXITSTATUS(status) == EX_OK) {
 			if (annotext) {
 				anno(st);
 			}
-		} else {
-			/*
-			** If spost failed, and we have good fd (which
-			** means we pushed), then mail error message
-			** (and possibly the draft) back to the user.
-			*/
-			if (fd != NOTOK) {
-				alert(drft, fd);
-				close(fd);
-			} else {
-				advise(NULL, "message not delivered to anyone");
+		}
+		else {
+			advise(NULL, "%s", strexit(status));
+			if (verbosesw <= 0) {
+				advise(NULL, "Try using -v to get better output");
 			}
 			if (distfile) {
 				unlink(drft);
@@ -706,90 +667,10 @@ sendaux(char **vec, int vecp, char *drft, struct stat *st)
 				}
 			}
 		}
-		break;
 	}
 
-	return status;
-}
-
 
-/*
-** Mail error notification (and possibly a copy of the
-** message) back to the user, using mhmail(1).
-*/
-static void
-alert(char *file, int out)
-{
-	pid_t child_id;
-	int in;
-	char buf[BUFSIZ];
-
-	switch (child_id = fork()) {
-	case NOTOK:
-		/* oops -- fork error */
-		advise("fork", "unable to");
-
-	case OK:
-		/* child process -- send it */
-		SIGNAL(SIGHUP, SIG_IGN);
-		SIGNAL(SIGINT, SIG_IGN);
-		SIGNAL(SIGQUIT, SIG_IGN);
-		SIGNAL(SIGTERM, SIG_IGN);
-		if (forwsw) {
-			if ((in = open(file, O_RDONLY)) == NOTOK) {
-				admonish(file, "unable to re-open");
-			} else {
-				lseek(out, (off_t) 0, SEEK_END);
-				strncpy(buf, "\nMessage not delivered to anyone.\n", sizeof(buf));
-				write(out, buf, strlen(buf));
-				strncpy(buf, "\n------- Unsent Draft\n\n", sizeof(buf));
-				write(out, buf, strlen(buf));
-				cpydgst(in, out, file, "temporary file");
-				close(in);
-				strncpy(buf, "\n------- End of Unsent Draft\n", sizeof(buf));
-				write(out, buf, strlen(buf));
-				if (rename(file, strncpy(buf, m_backup(file), sizeof(buf))) == NOTOK) {
-					admonish(buf, "unable to rename %s to", file);
-				}
-			}
-		}
-		lseek(out, (off_t) 0, SEEK_SET);
-		dup2(out, fileno(stdin));
-		close(out);
-		/* create subject for error notification */
-		snprintf(buf, sizeof(buf), "send failed on %s",
-				forwsw ? "enclosed draft" : file);
-		execlp("mhmail", "mhmail", getusername(),
-				"-subject", buf, NULL);
-		fprintf(stderr, "unable to exec ");
-		perror("mhmail");
-		_exit(-1);
-
-	default:  /* no waiting... */
-		break;
-	}
-}
-
-
-static int
-tmp_fd(void)
-{
-	int fd;
-	char *tfile = NULL;
-
-	tfile = m_mktemp2(NULL, invo_name, &fd, NULL);
-	if (tfile == NULL) return NOTOK;
-	fchmod(fd, 0600);
-
-	if (debugsw) {
-		advise(NULL, "temporary file %s selected", tfile);
-	} else {
-		if (unlink(tfile) == NOTOK) {
-			advise(tfile, "unable to remove");
-		}
-	}
-
-	return fd;
+	return status;
 }
 
 
@@ -834,6 +715,24 @@ anno(struct stat *st)
 }
 
 
+char*
+strexit(int status)
+{
+	if (WIFSIGNALED(status)) {
+		return "spost or sendmail killed by signal";
+	}
+	if (!WIFEXITED(status)) {
+		return "sendmail stopt for unknown reasen, message not deliverd to anyone";
+	}
+	switch (WEXITSTATUS(status)) {
+		case EX_TEMPFAIL:
+			return "Temporary error, maby the MTA hase queued the Mail";
+		default:
+			return "sendmail stopt for unknown reasen, message not deliverd to anyone";
+	}
+}
+
+
 static void
 armed_done(int status)
 {