X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fsend.c;h=e39ab800e6a7c8569047cca2ff2a3eb61074dc90;hb=3e300b97e9a54a3157e37948f8827abbe3eecf05;hp=6fcccad05c1121a203e05e6f4d62c7aadd117a58;hpb=5a54c825a4c672e712e40c4c5ed0f0883fc99913;p=mmh

diff --git a/uip/send.c b/uip/send.c
index 6fcccad..e39ab80 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();
@@ -603,9 +630,9 @@ make_mime_composition_file_entry(char *file_name)
 		adios(NULL, "unable to access file `%s'", file_name);
 	}
 
-	fprintf(composition_file, "#%s; name=\"%s\" <>{attachment}",
-		content_type,
-		(!(cp = strrchr(file_name, '/'))) ? file_name : cp + 1);
+	cp = (!(cp = strrchr(file_name, '/'))) ? file_name : cp + 1;
+	fprintf(composition_file, "#%s; name=\"%s\" <> [%s] {attachment}",
+			content_type, cp, cp);
 
 	fprintf(composition_file, " %s\n", file_name);
 
@@ -614,17 +641,17 @@ 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)
 {
 	pid_t child_id;
-	int i, status, fd;
+	int status, fd;
 	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;
@@ -635,10 +662,7 @@ sendaux(char **vec, int vecp, char *drft, struct stat *st)
 	}
 	vec[vecp] = NULL;
 
-	for (i = 0; (child_id = fork()) == NOTOK && i < 5; i++) {
-		sleep(5);
-	}
-	switch (child_id) {
+	switch (child_id = fork()) {
 	case -1:
 		/* oops -- fork error */
 		adios("fork", "unable to");
@@ -656,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 */
 
@@ -670,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.
 			*/
@@ -697,20 +721,16 @@ 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)
 {
 	pid_t child_id;
-	int i, in;
+	int in;
 	char buf[BUFSIZ];
 
-	for (i = 0; (child_id = fork()) == NOTOK && i < 5; i++) {
-		sleep(5);
-	}
-
-	switch (child_id) {
+	switch (child_id = fork()) {
 	case NOTOK:
 		/* oops -- fork error */
 		advise("fork", "unable to");
@@ -745,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... */