X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Frepl.c;h=438d85441109de03484265181a7a9779dbf62a6c;hp=9006dec24b0dbc1a0c41b4e586ab09095d8a6d46;hb=HEAD;hpb=04a3dfc70394a517a79340a7d3ecd9c6a23d0bee

diff --git a/uip/repl.c b/uip/repl.c
index 9006dec..438d854 100644
--- a/uip/repl.c
+++ b/uip/repl.c
@@ -60,6 +60,8 @@ static struct swit switches[] = {
 	{ NULL, 0 }
 };
 
+char *version=VERSION;
+
 static struct swit ccswitches[] = {
 #define CTOSW  0
 	{ "to", 0 },
@@ -309,7 +311,6 @@ main(int argc, char **argv)
 		/* parse the message range/sequence/name and set SELECTED */
 		if (!m_convert(mp, msg))
 			exit(EX_SOFTWARE);
-		seq_setprev(mp);  /* set the previous-sequence */
 
 		if (mp->numsel > 1)
 			adios(EX_USAGE, NULL, "only one message at a time!");
@@ -703,7 +704,6 @@ replfilter(FILE *in, FILE *out, char *filter)
 {
 	int pid, pid_show, n;
 	int mailpipe[2];
-	char *errstr;
 
 	if (filter == NULL)
 		return;
@@ -714,51 +714,51 @@ replfilter(FILE *in, FILE *out, char *filter)
 	rewind(in);
 	lseek(fileno(in), (off_t) 0, SEEK_SET);
 
-	if (pipe(mailpipe) == -1) {
-		adios(EX_OSERR, "pipe", "can't create pipe");
-	}
-
-	switch (pid_show = fork()) {
-	case NOTOK:
-		adios(EX_OSERR, "fork", "unable to");
-
-	case OK:
-		dup2(fileno(in), fileno(stdin));
-		dup2(mailpipe[1], fileno(stdout));
-		for (n=3; n<OPEN_MAX; n++) {
-			close(n);
-		}
-
-		execlp("show", "show", "-file", "-", NULL);
-
-		adios(EX_OSERR, "exec", "unable to");
-	}
-
 	switch (pid = fork()) {
 	case NOTOK:
 		adios(EX_OSERR, "fork", "unable to");
 
 	case OK:
-		dup2(mailpipe[0], fileno(stdin));
-		dup2(fileno(out), fileno(stdout));
-		for (n=3; n<OPEN_MAX; n++) {
-			close(n);
+		if (pipe(mailpipe) == -1) {
+			adios(EX_OSERR, "pipe", "can't create pipe");
 		}
 
-		execlp("mhl", "mhl", "-form", filter, NULL);
-		errstr = strerror(errno);
-		write(2, "unable to exec mhl: ", 20);
-		write(2, errstr, strlen(errstr));
-		write(2, "\n", 1);
-		_exit(EX_OSERR);
+		switch (pid_show = fork()) {
+		case NOTOK:
+			adios(EX_OSERR, "fork", "unable to");
+		case OK:
+			dup2(fileno(in), STDIN_FILENO);
+			dup2(mailpipe[1], STDOUT_FILENO);
+			close(fileno(in));
+			close(fileno(out));
+			close(mailpipe[0]);
+			close(mailpipe[1]);
+			for (n=3; n<OPEN_MAX; n++) {
+				close(n);
+			}
+			execlp("show", "show", "-file", "-", NULL);
+			adios(EX_OSERR, "exec", "unable to");
+			break;
+		default:
+			dup2(mailpipe[0], STDIN_FILENO);
+			dup2(fileno(out), STDOUT_FILENO);
+			close(fileno(in));
+			close(fileno(out));
+			close(mailpipe[0]);
+			close(mailpipe[1]);
+			for (n=3; n<OPEN_MAX; n++) {
+				close(n);
+			}
+			execlp("mhl", "mhl", "-form", filter, NULL);
+			adios(EX_OSERR, "exec", "unable to");
+			break;
+		}
 
 	default:
-		if (pidXwait(-1, "show | mhl"))
+		if (pidXwait(pid, "mhl")) {
 			exit(EX_SOFTWARE);
+		}
 		fseek(out, 0L, SEEK_END);
 		break;
 	}
-
-	close(mailpipe[0]);
-	close(mailpipe[1]);
 }