X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;ds=sidebyside;f=uip%2Fwhatnow.c;h=4f8d95634b416ad07ef69cff040bf1572e7825d7;hb=556440fbe435fee96348ca56e44c015149e5f7da;hp=914e2989cb6d08faa460cc640138e7320f9b5b0c;hpb=6e5da31c92f5a3fa38e010052c5a7743bfe1cf11;p=mmh

diff --git a/uip/whatnow.c b/uip/whatnow.c
index 914e298..4f8d956 100644
--- a/uip/whatnow.c
+++ b/uip/whatnow.c
@@ -517,9 +517,9 @@ editfile(char **ed, char **arg, char *file, int use)
 	case OK:
 		vecp = 0;
 		vec[vecp++] = mhbasename(*ed);
-		if (arg)
-			while (*arg)
-				vec[vecp++] = *arg++;
+		while (arg && *arg) {
+			vec[vecp++] = *arg++;
+		}
 		vec[vecp++] = file;
 		vec[vecp] = NULL;
 
@@ -565,36 +565,22 @@ editfile(char **ed, char **arg, char *file, int use)
 static int
 sendfile(char **arg, char *file)
 {
-	pid_t child_id;
-	int vecp;
+	int vecp = 0;
 	char *vec[MAXARGS];
 
-	context_save();  /* save the context file */
+	context_save();
 	fflush(stdout);
 
-	switch (child_id = fork()) {
-	case NOTOK:
-		advise(NULL, "unable to fork, so sending directly...");
-		/* fall */
-	case OK:
-		vecp = 0;
-		vec[vecp++] = "send";
-		if (arg)
-			while (*arg)
-				vec[vecp++] = *arg++;
-		vec[vecp++] = file;
-		vec[vecp] = NULL;
-
-		execvp("send", vec);
-		fprintf(stderr, "%s: unable to exec ", invo_name);
-		perror("send");
-		_exit(-1);
-
-	default:
-		if (pidwait(child_id, OK) == 0)
-			done(0);
-		return 1;
+	vec[vecp++] = "send";
+	while (arg && *arg) {
+		vec[vecp++] = *arg++;
 	}
+	vec[vecp++] = file;
+	vec[vecp] = NULL;
+	execvp(*vec, vec);
+	fprintf(stderr, "%s: unable to exec ", invo_name);
+	perror("send");
+	_exit(-1);
 }
 
 
@@ -604,11 +590,9 @@ sendfile(char **arg, char *file)
 static int
 refile(char **arg, char *file)
 {
-	pid_t pid;
-	register int vecp;
+	int vecp = 0;
 	char *vec[MAXARGS];
 
-	vecp = 0;
 	vec[vecp++] = "refile";
 	vec[vecp++] = "-nolink";  /* override bad .mh_profile defaults */
 	vec[vecp++] = "-file";
@@ -619,23 +603,10 @@ refile(char **arg, char *file)
 	}
 	vec[vecp] = NULL;
 
-	context_save();  /* save the context file */
+	context_save();
 	fflush(stdout);
 
-	switch (pid = fork()) {
-	case -1:
-		advise("fork", "unable to");
-		return -1;
-
-	case 0:
-		execvp(*vec, vec);
-		fprintf(stderr, "%s: unable to exec ", invo_name);
-		perror(*vec);
-		_exit(-1);
-
-	default:
-		return (pidwait(pid, -1));
-	}
+	return execprog(*vec, vec);
 }