X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fmhparse.c;h=ece4e8fe6dfae7ad84588b3d39dd92548552b461;hp=86c16a9ae71518d03c12173a82a2537384312b1b;hb=5b92ee6942b9b466914f5faa5fa4c00a2ebc6d35;hpb=33dc8211a72df0c27fa11220f3b27583cd1c7e49

diff --git a/uip/mhparse.c b/uip/mhparse.c
index 86c16a9..ece4e8f 100644
--- a/uip/mhparse.c
+++ b/uip/mhparse.c
@@ -2472,7 +2472,7 @@ openFTP(CT ct, char **file)
 	CE ce;
 	static char *username = NULL;
 	static char *password = NULL;
-	int child_id, i, vecp;
+	int child_id, vecp;
 	char *vec[9];
 
 	e  = ct->c_ctexbody;
@@ -2598,9 +2598,7 @@ openFTP(CT ct, char **file)
 
 	fflush(stdout);
 
-	for (i = 0; (child_id = fork()) == NOTOK && i < 5; i++)
-		sleep(5);
-	switch (child_id) {
+	switch (child_id = fork()) {
 	case NOTOK:
 		adios("fork", "unable to");
 		/* NOTREACHED */
@@ -2674,7 +2672,7 @@ InitMail(CT ct)
 static int
 openMail(CT ct, char **file)
 {
-	int child_id, fd, i, vecp;
+	int child_id, fd, vecp;
 	int len, buflen;
 	char *bp, buffer[BUFSIZ], *vec[7];
 	struct exbody *e = ct->c_ctexbody;
@@ -2726,7 +2724,7 @@ openMail(CT ct, char **file)
 		return NOTOK;
 
 	vecp = 0;
-	vec[vecp++] = mhbasename(mailproc);
+	vec[vecp++] = "mhmail";
 	vec[vecp++] = e->eb_server;
 	vec[vecp++] = "-subject";
 	vec[vecp++] = e->eb_subject ? e->eb_subject : "mail-server request";
@@ -2734,17 +2732,15 @@ openMail(CT ct, char **file)
 	vec[vecp++] = e->eb_body;
 	vec[vecp] = NULL;
 
-	for (i = 0; (child_id = fork()) == NOTOK && i < 5; i++)
-		sleep(5);
-	switch (child_id) {
+	switch (child_id = fork()) {
 	case NOTOK:
 		advise("fork", "unable to");
 		return NOTOK;
 
 	case OK:
-		execvp(mailproc, vec);
+		execvp(*vec, vec);
 		fprintf(stderr, "unable to exec ");
-		perror(mailproc);
+		perror(*vec);
 		_exit(-1);
 		/* NOTREACHED */