X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fsend.c;h=a735c6777e8d11ddfb136452a4c792b00b8921e5;hb=5f08476e3bc5c134ce57d924b01d1c1fcacd53db;hp=2ef1fe765356ea37ed27945b2f4e80c96b68de66;hpb=5fbf37ee68e018998ada61eeab73e035b26834b6;p=mmh

diff --git a/uip/send.c b/uip/send.c
index 2ef1fe7..a735c67 100644
--- a/uip/send.c
+++ b/uip/send.c
@@ -97,6 +97,7 @@ main(int argc, char **argv)
 	int msgp = 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 *msgs[MAXARGS], *vec[MAXARGS];
@@ -273,11 +274,40 @@ main(int argc, char **argv)
 		st.st_ino = 0;
 	}
 	if (pushsw) {
-		push();
+		/* 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] = mhbasename(postproc);
-	closefds(3);
+	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)) {
@@ -485,7 +515,7 @@ attach(char *draft_file_name)
 		fclose(body_file);
 
 		/* Add a mhbuild MIME composition file line for the body */
-		/* charset will be discovered/guessed by buildmimeproc */
+		/* charset will be discovered/guessed by mhbuild */
 		fprintf(composition_file, "#text/plain %s\n", body_file_name);
 	}
 
@@ -512,11 +542,8 @@ attach(char *draft_file_name)
 	}
 	fclose(composition_file);
 
-	/*
-	** We're ready to roll!  Run mhbuild on the composition file.
-	** Note that mhbuild is in the context as buildmimeproc.
-	*/
-	sprintf(buf, "%s %s", buildmimeproc, composition_file_name);
+	/* We're ready to roll! */
+	sprintf(buf, "mhbuild %s", composition_file_name);
 	if (system(buf) != 0) {
 		/* some problem */
 		clean_up_temporary_files();
@@ -614,7 +641,7 @@ make_mime_composition_file_entry(char *file_name)
 
 /*
 ** The back-end of the message sending back-end.
-** Annotate original message, and call `postproc' to send message.
+** Annotate original message, and call `spost' to send message.
 */
 static int
 sendaux(char **vec, int vecp, char *drft, struct stat *st)
@@ -624,7 +651,7 @@ sendaux(char **vec, int vecp, char *drft, struct stat *st)
 	char backup[BUFSIZ];
 
 	/*
-	** fd collects the output of postproc, and is used for the
+	** 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;
@@ -653,9 +680,9 @@ sendaux(char **vec, int vecp, char *drft, struct stat *st)
 			dup2(fd, fileno(stderr));
 			close(fd);
 		}
-		execvp(postproc, vec);
+		execvp(*vec, vec);
 		fprintf(stderr, "unable to exec ");
-		perror(postproc);
+		perror(*vec);
 		_exit(-1);
 		break;  /* NOT REACHED */
 
@@ -667,7 +694,7 @@ sendaux(char **vec, int vecp, char *drft, struct stat *st)
 			}
 		} else {
 			/*
-			** If postproc failed, and we have good fd (which
+			** If spost failed, and we have good fd (which
 			** means we pushed), then mail error message
 			** (and possibly the draft) back to the user.
 			*/
@@ -694,7 +721,7 @@ sendaux(char **vec, int vecp, char *drft, struct stat *st)
 
 /*
 ** Mail error notification (and possibly a copy of the
-** message) back to the user, using the mailproc
+** message) back to the user, using mhmail(1).
 */
 static void
 alert(char *file, int out)
@@ -738,10 +765,10 @@ alert(char *file, int out)
 		/* create subject for error notification */
 		snprintf(buf, sizeof(buf), "send failed on %s",
 				forwsw ? "enclosed draft" : file);
-		execlp(mailproc, mhbasename(mailproc), getusername(),
+		execlp("mhmail", "mhmail", getusername(),
 				"-subject", buf, NULL);
 		fprintf(stderr, "unable to exec ");
-		perror(mailproc);
+		perror("mhmail");
 		_exit(-1);
 
 	default:  /* no waiting... */