X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fmhmail.c;h=6506b7d2a5c97e1818e622b91b564909dcbc694a;hp=ebe8b7647155de8d584cd277971020dc704458f3;hb=32b2354dbaf4bf934936eb5b102a4a3d2fdd209a;hpb=f12a3e5036a986f579b80861f4421bcb86f84cee

diff --git a/uip/mhmail.c b/uip/mhmail.c
index ebe8b76..6506b7d 100644
--- a/uip/mhmail.c
+++ b/uip/mhmail.c
@@ -10,6 +10,8 @@
 #include <h/signals.h>
 #include <h/utils.h>
 #include <signal.h>
+#include <fcntl.h>
+
 
 static struct swit switches[] = {
 #define BODYSW  0
@@ -21,7 +23,7 @@ static struct swit switches[] = {
 #define SUBJSW  3
 	{ "subject text", 0 },
 #define VERSIONSW  4
-	{ "version", 0 },
+	{ "Version", 0 },
 #define HELPSW  5
 	{ "help", 0 },
 #define RESNDSW  6
@@ -36,14 +38,15 @@ static char tmpfil[BUFSIZ];
 /*
 ** static prototypes
 */
-static RETSIGTYPE intrser(int);
+static void intrser(int);
 
 
 int
 main(int argc, char **argv)
 {
 	pid_t child_id;
-	int status, i, iscc = 0, nvec;
+	int status, iscc = 0, nvec;
+	unsigned int i;
 	int queued = 0, resent = 0, somebody;
 	char *cp, *tolist = NULL, *cclist = NULL, *subject = NULL;
 	char *from = NULL, *body = NULL, **argp, **arguments;
@@ -60,10 +63,9 @@ main(int argc, char **argv)
 	if (context_foil(NULL) == -1)
 		done(1);
 
-	/* If no arguments, just incorporate new mail */
+	/* Without arguments, exit. */
 	if (argc == 1) {
-		execlp(incproc, mhbasename(incproc), NULL);
-		adios(incproc, "unable to exec");
+		adios(NULL, "no interactive mail shell. Use inc/scan/show instead.");
 	}
 
 	arguments = getarguments(invo_name, argc, argv, 0);
@@ -72,46 +74,51 @@ 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 HELPSW:
-					snprintf(buf, sizeof(buf), "%s [addrs ... [switches]]", invo_name);
-					print_help(buf, switches, 0);
-					done(1);
-				case VERSIONSW:
-					print_version(invo_name);
-					done(1);
-
-				case FROMSW:
-					if (!(from = *argp++) || *from == '-')
-						adios(NULL, "missing argument to %s", argp[-2]);
-					continue;
-
-				case BODYSW:
-					if (!(body = *argp++) || *body == '-')
-						adios(NULL, "missing argument to %s", argp[-2]);
-					continue;
-
-				case CCSW:
-					iscc++;
-					continue;
-
-				case SUBJSW:
-					if (!(subject = *argp++) || *subject == '-')
-						adios(NULL, "missing argument to %s", argp[-2]);
-					continue;
-
-				case RESNDSW:
-					resent++;
-					continue;
-
-				case QUEUESW:
-					queued++;
-					continue;
+			case AMBIGSW:
+				ambigsw(cp, switches);
+				done(1);
+			case UNKWNSW:
+				adios(NULL, "-%s unknown", cp);
+
+			case HELPSW:
+				snprintf(buf, sizeof(buf),
+						"%s addrs... [switches]",
+						invo_name);
+				print_help(buf, switches, 0);
+				done(1);
+			case VERSIONSW:
+				print_version(invo_name);
+				done(1);
+
+			case FROMSW:
+				if (!(from = *argp++) || *from == '-')
+					adios(NULL, "missing argument to %s",
+							argp[-2]);
+				continue;
+
+			case BODYSW:
+				if (!(body = *argp++) || *body == '-')
+					adios(NULL, "missing argument to %s",
+							argp[-2]);
+				continue;
+
+			case CCSW:
+				iscc++;
+				continue;
+
+			case SUBJSW:
+				if (!(subject = *argp++) || *subject == '-')
+					adios(NULL, "missing argument to %s",
+							argp[-2]);
+				continue;
+
+			case RESNDSW:
+				resent++;
+				continue;
+
+			case QUEUESW:
+				queued++;
+				continue;
 			}
 		}
 		if (iscc)
@@ -125,7 +132,7 @@ main(int argc, char **argv)
 	if (tolist == NULL)
 		adios(NULL, "usage: %s addrs ... [switches]", invo_name);
 
-	tfile = m_mktemp2(NULL, invo_name, NULL, &out);
+	tfile = m_mktemp2("/tmp/", invo_name, NULL, &out);
 	if (tfile == NULL)
 		adios("mhmail", "unable to create temporary file");
 	chmod(tfile, 0600);
@@ -160,7 +167,7 @@ main(int argc, char **argv)
 	fclose(out);
 
 	nvec = 0;
-	vec[nvec++] = mhbasename(postproc);
+	vec[nvec++] = "spost";
 	vec[nvec++] = tmpfil;
 	if (resent)
 		vec[nvec++] = "-dist";
@@ -168,44 +175,46 @@ main(int argc, char **argv)
 		vec[nvec++] = "-queued";
 	vec[nvec] = NULL;
 
-	for (i = 0; (child_id = fork()) == NOTOK && i < 5; i++)
-		sleep(5);
-
-	if (child_id == NOTOK) {
+	if ((child_id = fork()) == NOTOK) {
 		/* report failure and then send it */
 		adios(NULL, "unable to fork");
-	} else if (child_id) {
+
+	} else if (child_id == 0) {
+		/* child process */
+		execvp(*vec, vec);
+		fprintf(stderr, "unable to exec ");
+		perror(*vec);
+		_exit(-1);
+
+	} else {
 		/* parent process */
-		if ((status = pidXwait(child_id, postproc))) {
+		if ((status = pidXwait(child_id, *vec))) {
+			/* spost failed, save draft as dead.letter */
+			int in, out;
+
+			in = open(tmpfil, O_RDONLY);
+			out = creat("dead.letter", 0600);
+			if (in == -1 || out == -1) {
+				fprintf(stderr, "Letter left at %s.\n",
+						tmpfil);
+				done(status ? 1 : 0);
+			}
+			cpydata(in, out, tmpfil, "dead.letter");
+			close(in);
+			close(out);
 			fprintf(stderr, "Letter saved in dead.letter\n");
-			execl("/bin/mv", "mv", tmpfil, "dead.letter", NULL);
-			execl("/usr/bin/mv", "mv", tmpfil, "dead.letter",
-					NULL);
-			perror("mv");
-			_exit(-1);
 		}
 		unlink(tmpfil);
 		done(status ? 1 : 0);
-	} else {
-		/* child process */
-		execvp(postproc, vec);
-		fprintf(stderr, "unable to exec ");
-		perror(postproc);
-		_exit(-1);
 	}
 
 	return 0;  /* dead code to satisfy the compiler */
 }
 
 
-static RETSIGTYPE
+static void
 intrser(int i)
 {
-#ifndef RELIABLE_SIGNALS
-	if (i)
-		SIGNAL(i, SIG_IGN);
-#endif
-
 	unlink(tmpfil);
 	done(i != 0 ? 1 : 0);
 }